aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-02 14:20:46 -0800
committerJose Antonio Marquez2012-03-02 14:20:46 -0800
commit4d35a90ba032d51ce701eebec323117d02e827fa (patch)
tree9c5fc8bf41bd73ca4e9a5d6f950ca72cd589b92c
parente24631ecac0772fc51756fe4aff9638de3b95faf (diff)
parent0aeb400070762cf01d83cf9f9ee25a5595098b7f (diff)
downloadninja-4d35a90ba032d51ce701eebec323117d02e827fa.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js4
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html1
2 files changed, 4 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);
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index c22ed351..5dc28edf 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -40,6 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
40 "element" : {"#": "libraryContainer"}, 40 "element" : {"#": "libraryContainer"},
41 "branchComponent" : {"@": "branch" }, 41 "branchComponent" : {"@": "branch" },
42 "contentController": {"@": "presetsController"}, 42 "contentController": {"@": "presetsController"},
43 "activationEvent" : "dblclick",
43 "showRoot": false 44 "showRoot": false
44 } 45 }
45 }, 46 },