Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Used Theirs, doesn't matter, code block is in commented-out section.

26 files changed, 55 insertions, 28 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 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
         ]
 }
\ 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 87cf1e4f..3d31a50b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1233,6 +1233,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     }
             } 
 
+                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
+                        matchedValues+=1;
+                    }
+                }
+            }
 
 
                  // TODO: this should probably check to see if it actually needs to run.
@@ -1792,6 +1797,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 currentLayersSelectedLength = this.currentLayersSelected.length,
                                 arrLayersLength = this.arrLayers.length,
                                 returnVal = arrLayersLength -1;
+                        if (returnVal === -1) {
+                                return false;
+                        }
                         if (this.currentLayersSelected === false) {
                                 return false;
                         }
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, {
 
     componentInstanceOnFirstDraw: {
         value: function(instance) {
+            var addDelegate = this.application.ninja.elementMediator.addDelegate;
+            this.application.ninja.elementMediator.addDelegate = null;
             this.application.ninja.elementMediator.addElements(instance.element);
             this.application.ninja.currentDocument.model.mObjects.push(instance);
+            this.application.ninja.elementMediator.addDelegate = addDelegate;
         }
     },
 
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
index 5361e5cc..d86c8d55 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
@@ -96,7 +96,10 @@ exports.CssStyleRule = Montage.create(Component, {
     handleStop : {
         value: function(e) {
             if(this.focusDelegate) {
-                e._event.detail.preventDefault();
+                if(e._event.detail.preventDefault) {
+                    e._event.detail.preventDefault();
+                }
+
                 this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this);
             }
         }
diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
index 509ca565..f53937e6 100644
--- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
+++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
@@ -39,11 +39,13 @@ exports.RuleListContainer = Montage.create(Component, {
         value: function(selection) {
             var list = this._getListForSelection(selection);
 
-            if(!list) {
+            if(list) {
+                this.displayedList = list;
+                this.update();
+            } else {
                 list = this.add(selection);
+                this.displayedList = list;
             }
-
-            this.displayedList = list;
         }
     },
 
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 @@
             "name": "category",
             "type": "select",
             "default": "restaurant",
-            "possibleValues": ["restaurant", "hospital", "cafe", "museum"]
+            "possibleValues": ["", "restaurant", "hospital", "cafe", "museum"]
         },
         {
             "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 @@
                         {"name": "feed-reader.reel"}
                     ]
                 },
-                {"name": "map.reel"},
+                {"name": "map.reel",
+                    "children": [
+                        {"name": "icons"}
+                    ]
+                },
                 {"name": "picasa-carousel.reel",
                     "children": [
                         {"name": "image.reel"}
@@ -370,6 +374,10 @@
         "montage-google/map.reel/map.js",
         "montage-google/map.reel/map.html",
         "montage-google/map.reel/map.css",
+        "montage-google/map.reel/icons/fork-and-knife.png",
+        "montage-google/map.reel/icons/medical.png",
+        "montage-google/map.reel/icons/picture-frame.png",
+        "montage-google/map.reel/icons/cafe.png",
         "montage-google/picasa-carousel.reel/image.reel/image.html",
         "montage-google/picasa-carousel.reel/image.reel/image.js",
         "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 @@
         }
     },
     "owner": {
-        "prototype": "feed-reader/feed-entry.reel",
         "properties": {
             "element": {"#": "feed-entry"}
         }
@@ -76,6 +75,7 @@
 </head>
 <body>
     <div class="feed-entry" data-montage-id="feed-entry">
+
         <a target="_blank" data-montage-id="entry-url" class="entry-url"><h2 data-montage-id="entry-title" class="entry-title"></h2></a>
         <p data-montage-id="entry-description" class="entry-description"></p>
     </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 @@
     },