Merge cleanup

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

4 files changed, 2 insertions, 8 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 2dc0ccb9..e396bdbf 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -89,8 +89,6 @@ exports.Breadcrumb = Montage.create(Component, {
 
     handleAction: {
         value: function(evt) {
-
-//           this.application.ninja.currentDocument.breadCrumbClick=true;
             if(evt.target.value === this.container.uuid) {
                 return;
             }
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index bec033f8..10334b31 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -41,8 +41,7 @@
                         }
                     },
                     "dtext2" : {
-                        "module" : "montage/ui/dynamic-text.reel",
-                        "name" : "DynamicText",
+                        "prototype" : "montage/ui/dynamic-text.reel",
                         "properties" : {
                                 "element" : {"#" : "layer-tag"}
                         },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index f821ba6f..f10e9ac9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -119,8 +119,7 @@
                     },
 
                 "timelineZoomSlider":{
-                    "module":"js/components/slider.reel",
-                    "name":"Slider",
+                    "prototype":"js/components/slider.reel",
                     "properties":{
                         "element":{"#":"tl_slider"},
                         "maxValue" : 10000,
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 414f9d11..7033ee3d 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -221,10 +221,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
     HandleDoubleClick: {
         value: function(event) {
             if(this.application.ninja.selectedElements.length > 0) {
-//                this.application.ninja.currentDocument.breadCrumbClick = true;
                 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0];
             } else {
-//                this.application.ninja.currentDocument.breadCrumbClick = true;
                 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
             }
         }