aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 3fc5a3e1..acc0567c 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -601,7 +601,7 @@ var Layer = exports.Layer = Montage.create(Component, {
601 } 601 }
602 }, 602 },
603 addStyle : { 603 addStyle : {
604 value: function(styleProperty) { 604 value: function(styleProperty, existingRule) {
605 // Add a new style rule. It should be added above the currently selected rule, 605 // Add a new style rule. It should be added above the currently selected rule,
606 // Or at the end, if no rule is selected. 606 // Or at the end, if no rule is selected.
607 607
@@ -630,6 +630,9 @@ var Layer = exports.Layer = Montage.create(Component, {
630 newStyle.editorProperty = styleProperty; 630 newStyle.editorProperty = styleProperty;
631 newEvent.layerEventType = "restoreStyle"; 631 newEvent.layerEventType = "restoreStyle";
632 newEvent.trackEditorProperty = styleProperty; 632 newEvent.trackEditorProperty = styleProperty;
633 if(existingRule){
634 newEvent.existingRule = existingRule;
635 }
633 } 636 }
634 newStyle.editorValue = ""; 637 newStyle.editorValue = "";
635 newStyle.ruleTweener = false; 638 newStyle.ruleTweener = false;