aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-27 14:29:53 -0800
committerJose Antonio Marquez2012-02-27 14:29:53 -0800
commitceba159acedcaada47f990392b3bbebc2025e40a (patch)
tree9e7f9b00ac5b25eec744ce1ff9d407e4317569ab /js
parenta564d969ffcb7bc0dd701a1ef653f666ae857f77 (diff)
parent3e2889b94d5e6af93ec0eaca114802e30c8c38ef (diff)
downloadninja-ceba159acedcaada47f990392b3bbebc2025e40a.tar.gz
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
Diffstat (limited to 'js')
-rwxr-xr-xjs/document/html-document.js4
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
2 files changed, 5 insertions, 1 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 76436732..75628731 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -679,6 +679,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
679 if(typeof this.application.ninja.selectedElements !== 'undefined'){ 679 if(typeof this.application.ninja.selectedElements !== 'undefined'){
680 this.selectionModel = this.application.ninja.selectedElements; 680 this.selectionModel = this.application.ninja.selectedElements;
681 } 681 }
682
683 this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
682 } 684 }
683 }, 685 },
684 686
@@ -700,6 +702,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
700 this.application.ninja.stage._scrollLeft = this.savedTopScroll; 702 this.application.ninja.stage._scrollLeft = this.savedTopScroll;
701 } 703 }
702 this.application.ninja.stage.handleScroll(); 704 this.application.ninja.stage.handleScroll();
705
706 this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
703 } 707 }
704 } 708 }
705 //////////////////////////////////////////////////////////////////// 709 ////////////////////////////////////////////////////////////////////
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 443a18ac..62b514ee 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -170,7 +170,7 @@ exports.KeyboardMediator = Montage.create(Component, {
170 } 170 }
171 171
172 // Zoom tool 172 // Zoom tool
173 if(evt.keyCode === Keyboard.Z ) { 173 if((evt.keyCode === Keyboard.Z) && !(evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {//ctrl or shift key not press with Z
174 evt.preventDefault(); 174 evt.preventDefault();
175 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]}); 175 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
176 return; 176 return;