diff options
author | Jonathan Duran | 2012-06-11 10:11:15 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-11 10:11:15 -0700 |
commit | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (patch) | |
tree | fc8cab9798c2dcb4e5a904a4c055021520d974d8 /js/panels/Timeline/Layer.reel | |
parent | 020a8147088f09547b7e84db2ada7c48f25c089f (diff) | |
download | ninja-79cbc26904a7fbd7a846f48da6c026a91221ba93.tar.gz |
changes to reopen sub property functions
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 5 |
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; |