diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 6e64cde0..48818e44 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -269,6 +269,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
269 | _dragLayerID : { | 269 | _dragLayerID : { |
270 | value: null | 270 | value: null |
271 | }, | 271 | }, |
272 | |||
273 | layersDragged:{ | ||
274 | value:[], | ||
275 | writable:true | ||
276 | }, | ||
277 | |||
272 | dragLayerID : { | 278 | dragLayerID : { |
273 | get: function() { | 279 | get: function() { |
274 | return this._dragLayerID; | 280 | return this._dragLayerID; |
@@ -293,6 +299,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
293 | var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), | 299 | var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), |
294 | dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), | 300 | dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), |
295 | dragLayer = this.arrLayers[dragLayerIndex]; | 301 | dragLayer = this.arrLayers[dragLayerIndex]; |
302 | this.layersDragged.push(dragLayer); | ||
303 | this._layerDroppedInPlace = this.arrLayers[dropLayerIndex]; | ||
296 | 304 | ||
297 | this.arrLayers.splice(dragLayerIndex, 1); | 305 | this.arrLayers.splice(dragLayerIndex, 1); |
298 | this.arrLayers.splice(dropLayerIndex, 0, dragLayer); | 306 | this.arrLayers.splice(dropLayerIndex, 0, dragLayer); |
@@ -394,6 +402,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
394 | this._deleteHelper = false; | 402 | this._deleteHelper = false; |
395 | } | 403 | } |
396 | } | 404 | } |
405 | this.application.ninja.elementMediator.reArrangeDOM(this.layersDragged , this._layerDroppedInPlace); | ||
406 | this.layersDragged =[]; | ||
397 | } | 407 | } |
398 | } | 408 | } |
399 | }, | 409 | }, |
@@ -894,15 +904,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
894 | } | 904 | } |
895 | }, | 905 | }, |
896 | 906 | ||
897 | |||
898 | |||
899 | |||
900 | |||
901 | |||
902 | |||
903 | |||
904 | |||
905 | |||
906 | deselectTweens:{ | 907 | deselectTweens:{ |
907 | value:function () { | 908 | value:function () { |
908 | for (var i = 0; i < this.selectedTweens.length; i++) { | 909 | for (var i = 0; i < this.selectedTweens.length; i++) { |
@@ -1029,7 +1030,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1029 | 1030 | ||
1030 | this._openDoc = false; | 1031 | this._openDoc = false; |
1031 | 1032 | ||
1032 | |||
1033 | } | 1033 | } |
1034 | }, | 1034 | }, |
1035 | 1035 | ||