diff options
author | Eric Guzman | 2012-03-02 11:22:44 -0800 |
---|---|---|
committer | Eric Guzman | 2012-03-02 11:22:44 -0800 |
commit | aabb48a1c8d34bc968f4c6b0ffee4e31c1d5d286 (patch) | |
tree | e01815f333e32771fd28725485eb3935bcd94ab8 /js/panels/presets | |
parent | ff0a956f33df034e9a009cfcb8999e469456a4b5 (diff) | |
download | ninja-aabb48a1c8d34bc968f4c6b0ffee4e31c1d5d286.tar.gz |
Presets Panel - Fix single-click activation, and transition cut-off bug.
Use double-click as the activation event for transition presets. Also fixed the bug when applying a style preset before the transition preset, which disabled transitions after the first one.
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 | }, |