Merge branch 'refs/heads/Ninja-Internal' into Document

2 files changed, 10 insertions, 13 deletions

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;
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)"
                         }
                     }]
                 }]