aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/style-presets.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-05 14:49:05 -0800
committerPushkar Joshi2012-03-05 14:49:05 -0800
commitdb82be91f767a07b7cb8c97ca3d9f4c4d75bc9ae (patch)
tree21e0ee213e24de67eb9c4cddfc5f3069c2257aae /js/panels/presets/style-presets.reel
parent4419209a1fd850ab468209b562b66b0242b42a9c (diff)
parent13f52cf0c74f53a919fa864f86669e8155f82961 (diff)
downloadninja-db82be91f767a07b7cb8c97ca3d9f4c4d75bc9ae.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/presets/style-presets.reel')
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 7871683e..11f41822 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -47,9 +47,11 @@ exports.StylesLibrary = Montage.create(Component, {
47 selection.forEach(function(el) { 47 selection.forEach(function(el) {
48 el._element.style.webkitTransition = "all 450ms linear"; 48 el._element.style.webkitTransition = "all 450ms linear";
49 49
50 el._element.addEventListener("webkitTransitionEnd", function(e) { 50 el._element.addEventListener("webkitTransitionEnd", function presetTransition(e) {
51 el._element.style.webkitTransition = ''; 51 el._element.style.webkitTransition = '';
52 setStopRuleSelector("*"); 52 setStopRuleSelector("*");
53 this.removeEventListener("webkitTransitionEnd", presetTransition, true);
54
53 }, true); 55 }, true);
54 setStopRuleSelector("transitionStopRule"); 56 setStopRuleSelector("transitionStopRule");
55 el._element.classList.add(selectorBase); 57 el._element.classList.add(selectorBase);