aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-12 11:13:39 -0700
committerValerio Virgillito2012-06-12 11:13:39 -0700
commitc08220b45b9a22e87955671a5223c6c55b78053b (patch)
tree0af1aaf4f781061191e0541bdbaf51b24f4b9413 /js/panels/Timeline/Layer.reel
parent471776facca730c57b0f6b8448535914df6624fd (diff)
parent962d8d11c68761a1c3c89289dc0f6d9de07da755 (diff)
downloadninja-c08220b45b9a22e87955671a5223c6c55b78053b.tar.gz
Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-internal into montage-v10-integration
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 6b64261e..a2d6444d 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -372,6 +372,19 @@ var Layer = exports.Layer = Montage.create(Component, {
372 _layerEditable : { 372 _layerEditable : {
373 value: false 373 value: false
374 }, 374 },
375
376 _dynamicLayerName:{
377 value:true
378 },
379 dynamicLayerName:{
380 serializable:true,
381 get:function () {
382 return this._dynamicLayerName;
383 },
384 set:function (newVal) {
385 this._dynamicLayerName = newVal;
386 }
387 },
375 388
376 // Are the various collapsers collapsed or not 389 // Are the various collapsers collapsed or not
377 _isMainCollapsed : { 390 _isMainCollapsed : {