aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-28 13:20:44 -0800
committerValerio Virgillito2012-02-28 13:20:44 -0800
commit7cafa0464ee0c1621ffea04c2192f19008c9fc49 (patch)
treea6ee9fc9b8141d52825ac8ccc9aaed76ef73ee37 /js/document/html-document.js
parent2ab07cb8ac76a06606ce455bb2e6b4889e3ddc65 (diff)
parent811d5092345bf520f6a683eec89cf7d8ed7aa490 (diff)
downloadninja-7cafa0464ee0c1621ffea04c2192f19008c9fc49.tar.gz
Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-internal into integration-candidate
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-xjs/document/html-document.js4
1 files changed, 4 insertions, 0 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 ////////////////////////////////////////////////////////////////////