aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/style-declaration.reel/style-declaration.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-31 11:04:35 -0700
committerValerio Virgillito2012-05-31 11:04:35 -0700
commit6042bdc5f2aada4412912fd01602d32c9088dc26 (patch)
treee3add0911bdf1dca441f2ed96b5cf0defe6b12fb /js/panels/css-panel/style-declaration.reel/style-declaration.js
parent2ea84629a355a02d7eaa33464a0298ec4999073c (diff)
parent535a2fae0f4820f9b5a9f33cec250f11c0ee5bb9 (diff)
downloadninja-6042bdc5f2aada4412912fd01602d32c9088dc26.tar.gz
Merge pull request #261 from ericguzman/CSSPanelUpdates
CSS Panel Toolbar - Prevent warning regarding undefined sourceObject
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.js10
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 });