aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:06:14 -0700
committerValerio Virgillito2012-04-26 17:06:14 -0700
commita0ba2437965f486667d07bba60c031a11d778e6a (patch)
tree7f8f990c28fbb6f5659012ada11ff5dd21ff56a2 /js
parenta0e730636083eff0c757cd9e16698e3b8e0066c1 (diff)
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
downloadninja-a0ba2437965f486667d07bba60c031a11d778e6a.tar.gz
Merge branch 'refs/heads/master' into stage-document-architecture
Diffstat (limited to 'js')
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
-rw-r--r--js/panels/presets/default-animation-presets.js21
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, {
180 } 180 }
181 181
182 // Shortcut for Eyedropper Tool is I 182 // Shortcut for Eyedropper Tool is I
183 if(evt.keyCode === Keyboard.I ) { 183 if(evt.keyCode === Keyboard.I && !(evt.ctrlKey || evt.metaKey)) {
184 evt.preventDefault(); 184 evt.preventDefault();
185 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]}); 185 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]});
186 return; 186 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 = {
52 "-webkit-animation-direction": "normal", 52 "-webkit-animation-direction": "normal",
53 "-webkit-animation-timing-function": "ease", 53 "-webkit-animation-timing-function": "ease",
54 "-webkit-transform-style": "preserve-3d", 54 "-webkit-transform-style": "preserve-3d",
55 "-webkit-transform": "perspective(1000)",
56 "-webkit-animation-delay": "0s" 55 "-webkit-animation-delay": "0s"
57 } 56 }
58 },{ 57 },{
@@ -100,7 +99,6 @@ exports.animationPresets = {
100 "-webkit-animation-timing-function": "ease-out", 99 "-webkit-animation-timing-function": "ease-out",
101 "-webkit-transform-origin": "100% 50%", 100 "-webkit-transform-origin": "100% 50%",
102 "-webkit-transform-style": "preserve-3d", 101 "-webkit-transform-style": "preserve-3d",
103 "-webkit-transform": "perspective(1000)",
104 "-webkit-animation-delay": "0s" 102 "-webkit-animation-delay": "0s"
105 } 103 }
106 },{ 104 },{
@@ -109,31 +107,31 @@ exports.animationPresets = {
109 "keyText": "0%", 107 "keyText": "0%",
110 "styles": { 108 "styles": {
111 "opacity": "1", 109 "opacity": "1",
112 "-webkit-transform": "perspective(1000) rotateY(0deg)" 110 "-webkit-transform": "rotateY(0deg)"
113 } 111 }
114 }, { 112 }, {
115 "keyText": "70%", 113 "keyText": "70%",
116 "styles": { 114 "styles": {
117 "opacity": "1", 115 "opacity": "1",
118 "-webkit-transform": "perspective(1000) rotateY(0deg)" 116 "-webkit-transform": "rotateY(0deg)"
119 } 117 }
120 }, { 118 }, {
121 "keyText": "85%", 119 "keyText": "85%",
122 "styles": { 120 "styles": {
123 "opacity": "0", 121 "opacity": "0",
124 "-webkit-transform": "perspective(1000) rotateY(95deg)" 122 "-webkit-transform": "rotateY(95deg)"
125 } 123 }
126 }, { 124 }, {
127 "keyText": "86%", 125 "keyText": "86%",
128 "styles": { 126 "styles": {
129 "opacity": "0", 127 "opacity": "0",
130 "-webkit-transform": "perspective(1000) rotateY(-90deg)" 128 "-webkit-transform": "rotateY(-90deg)"
131 } 129 }
132 }, { 130 }, {
133 "keyText": "100%", 131 "keyText": "100%",
134 "styles": { 132 "styles": {
135 "opacity": "1", 133 "opacity": "1",
136 "-webkit-transform": "perspective(1000) rotateY(0deg)" 134 "-webkit-transform": "rotateY(0deg)"
137 } 135 }
138 }] 136 }]
139 }] 137 }]
@@ -151,7 +149,6 @@ exports.animationPresets = {
151 "-webkit-animation-timing-function": "ease-out", 149 "-webkit-animation-timing-function": "ease-out",
152 "-webkit-transform-origin": "100% 50%", 150 "-webkit-transform-origin": "100% 50%",
153 "-webkit-transform-style": "preserve-3d", 151 "-webkit-transform-style": "preserve-3d",
154 "-webkit-transform": "perspective(1000)",
155 "-webkit-animation-delay": "0s" 152 "-webkit-animation-delay": "0s"
156 } 153 }
157 },{ 154 },{
@@ -160,25 +157,25 @@ exports.animationPresets = {
160 "keyText": "0%", 157 "keyText": "0%",
161 "styles": { 158 "styles": {
162 "opacity": "0", 159 "opacity": "0",
163 "-webkit-transform": "perspective(1000) rotateY(-90deg)" 160 "-webkit-transform": "rotateY(-90deg)"
164 } 161 }
165 }, { 162 }, {
166 "keyText": "15%", 163 "keyText": "15%",
167 "styles": { 164 "styles": {
168 "opacity": "1", 165 "opacity": "1",
169 "-webkit-transform": "perspective(1000) rotateY(0deg)" 166 "-webkit-transform": "rotateY(0deg)"
170 } 167 }
171 }, { 168 }, {
172 "keyText": "85%", 169 "keyText": "85%",
173 "styles": { 170 "styles": {
174 "opacity": "1", 171 "opacity": "1",
175 "-webkit-transform": "perspective(1000) rotateY(0deg)" 172 "-webkit-transform": "rotateY(0deg)"
176 } 173 }
177 }, { 174 }, {
178 "keyText": "100%", 175 "keyText": "100%",
179 "styles": { 176 "styles": {
180 "opacity": "0", 177 "opacity": "0",
181 "-webkit-transform": "perspective(1000) rotateY(95deg)" 178 "-webkit-transform": "rotateY(95deg)"
182 } 179 }
183 }] 180 }]
184 }] 181 }]