aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 15:17:39 -0700
committerValerio Virgillito2012-05-03 15:17:39 -0700
commitdca94d9d1e2a6a113356b685df991472ea3e5576 (patch)
treed632b0fdc80e4e091c0e123d790d1ab4e14bfed5 /js/panels
parent2078bfa96afaef40acb4edac99848ba55e808ef1 (diff)
parent602240c38e0f2c3937d3c7246247e0b59bccab2b (diff)
downloadninja-dca94d9d1e2a6a113356b685df991472ea3e5576.tar.gz
Merge branch 'refs/heads/master' into tag-2.0
Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js20
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 70e04b4c..66ef1b97 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -278,6 +278,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
278 _dragLayerID : { 278 _dragLayerID : {
279 value: null 279 value: null
280 }, 280 },
281
282 layersDragged:{
283 value:[],
284 writable:true
285 },
286
281 dragLayerID : { 287 dragLayerID : {
282 get: function() { 288 get: function() {
283 return this._dragLayerID; 289 return this._dragLayerID;
@@ -302,6 +308,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
302 var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), 308 var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID),
303 dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), 309 dropLayerIndex = this.getLayerIndexByID(this.dropLayerID),
304 dragLayer = this.arrLayers[dragLayerIndex]; 310 dragLayer = this.arrLayers[dragLayerIndex];
311 this.layersDragged.push(dragLayer);
312 this._layerDroppedInPlace = this.arrLayers[dropLayerIndex];
305 313
306 this.arrLayers.splice(dragLayerIndex, 1); 314 this.arrLayers.splice(dragLayerIndex, 1);
307 this.arrLayers.splice(dropLayerIndex, 0, dragLayer); 315 this.arrLayers.splice(dropLayerIndex, 0, dragLayer);
@@ -403,6 +411,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
403 this._deleteHelper = false; 411 this._deleteHelper = false;
404 } 412 }
405 } 413 }
414 this.application.ninja.elementMediator.reArrangeDOM(this.layersDragged , this._layerDroppedInPlace);
415 this.layersDragged =[];
406 } 416 }
407 } 417 }
408 }, 418 },
@@ -903,15 +913,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
903 } 913 }
904 }, 914 },
905 915
906
907
908
909
910
911
912
913
914
915 deselectTweens:{ 916 deselectTweens:{
916 value:function () { 917 value:function () {
917 for (var i = 0; i < this.selectedTweens.length; i++) { 918 for (var i = 0; i < this.selectedTweens.length; i++) {
@@ -1038,7 +1039,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1038 1039
1039 this._openDoc = false; 1040 this._openDoc = false;
1040 1041
1041
1042 } 1042 }
1043 }, 1043 },
1044 1044