aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJonathan Duran2012-04-03 08:24:30 -0700
committerJonathan Duran2012-04-03 08:24:30 -0700
commit8b1ba44e8e1049af409b5e55720b494171a91b57 (patch)
treed1c6d336604070b504dcaa3e11f7ab15f881d805 /js/panels
parentd329906f02125da4a4e00e8c2b07e9a5f049335d (diff)
parent45ecc6b07562d195e452d0831daffdaf43973d0f (diff)
downloadninja-8b1ba44e8e1049af409b5e55720b494171a91b57.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js17
1 files changed, 6 insertions, 11 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index bba113c0..4b7fe24c 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -76,18 +76,13 @@ var Layer = exports.Layer = Montage.create(Component, {
76 return this._layerName; 76 return this._layerName;
77 }, 77 },
78 set:function(newVal){ 78 set:function(newVal){
79 console.log('Layer.layerName.set ', newVal);
80 79
81 this._layerEditable.value = newVal; 80 this._layerEditable.value = newVal;
82 this._layerName = newVal; 81 this._layerName = newVal;
83 this.layerData.layerName = newVal; 82 this.layerData.layerName = newVal;
84 if (typeof(this.dynamicLayerName) !== "undefined") { 83 if (typeof(this.dynamicLayerName) !== "undefined") {
85 this.dynamicLayerName.value = newVal; 84 this.dynamicLayerName.value = newVal;
86 } 85 }
87
88 console.log('layerName setter: ' + newVal)
89
90
91 } 86 }
92 }, 87 },
93 _layerID:{ 88 _layerID:{