diff options
author | Jonathan Duran | 2012-03-29 07:29:36 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-29 07:29:36 -0700 |
commit | aa9d13bb03f9fdc090bbf78c10ed8d5c79895019 (patch) | |
tree | ac2214b01e37fe274641e5b08005e9cf4053c4e7 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
parent | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (diff) | |
parent | 7845d312396e3329ac9246d4c13e99cb623216d5 (diff) | |
download | ninja-aa9d13bb03f9fdc090bbf78c10ed8d5c79895019.tar.gz |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index cb133f58..a82d3373 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -294,17 +294,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
294 | if (newVal !== this._dropLayerID) { | 294 | if (newVal !== this._dropLayerID) { |
295 | this._dropLayerID = newVal; | 295 | this._dropLayerID = newVal; |
296 | 296 | ||
297 | // Create a snapshot of arrLayers so we can manipulate it safely | 297 | var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), |
298 | var arrLayers = this.arrLayers, | ||
299 | dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), | ||
300 | dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), | 298 | dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), |
301 | dragLayer = arrLayers[dragLayerIndex]; | 299 | dragLayer = this.arrLayers[dragLayerIndex]; |
302 | 300 | ||
303 | arrLayers.splice(dragLayerIndex, 1); | 301 | this.arrLayers.splice(dragLayerIndex, 1); |
304 | arrLayers.splice(dropLayerIndex, 0, dragLayer); | 302 | this.arrLayers.splice(dropLayerIndex, 0, dragLayer); |
305 | 303 | this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; | |
306 | // Update the repetition! | ||
307 | this.arrLayers = arrLayers; | ||
308 | 304 | ||
309 | // Clear for future DnD | 305 | // Clear for future DnD |
310 | this._dropLayerID = null; | 306 | this._dropLayerID = null; |