diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 0500ec11..d65d031f 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -665,7 +665,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
665 | }, | 665 | }, |
666 | handleMousedown: { | 666 | handleMousedown: { |
667 | value: function(event) { | 667 | value: function(event) { |
668 | this.isActive = true; | 668 | this.layerData.isActive = true; |
669 | var ptrParent = nj.queryParentSelector(event.target, ".content-style"); | 669 | var ptrParent = nj.queryParentSelector(event.target, ".content-style"); |
670 | if (ptrParent !== false) { | 670 | if (ptrParent !== false) { |
671 | this.selectStyle(this.getActiveStyleIndex()); | 671 | this.selectStyle(this.getActiveStyleIndex()); |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 42f68268..b12183f2 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -289,7 +289,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
289 | // No, we have no information stored. Create it. | 289 | // No, we have no information stored. Create it. |
290 | this.application.ninja.currentDocument.isTimelineInitialized = true; | 290 | this.application.ninja.currentDocument.isTimelineInitialized = true; |
291 | this.application.ninja.currentDocument.tlArrLayers = []; | 291 | this.application.ninja.currentDocument.tlArrLayers = []; |
292 | this.application.ninja.currentDocument.tlArrTracks = []; | ||
293 | this.application.ninja.currentDocument.tllayerNumber = 0; | 292 | this.application.ninja.currentDocument.tllayerNumber = 0; |
294 | this.application.ninja.currentDocument.tlLayerHashTable=[]; | 293 | this.application.ninja.currentDocument.tlLayerHashTable=[]; |
295 | this.hashKey = this.application.ninja.currentSelectedContainer.uuid; | 294 | this.hashKey = this.application.ninja.currentSelectedContainer.uuid; |
@@ -570,6 +569,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
570 | thingToPush.layerData.elementsList = []; | 569 | thingToPush.layerData.elementsList = []; |
571 | thingToPush.layerData.deleted = false; | 570 | thingToPush.layerData.deleted = false; |
572 | thingToPush.layerData.isSelected = false; | 571 | thingToPush.layerData.isSelected = false; |
572 | |||
573 | thingToPush.layerData.isActive = false; | ||
574 | |||
573 | thingToPush.layerData.created=false; | 575 | thingToPush.layerData.created=false; |
574 | thingToPush.layerData.isTrackAnimated = false; | 576 | thingToPush.layerData.isTrackAnimated = false; |
575 | thingToPush.layerData.currentKeyframeRule = null; | 577 | thingToPush.layerData.currentKeyframeRule = null; |
@@ -642,6 +644,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
642 | thingToPush.layerData.elementsList = []; | 644 | thingToPush.layerData.elementsList = []; |
643 | thingToPush.layerData.deleted = false; | 645 | thingToPush.layerData.deleted = false; |
644 | thingToPush.layerData.isSelected = false; | 646 | thingToPush.layerData.isSelected = false; |
647 | |||
648 | thingToPush.layerData.isActive = false; | ||
649 | |||
645 | thingToPush.layerData.created=false; | 650 | thingToPush.layerData.created=false; |
646 | thingToPush.layerData.isTrackAnimated = false; | 651 | thingToPush.layerData.isTrackAnimated = false; |
647 | thingToPush.layerData.currentKeyframeRule = null; | 652 | thingToPush.layerData.currentKeyframeRule = null; |
@@ -1007,12 +1012,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1007 | return returnVal; | 1012 | return returnVal; |
1008 | } | 1013 | } |
1009 | }, | 1014 | }, |
1015 | |||
1010 | getActiveLayerIndex:{ | 1016 | getActiveLayerIndex:{ |
1011 | value:function () { | 1017 | value:function () { |
1012 | var i = 0, | 1018 | var i = 0, |
1013 | returnVal = false, | 1019 | returnVal = false, |
1014 | arrLayersLength = this.arrLayers.length; | 1020 | arrLayersLength = this.arrLayers.length; |
1015 | |||
1016 | for (i = 0; i < arrLayersLength; i++) { | 1021 | for (i = 0; i < arrLayersLength; i++) { |
1017 | if (this.arrLayers[i].layerData.isActive === true) { | 1022 | if (this.arrLayers[i].layerData.isActive === true) { |
1018 | returnVal = i; | 1023 | returnVal = i; |