aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 4fb3e43c..8df0e9ae 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -556,7 +556,7 @@ var Layer = exports.Layer = Montage.create(Component, {
556 } 556 }
557 }, 557 },
558 addStyle : { 558 addStyle : {
559 value: function() { 559 value: function(styleProperty) {
560 // Add a new style rule. It should be added above the currently selected rule, 560 // Add a new style rule. It should be added above the currently selected rule,
561 // Or at the end, if no rule is selected. 561 // Or at the end, if no rule is selected.
562 562
@@ -579,7 +579,12 @@ var Layer = exports.Layer = Montage.create(Component, {
579 579
580 newStyle.styleID = newEvent.styleID; 580 newStyle.styleID = newEvent.styleID;
581 newStyle.whichView = "hintable"; 581 newStyle.whichView = "hintable";
582 newStyle.editorProperty = ""; 582 newStyle.editorProperty = "";
583 if(styleProperty){
584 newStyle.editorProperty = styleProperty;
585 newEvent.layerEventType = "restoreStyle";
586 newEvent.trackEditorProperty = styleProperty;
587 }
583 newStyle.editorValue = ""; 588 newStyle.editorValue = "";
584 newStyle.ruleTweener = false; 589 newStyle.ruleTweener = false;
585 newStyle.isSelected = false; 590 newStyle.isSelected = false;