diff options
-rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 3 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 | ||||
-rwxr-xr-x | js/tools/SelectionTool.js | 2 |
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, { | |||
89 | 89 | ||
90 | handleAction: { | 90 | handleAction: { |
91 | value: function(evt) { | 91 | value: function(evt) { |
92 | |||
93 | // this.application.ninja.currentDocument.breadCrumbClick=true; | ||
94 | if(evt.target.value === this.container.uuid) { | 92 | if(evt.target.value === this.container.uuid) { |
95 | return; | 93 | return; |
96 | } | 94 | } |
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 @@ | |||
41 | } | 41 | } |
42 | }, | 42 | }, |
43 | "dtext2" : { | 43 | "dtext2" : { |
44 | "module" : "montage/ui/dynamic-text.reel", | 44 | "prototype" : "montage/ui/dynamic-text.reel", |
45 | "name" : "DynamicText", | ||
46 | "properties" : { | 45 | "properties" : { |
47 | "element" : {"#" : "layer-tag"} | 46 | "element" : {"#" : "layer-tag"} |
48 | }, | 47 | }, |
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 @@ | |||
119 | }, | 119 | }, |
120 | 120 | ||
121 | "timelineZoomSlider":{ | 121 | "timelineZoomSlider":{ |
122 | "module":"js/components/slider.reel", | 122 | "prototype":"js/components/slider.reel", |
123 | "name":"Slider", | ||
124 | "properties":{ | 123 | "properties":{ |
125 | "element":{"#":"tl_slider"}, | 124 | "element":{"#":"tl_slider"}, |
126 | "maxValue" : 10000, | 125 | "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, { | |||
221 | HandleDoubleClick: { | 221 | HandleDoubleClick: { |
222 | value: function(event) { | 222 | value: function(event) { |
223 | if(this.application.ninja.selectedElements.length > 0) { | 223 | if(this.application.ninja.selectedElements.length > 0) { |
224 | // this.application.ninja.currentDocument.breadCrumbClick = true; | ||
225 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; | 224 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; |
226 | } else { | 225 | } else { |
227 | // this.application.ninja.currentDocument.breadCrumbClick = true; | ||
228 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; | 226 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; |
229 | } | 227 | } |
230 | } | 228 | } |