From 03787df5da551620831c134aa11ee198397c9f6d Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 26 Apr 2012 10:51:57 -0700 Subject: We don't currently support perspective values on individual elements, so removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari --- js/panels/presets/default-animation-presets.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'js') diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js index 578c1622..753b3365 100644 --- a/js/panels/presets/default-animation-presets.js +++ b/js/panels/presets/default-animation-presets.js @@ -52,7 +52,6 @@ exports.animationPresets = { "-webkit-animation-direction": "normal", "-webkit-animation-timing-function": "ease", "-webkit-transform-style": "preserve-3d", - "-webkit-transform": "perspective(1000)", "-webkit-animation-delay": "0s" } },{ @@ -100,7 +99,6 @@ exports.animationPresets = { "-webkit-animation-timing-function": "ease-out", "-webkit-transform-origin": "100% 50%", "-webkit-transform-style": "preserve-3d", - "-webkit-transform": "perspective(1000)", "-webkit-animation-delay": "0s" } },{ @@ -109,31 +107,31 @@ exports.animationPresets = { "keyText": "0%", "styles": { "opacity": "1", - "-webkit-transform": "perspective(1000) rotateY(0deg)" + "-webkit-transform": "rotateY(0deg)" } }, { "keyText": "70%", "styles": { "opacity": "1", - "-webkit-transform": "perspective(1000) rotateY(0deg)" + "-webkit-transform": "rotateY(0deg)" } }, { "keyText": "85%", "styles": { "opacity": "0", - "-webkit-transform": "perspective(1000) rotateY(95deg)" + "-webkit-transform": "rotateY(95deg)" } }, { "keyText": "86%", "styles": { "opacity": "0", - "-webkit-transform": "perspective(1000) rotateY(-90deg)" + "-webkit-transform": "rotateY(-90deg)" } }, { "keyText": "100%", "styles": { "opacity": "1", - "-webkit-transform": "perspective(1000) rotateY(0deg)" + "-webkit-transform": "rotateY(0deg)" } }] }] @@ -151,7 +149,6 @@ exports.animationPresets = { "-webkit-animation-timing-function": "ease-out", "-webkit-transform-origin": "100% 50%", "-webkit-transform-style": "preserve-3d", - "-webkit-transform": "perspective(1000)", "-webkit-animation-delay": "0s" } },{ @@ -160,25 +157,25 @@ exports.animationPresets = { "keyText": "0%", "styles": { "opacity": "0", - "-webkit-transform": "perspective(1000) rotateY(-90deg)" + "-webkit-transform": "rotateY(-90deg)" } }, { "keyText": "15%", "styles": { "opacity": "1", - "-webkit-transform": "perspective(1000) rotateY(0deg)" + "-webkit-transform": "rotateY(0deg)" } }, { "keyText": "85%", "styles": { "opacity": "1", - "-webkit-transform": "perspective(1000) rotateY(0deg)" + "-webkit-transform": "rotateY(0deg)" } }, { "keyText": "100%", "styles": { "opacity": "0", - "-webkit-transform": "perspective(1000) rotateY(95deg)" + "-webkit-transform": "rotateY(95deg)" } }] }] -- cgit v1.2.3 From 8de97515958eb22208d4d6c1987d71b55141e9e9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 26 Apr 2012 14:12:48 -0700 Subject: Fixing the eye dropper shortcut. Signed-off-by: Valerio Virgillito --- js/mediators/keyboard-mediator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 79967799..f8934669 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js @@ -180,7 +180,7 @@ exports.KeyboardMediator = Montage.create(Component, { } // Shortcut for Eyedropper Tool is I - if(evt.keyCode === Keyboard.I ) { + if(evt.keyCode === Keyboard.I && !(evt.ctrlKey || evt.metaKey)) { evt.preventDefault(); this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]}); return; -- cgit v1.2.3