diff options
author | Jon Reid | 2012-03-09 15:34:46 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-09 15:34:46 -0800 |
commit | ebe6a42bdf76d53a985dec528ad9702df3738f56 (patch) | |
tree | 8f60b3f4d2a95a7882a2ad336f6eeb219805ab29 /js/panels/Timeline/Layer.reel | |
parent | c9fd12017da554a3962e3fef01ac42ec69d02001 (diff) | |
download | ninja-ebe6a42bdf76d53a985dec528ad9702df3738f56.tar.gz |
Timeline: Fixes for deleting layers, layer selection, persisting layer name edits and selection between document switching.
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index e561e45d..b41680be 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -82,8 +82,8 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
82 | if (newVal !== this._layerName) { | 82 | if (newVal !== this._layerName) { |
83 | this._layerEditable.value = newVal; | 83 | this._layerEditable.value = newVal; |
84 | this._layerName = newVal; | 84 | this._layerName = newVal; |
85 | //this._layerEditable.needsDraw = true; | 85 | this.layerData.layerName = newVal; |
86 | //this.needsDraw = true; | 86 | this.log('layerName setter: ' + newVal) |
87 | } | 87 | } |
88 | 88 | ||
89 | } | 89 | } |
@@ -259,6 +259,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
259 | this.selectStyle(false); | 259 | this.selectStyle(false); |
260 | } | 260 | } |
261 | this._isSelected = value; | 261 | this._isSelected = value; |
262 | this.layerData.isSelected = value; | ||
262 | //this.needsDraw = true; | 263 | //this.needsDraw = true; |
263 | } | 264 | } |
264 | 265 | ||
@@ -405,6 +406,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
405 | 406 | ||
406 | setData:{ | 407 | setData:{ |
407 | value:function(){ | 408 | value:function(){ |
409 | this.log('layer: setData called') | ||
408 | this.layerName = this.layerData.layerName; | 410 | this.layerName = this.layerData.layerName; |
409 | this.layerID = this.layerData.layerID; | 411 | this.layerID = this.layerData.layerID; |
410 | this.arrLayerStyles = this.layerData.arrLayerStyles; | 412 | this.arrLayerStyles = this.layerData.arrLayerStyles; |