diff options
author | Jon Reid | 2012-03-06 14:15:18 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 14:15:18 -0800 |
commit | 78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3 (patch) | |
tree | c395b703f21431dcb4432c725f4c860431add61b /js/panels/presets | |
parent | fa8b81d4f436c0b8564c8dcdd22d8dd6d5bccfaa (diff) | |
parent | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff) | |
download | ninja-78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3.tar.gz |
Merge branch 'Timeline-uber' into timeline-serialized
Diffstat (limited to 'js/panels/presets')
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.js | 4 | ||||
-rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.html | 1 |
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 | }, |