aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/panels/Panel.reel/Panel.js4
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js18
2 files changed, 11 insertions, 11 deletions
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index fde5c962..15eb4da9 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -122,8 +122,8 @@ exports.Panel = Montage.create(Component, {
122 122
123 this._currentDocument = value; 123 this._currentDocument = value;
124 124
125 if(typeof this.panelContent.content[0].controller._currentDocument !== "undefined") { 125 if(typeof this.panelContent.content._element.controller._currentDocument !== "undefined") {
126 this.panelContent.content[0].controller.currentDocument = this._currentDocument; 126 this.panelContent.content._element.controller.currentDocument = this._currentDocument;
127 } 127 }
128 128
129 if(!value) { 129 if(!value) {
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 658ac043..36b868d0 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -221,8 +221,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
221 }, 221 },
222 set:function (newVal) { 222 set:function (newVal) {
223 this._layerRepetition = newVal; 223 this._layerRepetition = newVal;
224 }, 224 },
225 serializable: true
226 }, 225 },
227 226
228 // Set to false to skip array caching array sets in current document 227 // Set to false to skip array caching array sets in current document
@@ -346,8 +345,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
346 }, 345 },
347 set:function (newVal) { 346 set:function (newVal) {
348 this._trackRepetition = newVal; 347 this._trackRepetition = newVal;
349 }, 348 }
350 serializable: true
351 }, 349 },
352 350
353 _selectedKeyframes:{ 351 _selectedKeyframes:{
@@ -603,11 +601,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
603 // Store the timeline data in currentDocument... 601 // Store the timeline data in currentDocument...
604 if (this._boolCacheArrays) { 602 if (this._boolCacheArrays) {
605 // ... but only if we're supposed to. 603 // ... but only if we're supposed to.
606 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; 604 if(this.currentDocument) {
607 this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.currentDocument.model.domContainer; 605 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
608 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; 606 this.application.ninja.currentDocument.tlCurrentSelectedContainer = this.currentDocument.model.domContainer;
609 this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected; 607 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
610 this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected; 608 this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected;
609 this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected;
610 }
611 } 611 }
612 } 612 }
613 }, 613 },