aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/style-presets.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-02 14:05:21 -0800
committerValerio Virgillito2012-03-02 14:05:21 -0800
commit0aeb400070762cf01d83cf9f9ee25a5595098b7f (patch)
treee01815f333e32771fd28725485eb3935bcd94ab8 /js/panels/presets/style-presets.reel
parentff0a956f33df034e9a009cfcb8999e469456a4b5 (diff)
parentaabb48a1c8d34bc968f4c6b0ffee4e31c1d5d286 (diff)
downloadninja-0aeb400070762cf01d83cf9f9ee25a5595098b7f.tar.gz
Merge pull request #94 from ericguzman/PresetsPanel
Presets Panel - Fix single-click activation, and transition cut-off bug.
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);