diff options
author | hwc487 | 2012-03-24 14:07:58 -0700 |
---|---|---|
committer | hwc487 | 2012-03-24 14:07:58 -0700 |
commit | cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2 (patch) | |
tree | 4f5c42f0a1df00dcd1a2064dd176fcff7930ba47 /js/panels | |
parent | 62f4327f9b83760e52a1f6bf1e689b1e0a780fbb (diff) | |
parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
download | ninja-cca20db1f346fc9bf2ead64c83e479f5f5ebf2d2.tar.gz |
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels')
8 files changed, 260 insertions, 53 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js index b4eec771..3505393c 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js | |||
@@ -23,6 +23,36 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
23 | "text": "styles", | 23 | "text": "styles", |
24 | "children": [ | 24 | "children": [ |
25 | { | 25 | { |
26 | "text": "Widgets", | ||
27 | "children": [ | ||
28 | { | ||
29 | "text": "Feed Reader", | ||
30 | "dataFile" : "node_modules/components-data/feed-reader.json", | ||
31 | "component": "feedreader" | ||
32 | }, | ||
33 | { | ||
34 | "text": "Map", | ||
35 | "dataFile" : "node_modules/components-data/map.json", | ||
36 | "component": "map" | ||
37 | }, | ||
38 | { | ||
39 | "text": "Picasa Carousel", | ||
40 | "dataFile" : "node_modules/components-data/picasa-carousel.json", | ||
41 | "component": "picasa-carousel" | ||
42 | }, | ||
43 | { | ||
44 | "text": "Search Bar", | ||
45 | "dataFile" : "node_modules/components-data/searchfield.json", | ||
46 | "component": "searchfield" | ||
47 | }, | ||
48 | { | ||
49 | "text": "Youtube Channel", | ||
50 | "dataFile" : "node_modules/components-data/youtube-channel.json", | ||
51 | "component": "youtube-channel" | ||
52 | } | ||
53 | ] | ||
54 | }, | ||
55 | { | ||
26 | "text": "Montage Components", | 56 | "text": "Montage Components", |
27 | "children": [ | 57 | "children": [ |
28 | { | 58 | { |
@@ -50,7 +80,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
50 | "dataFile" : "node_modules/components-data/number-input.json", | 80 | "dataFile" : "node_modules/components-data/number-input.json", |
51 | "component": "numberInput" | 81 | "component": "numberInput" |
52 | }, | 82 | }, |
53 | { | 83 | { |
54 | "text": "Select Input", | 84 | "text": "Select Input", |
55 | "dataFile" : "node_modules/components-data/select.json", | 85 | "dataFile" : "node_modules/components-data/select.json", |
56 | "component": "select" | 86 | "component": "select" |
@@ -129,15 +159,19 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
129 | _loadComponents: { | 159 | _loadComponents: { |
130 | value: function() { | 160 | value: function() { |
131 | 161 | ||
132 | this.componentsToLoad = this.components.children[0].children.length; | 162 | for(var cat in this.components.children) { |
163 | |||
164 | this.componentsToLoad += this.components.children[cat].children.length; | ||
165 | |||
166 | for(var i = 0, component; component = this.components.children[cat].children[i]; i++) { | ||
167 | var req = new XMLHttpRequest(); | ||
168 | //req.identifier = "searchRequest"; | ||
169 | req.open("GET", component.dataFile); | ||
170 | req.addEventListener("load", this, false); | ||
171 | req.addEventListener("error", this, false); | ||
172 | req.send(); | ||
173 | } | ||
133 | 174 | ||
134 | for(var i = 0, component; component = this.components.children[0].children[i]; i++) { | ||
135 | var req = new XMLHttpRequest(); | ||
136 | //req.identifier = "searchRequest"; | ||
137 | req.open("GET", component.dataFile); | ||
138 | req.addEventListener("load", this, false); | ||
139 | req.addEventListener("error", this, false); | ||
140 | req.send(); | ||
141 | } | 175 | } |
142 | } | 176 | } |
143 | }, | 177 | }, |
@@ -257,6 +291,15 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
257 | '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)' | 291 | '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)' |
258 | }; | 292 | }; |
259 | 293 | ||
294 | var defaultStyles = component.defaultStyles; | ||
295 | if(defaultStyles) { | ||
296 | for(var n in defaultStyles) { | ||
297 | styles[n] = defaultStyles[n]; | ||
298 | } | ||
299 | } | ||
300 | |||
301 | instance.addEventListener('firstDraw', that, false); | ||
302 | |||
260 | that.application.ninja.currentDocument.setComponentInstance(instance, element); | 303 | that.application.ninja.currentDocument.setComponentInstance(instance, element); |
261 | 304 | ||
262 | NJevent("elementAdding", {"el": element, "data":styles}); | 305 | NJevent("elementAdding", {"el": element, "data":styles}); |
@@ -264,6 +307,12 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
264 | 307 | ||
265 | } | 308 | } |
266 | }, | 309 | }, |
310 | |||
311 | handleFirstDraw: { | ||
312 | value: function (e) { | ||
313 | NJevent("addComponentFirstDraw"); | ||
314 | } | ||
315 | }, | ||
267 | 316 | ||
268 | makeComponent: { | 317 | makeComponent: { |
269 | value: function(name) { | 318 | value: function(name) { |
@@ -313,6 +362,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
313 | el.setAttribute("type", "range"); | 362 | el.setAttribute("type", "range"); |
314 | break; | 363 | break; |
315 | case "textfield": | 364 | case "textfield": |
365 | case "searchfield": | ||
316 | el = NJUtils.makeNJElement("input", "Textfield", "component"); | 366 | el = NJUtils.makeNJElement("input", "Textfield", "component"); |
317 | el.elementModel.pi = "TextfieldPi"; | 367 | el.elementModel.pi = "TextfieldPi"; |
318 | el.setAttribute("type", "text"); | 368 | el.setAttribute("type", "text"); |
@@ -326,6 +376,27 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
326 | el.elementModel.pi = "ToggleButtonPi"; | 376 | el.elementModel.pi = "ToggleButtonPi"; |
327 | el.innerHTML = "Off"; | 377 | el.innerHTML = "Off"; |
328 | break; | 378 | break; |
379 | case "map": | ||
380 | el = NJUtils.makeNJElement("div", "Map", "component"); | ||
381 | el.elementModel.pi = "MapPi"; | ||
382 | el.elementModel.isComponent = true; | ||
383 | break; | ||
384 | case "feedreader": | ||
385 | el = NJUtils.makeNJElement("div", "Feed Reader", "component"); | ||
386 | el.elementModel.pi = "FeedReaderPi"; | ||
387 | el.elementModel.isComponent = true; | ||
388 | break; | ||
389 | case "picasa-carousel": | ||
390 | el = NJUtils.makeNJElement("div", "Picasa Carousel", "component"); | ||
391 | el.elementModel.pi = "PicasaCarouselPi"; | ||
392 | el.elementModel.isComponent = true; | ||
393 | break; | ||
394 | case "youtube-channel": | ||
395 | el = NJUtils.makeNJElement("div", "Youtube Channel", "component"); | ||
396 | el.elementModel.pi = "YoutubeChannelPi"; | ||
397 | el.elementModel.isComponent = true; | ||
398 | break; | ||
399 | |||
329 | } | 400 | } |
330 | 401 | ||
331 | return el; | 402 | return el; |
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js index 10a3e906..64f91ea6 100644 --- a/js/panels/presets/default-animation-presets.js +++ b/js/panels/presets/default-animation-presets.js | |||
@@ -18,24 +18,72 @@ exports.animationPresets = { | |||
18 | "-webkit-animation": "border-morph 2s infinite" | 18 | "-webkit-animation": "border-morph 2s infinite" |
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | { | 21 | { |
22 | "isKeyFrameRule": true, | 22 | "isKeyFrameRule": true, |
23 | "keys" : [{ | 23 | "keys" : [{ |
24 | "keyText": "0%", | 24 | "keyText": "0%", |
25 | "styles": { "border-radius": "0" } | 25 | "styles": { "border-radius": "0" } |
26 | }, { | 26 | }, { |
27 | "keyText": "50%", | 27 | "keyText": "50%", |
28 | "styles": { | 28 | "styles": { |
29 | "border-radius": "100%" | 29 | "border-radius": "100%" |
30 | } | 30 | } |
31 | }, { | 31 | }, { |
32 | "keyText": "100%", | 32 | "keyText": "100%", |
33 | "styles": { | 33 | "styles": { |