aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/style-presets.reel/style-presets.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-02 15:35:27 -0800
committerNivesh Rajbhandari2012-03-02 15:35:27 -0800
commit5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4 (patch)
tree090b724123be441ce379e6c0f0bc12540fee0d5c /js/panels/presets/style-presets.reel/style-presets.js
parentcc772ef3333ed419d269a2bda7aea5b0150a7bd9 (diff)
parent0aeb400070762cf01d83cf9f9ee25a5595098b7f (diff)
downloadninja-5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/panels/presets/style-presets.reel/style-presets.js')
-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);