diff options
author | Eric Guzman | 2012-06-11 13:28:42 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-11 13:28:42 -0700 |
commit | 3a4727ffc350216a434a7c6977b6a23653b77780 (patch) | |
tree | c5dff306f8803c36a16163ba5df1e7f492e762b5 /js/panels/css-panel/style-declaration.reel/style-declaration.js | |
parent | d6b46ba496c9c8974ae39bb476aea35bcd1ddaf1 (diff) | |
parent | 337efc667372326ae2f9984d89a47bb151016774 (diff) | |
download | ninja-3a4727ffc350216a434a7c6977b6a23653b77780.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/panels/css-panel/style-declaration.reel/style-declaration.js')
-rw-r--r-- | js/panels/css-panel/style-declaration.reel/style-declaration.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.js b/js/panels/css-panel/style-declaration.reel/style-declaration.js index 57cbdb63..6187989b 100644 --- a/js/panels/css-panel/style-declaration.reel/style-declaration.js +++ b/js/panels/css-panel/style-declaration.reel/style-declaration.js | |||
@@ -216,7 +216,15 @@ exports.StyleDeclaration = Montage.create(Component, { | |||
216 | }, | 216 | }, |
217 | 217 | ||
218 | addNewStyle : { | 218 | addNewStyle : { |
219 | value: function() { | 219 | value: function(preventAnimation) { |
220 | if(preventAnimation) { | ||
221 | this.element.classList.add('css-animation-prevent'); | ||
222 | |||
223 | setTimeout(function() { | ||
224 | this.element.classList.remove('css-animation-prevent'); | ||
225 | }.bind(this), 1000); | ||
226 | } | ||
227 | |||
220 | this.addStyle('property', 'value', { | 228 | this.addStyle('property', 'value', { |
221 | isEmpty : true | 229 | isEmpty : true |
222 | }); | 230 | }); |