diff options
author | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
commit | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch) | |
tree | 6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /js/panels/presets/style-presets.reel | |
parent | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff) | |
parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
download | ninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/presets/style-presets.reel')
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.js | 4 |
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); |