diff options
Diffstat (limited to 'js/panels')
5 files changed, 10 insertions, 6 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index 508b8130..c57bb2d7 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -7,6 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
7 | var Montage = require("montage/core/core").Montage, | 7 | var Montage = require("montage/core/core").Montage, |
8 | Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component; |
9 | var Button = require("js/components/button.reel").Button; | 9 | var Button = require("js/components/button.reel").Button; |
10 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | ||
10 | 11 | ||
11 | //////////////////////////////////////////////////////////////////////// | 12 | //////////////////////////////////////////////////////////////////////// |
12 | //Exporting as MaterialsPopup | 13 | //Exporting as MaterialsPopup |
@@ -223,7 +224,7 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
223 | (materialID === "RadialGradientMaterial") | 224 | (materialID === "RadialGradientMaterial") |
224 | ) | 225 | ) |
225 | { | 226 | { |
226 | var material = MaterialsLibrary.getMaterial( materialID ); | 227 | var material = MaterialsModel.getMaterial( materialID ); |
227 | if (material) | 228 | if (material) |
228 | { | 229 | { |
229 | this._material = material; | 230 | this._material = material; |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 2001c3fb..4ff28fd4 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -494,7 +494,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
494 | var ptrParent = nj.queryParentSelector(event.target, ".container-layer"); | 494 | var ptrParent = nj.queryParentSelector(event.target, ".container-layer"); |
495 | if (ptrParent !== false) { | 495 | if (ptrParent !== false) { |
496 | var myIndex = this.getActiveLayerIndex(); | 496 | var myIndex = this.getActiveLayerIndex(); |
497 | this.selectLayer(myIndex); | 497 | this.selectLayer(myIndex, true); |
498 | } | 498 | } |
499 | } | 499 | } |
500 | }, | 500 | }, |
@@ -977,7 +977,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
977 | }, | 977 | }, |
978 | 978 | ||
979 | selectLayer:{ | 979 | selectLayer:{ |
980 | value:function (layerIndex) { | 980 | value:function (layerIndex, userSelection) { |
981 | var i = 0; | 981 | var i = 0; |
982 | var arrLayersLength = this.arrLayers.length; | 982 | var arrLayersLength = this.arrLayers.length; |
983 | 983 | ||
@@ -995,7 +995,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
995 | this.layerRepetition.selectedIndexes = [layerIndex]; | 995 | this.layerRepetition.selectedIndexes = [layerIndex]; |
996 | this.trackRepetition.selectedIndexes = [layerIndex]; | 996 | this.trackRepetition.selectedIndexes = [layerIndex]; |
997 | this.currentLayerSelected = this.arrLayers[layerIndex]; | 997 | this.currentLayerSelected = this.arrLayers[layerIndex]; |
998 | if(!this._openDoc){ | 998 | if(userSelection){ |
999 | if(this._captureSelection){ | 999 | if(this._captureSelection){ |
1000 | if(this.currentLayerSelected.elementsList.length >= 1){ | 1000 | if(this.currentLayerSelected.elementsList.length >= 1){ |
1001 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); | 1001 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); |
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 3a195f47..6ff38bef 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -175,7 +175,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
175 | 175 | ||
176 | // select the containing layer | 176 | // select the containing layer |
177 | var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID); | 177 | var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID); |
178 | this.application.ninja.timeline.selectLayer(selectIndex); | 178 | this.application.ninja.timeline.selectLayer(selectIndex, true); |
179 | 179 | ||
180 | // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline | 180 | // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline |
181 | this.application.ninja.timeline.deselectTweens(); | 181 | this.application.ninja.timeline.deselectTweens(); |
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js index 7871683e..11f41822 100644 --- a/js/panels/presets/style-presets.reel/style-presets.js +++ b/js/panels/presets/style-presets.reel/style-presets.js | |||
@@ -47,9 +47,11 @@ exports.StylesLibrary = Montage.create(Component, { | |||
47 | selection.forEach(function(el) { | 47 | selection.forEach(function(el) { |
48 | el._element.style.webkitTransition = "all 450ms linear"; | 48 | el._element.style.webkitTransition = "all 450ms linear"; |
49 | 49 | ||
50 | el._element.addEventListener("webkitTransitionEnd", function(e) { | 50 | el._element.addEventListener("webkitTransitionEnd", function presetTransition(e) { |
51 | el._element.style.webkitTransition = ''; | 51 | el._element.style.webkitTransition = ''; |
52 | setStopRuleSelector("*"); | 52 | setStopRuleSelector("*"); |
53 | this.removeEventListener("webkitTransitionEnd", presetTransition, true); | ||
54 | |||
53 | }, true); | 55 | }, true); |
54 | setStopRuleSelector("transitionStopRule"); | 56 | setStopRuleSelector("transitionStopRule"); |
55 | el._element.classList.add(selectorBase); | 57 | el._element.classList.add(selectorBase); |
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html index c22ed351..5dc28edf 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.html +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html | |||
@@ -40,6 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
40 | "element" : {"#": "libraryContainer"}, | 40 | "element" : {"#": "libraryContainer"}, |
41 | "branchComponent" : {"@": "branch" }, | 41 | "branchComponent" : {"@": "branch" }, |
42 | "contentController": {"@": "presetsController"}, | 42 | "contentController": {"@": "presetsController"}, |
43 | "activationEvent" : "dblclick", | ||
43 | "showRoot": false | 44 | "showRoot": false |
44 | } | 45 | } |
45 | }, | 46 | }, |