aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js39
1 files changed, 15 insertions, 24 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 70e04b4c..d1cab096 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -16,7 +16,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
16 16
17 /* === BEGIN: Models === */ 17 /* === BEGIN: Models === */
18 _arrLayers:{ 18 _arrLayers:{
19 serializable:true,
20 value:[] 19 value:[]
21 }, 20 },
22 21
@@ -47,12 +46,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
47 46
48 47
49 _layerRepetition:{ 48 _layerRepetition:{
50 serializable:true,
51 value:null 49 value:null
52 }, 50 },
53 51
54 layerRepetition:{ 52 layerRepetition:{
55 serializable:true,
56 get:function () { 53 get:function () {
57 return this._layerRepetition; 54 return this._layerRepetition;
58 }, 55 },
@@ -170,7 +167,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
170 }, 167 },
171 168
172 _masterDuration:{ 169 _masterDuration:{
173 serializable:true,
174 value:0 170 value:0
175 }, 171 },
176 172
@@ -186,12 +182,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
186 }, 182 },
187 183
188 _trackRepetition:{ 184 _trackRepetition:{
189 serializable:true,
190 value:null 185 value:null
191 }, 186 },
192 187
193 trackRepetition:{ 188 trackRepetition:{
194 serializable:true,
195 get:function () { 189 get:function () {
196 return this._trackRepetition; 190 return this._trackRepetition;
197 }, 191 },
@@ -249,18 +243,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
249 }, 243 },
250 244
251 _firstTimeLoaded:{ 245 _firstTimeLoaded:{
252 value:true, 246 value:true
253 writable:true
254 }, 247 },
255 248
256 _captureSelection:{ 249 _captureSelection:{
257 value:false, 250 value:false
258 writable:true
259 }, 251 },
260 252
261 _openDoc:{ 253 _openDoc:{
262 value:false, 254 value:false
263 writable:true
264 }, 255 },
265 256
266 timeMarkerHolder:{ 257 timeMarkerHolder:{
@@ -278,6 +269,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
278 _dragLayerID : { 269 _dragLayerID : {
279 value: null 270 value: null
280 }, 271 },
272
273 layersDragged:{
274 value:[],
275 writable:true
276 },
277
281 dragLayerID : { 278 dragLayerID : {
282 get: function() { 279 get: function() {
283 return this._dragLayerID; 280 return this._dragLayerID;
@@ -302,6 +299,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
302 var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), 299 var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID),
303 dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), 300 dropLayerIndex = this.getLayerIndexByID(this.dropLayerID),
304 dragLayer = this.arrLayers[dragLayerIndex]; 301 dragLayer = this.arrLayers[dragLayerIndex];
302 this.layersDragged.push(dragLayer);
303 this._layerDroppedInPlace = this.arrLayers[dropLayerIndex];
305 304
306 this.arrLayers.splice(dragLayerIndex, 1); 305 this.arrLayers.splice(dragLayerIndex, 1);
307 this.arrLayers.splice(dropLayerIndex, 0, dragLayer); 306 this.arrLayers.splice(dropLayerIndex, 0, dragLayer);
@@ -403,6 +402,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
403 this._deleteHelper = false; 402 this._deleteHelper = false;
404 } 403 }
405 } 404 }
405 this.application.ninja.elementMediator.reArrangeDOM(this.layersDragged , this._layerDroppedInPlace);
406 this.layersDragged =[];
406 } 407 }
407 } 408 }
408 }, 409 },
@@ -653,7 +654,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
653 654
654 //debugger; 655 //debugger;
655 if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { 656 if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") {
656 this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; 657// this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
657 } 658 }
658 659
659 // Are we only showing animated layers? 660 // Are we only showing animated layers?
@@ -714,7 +715,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
714 // there is a currentDocument. We don't do anything at that time. 715 // there is a currentDocument. We don't do anything at that time.
715 return; 716 return;
716 } 717 }
717 this.application.ninja.currentDocument.setLevel = true; 718 // this.application.ninja.currentDocument.setLevel = true;
718 this._boolCacheArrays = false; 719 this._boolCacheArrays = false;
719 this.clearTimelinePanel(); 720 this.clearTimelinePanel();
720 this._boolCacheArrays = true; 721 this._boolCacheArrays = true;
@@ -903,15 +904,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
903 } 904 }
904 }, 905 },
905 906
906
907
908
909
910
911
912
913
914
915 deselectTweens:{ 907 deselectTweens:{
916 value:function () { 908 value:function () {
917 for (var i = 0; i < this.selectedTweens.length; i++) { 909 for (var i = 0; i < this.selectedTweens.length; i++) {
@@ -1038,7 +1030,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1038 1030
1039 this._openDoc = false; 1031 this._openDoc = false;
1040 1032
1041
1042 } 1033 }
1043 }, 1034 },
1044 1035