diff options
author | Eric Guzman | 2012-06-28 11:02:16 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-28 11:02:16 -0700 |
commit | f89895e5fb94a192d25f26249dadcb8ab225c72b (patch) | |
tree | 8ce918bb2605c67c4fc093e96543de8e10882f1d | |
parent | e1f83a2c603bf9ddb74889f7ba5b697bb474edaa (diff) | |
parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
download | ninja-f89895e5fb94a192d25f26249dadcb8ab225c72b.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
24 files changed, 42 insertions, 25 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 579264cb..c5ccbc82 100644 --- a/js/io/system/ninjalibrary.json +++ b/js/io/system/ninjalibrary.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "libraries": [ | 2 | "libraries": [ |
3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"}, | 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"}, |
4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} |
5 | ] | 5 | ] |
6 | } \ No newline at end of file | 6 | } \ No newline at end of file |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 50171260..45353a08 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1220,7 +1220,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1220 | for(i=0;i<arrSelectedIndexesLength;i++){ | 1220 | for(i=0;i<arrSelectedIndexesLength;i++){ |
1221 | for(j=0;j<currentLayersSelectedLength;j++){ | 1221 | for(j=0;j<currentLayersSelectedLength;j++){ |
1222 | 1222 | ||
1223 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){ | 1223 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){ |
1224 | matchedValues+=1; | 1224 | matchedValues+=1; |
1225 | } | 1225 | } |
1226 | } | 1226 | } |
@@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1773 | currentLayersSelectedLength = this.currentLayersSelected.length, | 1773 | currentLayersSelectedLength = this.currentLayersSelected.length, |
1774 | arrLayersLength = this.arrLayers.length, | 1774 | arrLayersLength = this.arrLayers.length, |
1775 | returnVal = arrLayersLength -1; | 1775 | returnVal = arrLayersLength -1; |
1776 | if (returnVal === -1) { | ||
1777 | return false; | ||
1778 | } | ||
1776 | if (this.currentLayersSelected === false) { | 1779 | if (this.currentLayersSelected === false) { |
1777 | return false; | 1780 | return false; |
1778 | } | 1781 | } |
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index ab033433..073a4438 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
@@ -300,8 +300,11 @@ exports.ComponentsPanel = Montage.create(Component, { | |||
300 | 300 | ||
301 | componentInstanceOnFirstDraw: { | 301 | componentInstanceOnFirstDraw: { |
302 | value: function(instance) { | 302 | value: function(instance) { |
303 | var addDelegate = this.application.ninja.elementMediator.addDelegate; | ||
304 | this.application.ninja.elementMediator.addDelegate = null; | ||
303 | this.application.ninja.elementMediator.addElements(instance.element); | 305 | this.application.ninja.elementMediator.addElements(instance.element); |
304 | this.application.ninja.currentDocument.model.mObjects.push(instance); | 306 | this.application.ninja.currentDocument.model.mObjects.push(instance); |
307 | this.application.ninja.elementMediator.addDelegate = addDelegate; | ||
305 | } | 308 | } |
306 | }, | 309 | }, |
307 | 310 | ||
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json index e80fa510..4a3da3c6 100644 --- a/node_modules/components-data/map.json +++ b/node_modules/components-data/map.json | |||
@@ -10,7 +10,7 @@ | |||
10 | "name": "category", | 10 | "name": "category", |
11 | "type": "select", | 11 | "type": "select", |
12 | "default": "restaurant", | 12 | "default": "restaurant", |
13 | "possibleValues": ["restaurant", "hospital", "cafe", "museum"] | 13 | "possibleValues": ["", "restaurant", "hospital", "cafe", "museum"] |
14 | }, | 14 | }, |
15 | { | 15 | { |
16 | "name": "center", | 16 | "name": "center", |
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json index b6868954..9a2177c6 100644 --- a/node_modules/descriptor.json +++ b/node_modules/descriptor.json | |||
@@ -82,7 +82,11 @@ | |||
82 | {"name": "feed-reader.reel"} | 82 | {"name": "feed-reader.reel"} |
83 | ] | 83 | ] |
84 | }, | 84 | }, |
85 | {"name": "map.reel"}, | 85 | {"name": "map.reel", |
86 | "children": [ | ||
87 | {"name": "icons"} | ||
88 | ] | ||
89 | }, | ||
86 | {"name": "picasa-carousel.reel", | 90 | {"name": "picasa-carousel.reel", |
87 | "children": [ | 91 | "children": [ |
88 | {"name": "image.reel"} | 92 | {"name": "image.reel"} |
@@ -370,6 +374,10 @@ | |||
370 | "montage-google/map.reel/map.js", | 374 | "montage-google/map.reel/map.js", |
371 | "montage-google/map.reel/map.html", | 375 | "montage-google/map.reel/map.html", |
372 | "montage-google/map.reel/map.css", | 376 | "montage-google/map.reel/map.css", |
377 | "montage-google/map.reel/icons/fork-and-knife.png", | ||
378 | "montage-google/map.reel/icons/medical.png", | ||
379 | "montage-google/map.reel/icons/picture-frame.png", | ||
380 | "montage-google/map.reel/icons/cafe.png", | ||
373 | "montage-google/picasa-carousel.reel/image.reel/image.html", | 381 | "montage-google/picasa-carousel.reel/image.reel/image.html", |
374 | "montage-google/picasa-carousel.reel/image.reel/image.js", | 382 | "montage-google/picasa-carousel.reel/image.reel/image.js", |
375 | "montage-google/picasa-carousel.reel/picasa-carousel.css", | 383 | "montage-google/picasa-carousel.reel/picasa-carousel.css", |
diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index 332b2932..66471eab 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html | |||
@@ -45,7 +45,6 @@ | |||
45 | } | 45 | } |
46 | }, | 46 | }, |
47 | "owner": { | 47 | "owner": { |
48 | "prototype": "feed-reader/feed-entry.reel", | ||
49 | "properties": { | 48 | "properties": { |
50 | "element": {"#": "feed-entry"} | 49 | "element": {"#": "feed-entry"} |
51 | } | 50 | } |
@@ -76,6 +75,7 @@ | |||
76 | </head> | 75 | </head> |
77 | <body> | 76 | <body> |
78 | <div class="feed-entry" data-montage-id="feed-entry"> | 77 | <div class="feed-entry" data-montage-id="feed-entry"> |
78 | |||
79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> | 79 | <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a> |
80 | <p data-montage-id="entry-description" class="entry-description"></p> | 80 | <p data-montage-id="entry-description" class="entry-description"></p> |
81 | </div> | 81 | </div> |
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html index 4d6792a1..a5c1346f 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | |||
@@ -38,7 +38,6 @@ | |||
38 | }, | 38 | }, |
39 | 39 | ||
40 | "owner": { | 40 | "owner": { |
41 | "prototype": "feed-reader/feed-reader.reel", | ||
42 | "properties": { | 41 | "properties": { |
43 | "element": {"#": "feed-reader"} | 42 | "element": {"#": "feed-reader"} |
44 | } | 43 | } |
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js index 34533d6d..3c139c60 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js | |||
@@ -16,11 +16,8 @@ exports.FeedReader = Montage.create(Component, { | |||
16 | value: function() { | 16 | value: function() { |
17 | var self = this; | 17 | var self = this; |
18 | var apiInit = function() { | 18 | var apiInit = function() { |
19 | console.log('google api initialized'); | ||
20 | |||
21 | google.load("feeds", "1", { | 19 | google.load("feeds", "1", { |
22 | callback: function() { | 20 | callback: function() { |
23 | console.log('google feeds api loaded'); | ||
24 | self._apiLoaded = true; | 21 | self._apiLoaded = true; |
25 | self.feedURL = self._feedURL; | 22 | self.feedURL = self._feedURL; |
26 | self.needsDraw = true; | 23 | self.needsDraw = true; |
diff --git a/node_modules/montage-google/map.reel/icons/airplane.png b/node_modules/montage-google/map.reel/icons/airplane.png new file mode 100644 index 00000000..dfcbbc78 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/airplane.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/cafe.png b/node_modules/montage-google/map.reel/icons/cafe.png new file mode 100644 index 00000000..4e9c517a --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/cafe.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/coffee.png b/node_modules/montage-google/map.reel/icons/coffee.png new file mode 100644 index 00000000..4c4bedad --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/coffee.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/food.png b/node_modules/montage-google/map.reel/icons/food.png new file mode 100644 index 00000000..81afd74a --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/food.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/fork-and-knife.png b/node_modules/montage-google/map.reel/icons/fork-and-knife.png new file mode 100644 index 00000000..06d91088 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/fork-and-knife.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/map-marker.png b/node_modules/montage-google/map.reel/icons/map-marker.png new file mode 100644 index 00000000..a5d99d69 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/map-marker.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/medical.png b/node_modules/montage-google/map.reel/icons/medical.png new file mode 100644 index 00000000..ab78c783 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/medical.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/picture-frame.png b/node_modules/montage-google/map.reel/icons/picture-frame.png new file mode 100644 index 00000000..6deee997 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/picture-frame.png | |||
Binary files differ | |||
diff --git a/node_modules/montage-google/map.reel/icons/shopping.png b/node_modules/montage-google/map.reel/icons/shopping.png new file mode 100644 index 00000000..03689f99 --- /dev/null +++ b/node_modules/montage-google/map.reel/icons/shopping.png | |||
Binary files differ | |||
< |