aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-04 18:10:52 -0700
committerValerio Virgillito2012-05-04 18:10:52 -0700
commit30e837ade2da7cb20caf7c5a69faf0888736bb9a (patch)
tree3155deaea5616fa09fc96c84567419fec5f288a2 /js/mediators
parent3ebed34665fa73b0ce613b400f3029ebf4476439 (diff)
parent1b2af54128985c1b622e13ea740a8402e57527cc (diff)
downloadninja-30e837ade2da7cb20caf7c5a69faf0888736bb9a.tar.gz
Merge pull request #195 from mqg734/Dom-Architecture
Fixes for 3d, selection, and keyboard shortcuts
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/keyboard-mediator.js31
1 files changed, 3 insertions, 28 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index f8934669..49960f58 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -87,7 +87,8 @@ exports.KeyboardMediator = Montage.create(Component, {
87 value: function(evt) { 87 value: function(evt) {
88 88
89 //keyboard controls for html design view 89 //keyboard controls for html design view
90 if((!!this.application.ninja.documentController.activeDocument) && (this.application.ninja.documentController.activeDocument.currentView === "design")){ 90 // TODO - New template mode doesn't set currentView yet.
91 if((!!this.application.ninja.currentDocument)){// && (this.application.ninja.currentDocument.model.currentView === "design")){
91 92
92 // Don't do anything if an input or other control is focused 93 // Don't do anything if an input or other control is focused
93 if(document.activeElement.nodeName !== "BODY") { 94 if(document.activeElement.nodeName !== "BODY") {
@@ -256,7 +257,7 @@ exports.KeyboardMediator = Montage.create(Component, {
256 handleKeyup: { 257 handleKeyup: {
257 value: function(evt) { 258 value: function(evt) {
258 //keyboard controls for html design view 259 //keyboard controls for html design view
259 if((!!this.application.ninja.documentController.activeDocument) && (this.application.ninja.documentController.activeDocument.currentView === "design")){ 260 if((!!this.application.ninja.currentDocument)){// && (this.application.ninja.currentDocument.model.currentView === "design")){
260 if(document.activeElement.nodeName !== "BODY") { 261 if(document.activeElement.nodeName !== "BODY") {
261 // Don't do anything if an input or other control is focused 262 // Don't do anything if an input or other control is focused
262 return; 263 return;
@@ -265,31 +266,5 @@ exports.KeyboardMediator = Montage.create(Component, {
265 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleKeyUp(evt); 266 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleKeyUp(evt);
266 } 267 }
267 } 268 }
268 },
269
270 _handleKeydown: {
271 value: function(evt) {
272
273 // Check if cmd-shift-+/ctrl-shift-+ for toggling snapping
274 if(evt.shiftKey && (evt.ctrlKey || evt.metaKey) && (evt.keyCode === 187))
275 {
276 MainMenuModule.MenuActionManager.toggleSnapping("snap", !DocumentManagerModule.DocumentManager.activeDocument.snapping);
277 evt.preventDefault();
278 return;
279 }
280
281 if(evt.keyCode === Keyboard.PLUS && (evt.metaKey||evt.ctrlKey)) {
282 evt.preventDefault();
283 this._toolsList.action("zoomIn", evt);
284 return;
285 }
286
287 if(evt.keyCode === Keyboard.MINUS && (evt.metaKey || evt.ctrlKey)) {
288 evt.preventDefault();
289 this._toolsList.action("zoomOut", evt);
290 return;
291 }
292
293 }
294 } 269 }
295}); 270});