diff options
4 files changed, 303 insertions, 460 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 5287ce28..238ddae9 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -318,7 +318,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
318 | this.log('layer.js: isMainCollapsed: ' + newVal); | 318 | this.log('layer.js: isMainCollapsed: ' + newVal); |
319 | this._isMainCollapsed = newVal; | 319 | this._isMainCollapsed = newVal; |
320 | this.layerData.isMainCollapsed = newVal; | 320 | this.layerData.isMainCollapsed = newVal; |
321 | // this.triggerOutgoingBinding(); | ||
322 | } | 321 | } |
323 | } | 322 | } |
324 | }, | 323 | }, |
@@ -336,8 +335,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
336 | if (newVal !== this._isTransformCollapsed) { | 335 | if (newVal !== this._isTransformCollapsed) { |
337 | this._isTransformCollapsed = newVal; | 336 | this._isTransformCollapsed = newVal; |
338 | this.layerData.isTransformCollapsed = newVal; | 337 | this.layerData.isTransformCollapsed = newVal; |
339 | this.triggerOutgoingBinding(); | ||
340 | //this.needsDraw = true; | ||
341 | } | 338 | } |
342 | } | 339 | } |
343 | }, | 340 | }, |
@@ -355,8 +352,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
355 | if (newVal !== this._isPositionCollapsed) { | 352 | if (newVal !== this._isPositionCollapsed) { |
356 | this._isPositionCollapsed = newVal; | 353 | this._isPositionCollapsed = newVal; |
357 | this.layerData.isPositionCollapsed = newVal; | 354 | this.layerData.isPositionCollapsed = newVal; |
358 | this.triggerOutgoingBinding(); | ||
359 | //this.needsDraw = true; | ||
360 | } | 355 | } |
361 | } | 356 | } |
362 | }, | 357 | }, |
@@ -374,8 +369,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
374 | if (newVal !== this._isStyleCollapsed) { | 369 | if (newVal !== this._isStyleCollapsed) { |
375 | this._isStyleCollapsed = newVal; | 370 | this._isStyleCollapsed = newVal; |
376 | this.layerData.isStyleCollapsed = newVal; | 371 | this.layerData.isStyleCollapsed = newVal; |
377 | this.triggerOutgoingBinding(); | ||
378 | //this.needsDraw = true; | ||
379 | } | 372 | } |
380 | } | 373 | } |
381 | }, | 374 | }, |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 34860ae7..6e7d410c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -22,8 +22,6 @@ | |||
22 | "timeline_leftpane" : {"#" : "timeline_leftpane"}, | 22 | "timeline_leftpane" : {"#" : "timeline_leftpane"}, |
23 | "layer_tracks": {"#": "layer_tracks"}, | 23 | "layer_tracks": {"#": "layer_tracks"}, |
24 | "master_track": {"#": "master_track"}, | 24 | "master_track": {"#": "master_track"}, |
25 | "newlayer_button": {"#": "newlayer_button"}, | ||
26 | "deletelayer_button": {"#": "deletelayer_button"}, | ||
27 | "time_markers" : {"#": "timeline_markers"}, | 25 | "time_markers" : {"#": "timeline_markers"}, |
28 | "layerRepetition" : {"@": "repetition1"}, | 26 | "layerRepetition" : {"@": "repetition1"}, |
29 | "trackRepetition" : {"@" : "repetition2"}, | 27 | "trackRepetition" : {"@" : "repetition2"}, |
@@ -170,8 +168,6 @@ | |||
170 | </div> | 168 | </div> |
171 | 169 | ||
172 | <div id="timeline_gutter" class="timelinegutter"> | 170 | <div id="timeline_gutter" class="timelinegutter"> |
173 | <div id="newlayer_button" class="newlayerbutton"></div> | ||
174 | <div id="deletelayer_button" class="deletelayerbutton"></div> | ||
175 | <input id="end_hottext" class="endhottext"> | 171 | <input id="end_hottext" class="endhottext"> |
176 | </div> | 172 | </div> |
177 | </div> | 173 | </div> |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index a1e320c4..191228af 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -19,12 +19,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
19 | 19 | ||
20 | /* === BEGIN: Models === */ | 20 | /* === BEGIN: Models === */ |
21 | _arrLayers:{ | 21 | _arrLayers:{ |
22 | serializable: true, | 22 | serializable:true, |
23 | value:[] | 23 | value:[] |
24 | }, | 24 | }, |
25 | 25 | ||
26 | arrLayers:{ | 26 | arrLayers:{ |
27 | serializable: true, | 27 | serializable:true, |
28 | get:function () { | 28 | get:function () { |
29 | return this._arrLayers; | 29 | return this._arrLayers; |
30 | }, | 30 | }, |
@@ -50,12 +50,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
50 | 50 | ||
51 | 51 | ||
52 | _layerRepetition:{ | 52 | _layerRepetition:{ |
53 | serializable: true, | 53 | serializable:true, |
54 | value:null | 54 | value:null |
55 | }, | 55 | }, |
56 | 56 | ||
57 | layerRepetition:{ | 57 | layerRepetition:{ |
58 | serializable: true, | 58 | serializable:true, |
59 | get:function () { | 59 | get:function () { |
60 | return this._layerRepetition; | 60 | return this._layerRepetition; |
61 | }, | 61 | }, |
@@ -64,18 +64,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
64 | } | 64 | } |
65 | }, | 65 | }, |
66 | 66 | ||
67 | _cacheArrays : { | 67 | _cacheArrays:{ |
68 | value: function() { | 68 | value:function () { |
69 | if (this._boolCacheArrays) { | 69 | if (this._boolCacheArrays) { |
70 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; | 70 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; |
71 | |||
72 | } | 71 | } |
73 | } | 72 | } |
74 | }, | 73 | }, |
75 | 74 | ||
76 | // Set to false to skip array caching array sets in current document | 75 | // Set to false to skip array caching array sets in current document |
77 | _boolCacheArrays : { | 76 | _boolCacheArrays:{ |
78 | value: true | 77 | value:true |
79 | }, | 78 | }, |
80 | 79 | ||
81 | _currentLayerNumber:{ | 80 | _currentLayerNumber:{ |
@@ -95,16 +94,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
95 | }, | 94 | }, |
96 | 95 | ||
97 | _setCurrentLayerNumber:{ | 96 | _setCurrentLayerNumber:{ |
98 | value:function(){ | 97 | value:function () { |
99 | if (this._boolCacheArrays) { | 98 | if (this._boolCacheArrays) { |
100 | this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; | 99 | this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; |
101 | } | 100 | } |
102 | } | 101 | } |
103 | }, | 102 | }, |
104 | 103 | ||
104 | // TODO - Remove hash tables | ||
105 | _hashKey:{ | 105 | _hashKey:{ |
106 | value:0 | 106 | value:0 |
107 | }, | 107 | }, |
108 | 108 | ||
109 | hashKey:{ | 109 | hashKey:{ |
110 | get:function () { | 110 | get:function () { |
@@ -119,46 +119,47 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
119 | }, | 119 | }, |
120 | 120 | ||
121 | _setHashKey:{ | 121 | _setHashKey:{ |
122 | value:function(){ | 122 | value:function () { |
123 | if (this._boolCacheArrays) { | 123 | if (this._boolCacheArrays) { |
124 | this.application.ninja.currentDocument.hashKey = this.hashKey; | 124 | this.application.ninja.currentDocument.hashKey = this.hashKey; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | }, | 127 | }, |
128 | 128 | ||
129 | |||
129 | _currentLayerSelected:{ | 130 | _currentLayerSelected:{ |
130 | value: null | 131 | value:null |
131 | }, | 132 | }, |
132 | currentLayerSelected : { | 133 | currentLayerSelected:{ |
133 | get: function() { | 134 | get:function () { |
134 | return this._currentLayerSelected; | 135 | return this._currentLayerSelected; |
135 | }, | 136 | }, |
136 | set: function(newVal) { | 137 | set:function (newVal) { |
137 | this._currentLayerSelected = newVal; | 138 | this._currentLayerSelected = newVal; |
138 | this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal; | 139 | this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal; |
139 | } | 140 | } |
140 | }, | 141 | }, |
141 | 142 | ||
142 | _selectedLayerID:{ | 143 | _selectedLayerID:{ |
143 | value: false | 144 | value:false |
144 | }, | 145 | }, |
145 | selectedLayerID : { | 146 | selectedLayerID:{ |
146 | get: function() { | 147 | get:function () { |
147 | return this._selectedLayerID; | 148 | return this._selectedLayerID; |