Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/preloader/Preloader.js

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, {
             selection.forEach(function(el) {
                 el._element.style.webkitTransition = "all 450ms linear";
 
-                el._element.addEventListener("webkitTransitionEnd", function(e) {
+                el._element.addEventListener("webkitTransitionEnd", function presetTransition(e) {
                     el._element.style.webkitTransition = '';
                     setStopRuleSelector("*");
+                    this.removeEventListener("webkitTransitionEnd", presetTransition, true);
+
                 }, true);
                 setStopRuleSelector("transitionStopRule");
                 el._element.classList.add(selectorBase);