diff options
author | Valerio Virgillito | 2012-02-28 16:02:37 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-28 16:02:37 -0800 |
commit | 20d4f1d703c004dd7f869576b6c471b3fb5b5d3e (patch) | |
tree | 7a6cf1e52e1aea55f4bc2112e11a790fc35f839c /js/document | |
parent | ee52f197d1eb53a5ff30b54b8df1d2b53014eb0e (diff) | |
parent | 557c4d3100ccde51b925b71f0650b2c783a4a042 (diff) | |
download | ninja-20d4f1d703c004dd7f869576b6c471b3fb5b5d3e.tar.gz |
Merge pull request #81 from ananyasen/integration-candidate
persist selections while switching documents
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 6853f4d7..826a59c0 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -710,7 +710,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
710 | this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing; | 710 | this.gridVerticalSpacing = this.application.ninja.stage.drawUtils.gridVerticalSpacing; |
711 | 711 | ||
712 | if(typeof this.application.ninja.selectedElements !== 'undefined'){ | 712 | if(typeof this.application.ninja.selectedElements !== 'undefined'){ |
713 | this.selectionModel = this.application.ninja.selectedElements; | 713 | this.selectionModel = this.application.ninja.selectedElements.slice(0); |
714 | } | 714 | } |
715 | 715 | ||
716 | this.draw3DGrid = this.application.ninja.appModel.show3dGrid; | 716 | this.draw3DGrid = this.application.ninja.appModel.show3dGrid; |
@@ -724,8 +724,8 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
724 | this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing; | 724 | this.application.ninja.stage.drawUtils.gridHorizontalSpacing = this.gridHorizontalSpacing; |
725 | this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing; | 725 | this.application.ninja.stage.drawUtils.gridVerticalSpacing = this.gridVerticalSpacing; |
726 | 726 | ||
727 | if((typeof this.selectionModel !== 'undefined') && (this.selectionModel !== null) && (this.selectionModel.length > 0)){ | 727 | if((typeof this.selectionModel !== 'undefined') && (this.selectionModel !== null)){ |
728 | this.application.ninja.selectionController.initWithDocument(this.selectionModel); | 728 | this.application.ninja.selectedElements = this.selectionModel.slice(0); |
729 | } | 729 | } |
730 | 730 | ||
731 | if((this.savedLeftScroll!== null) && (this.savedTopScroll !== null)){ | 731 | if((this.savedLeftScroll!== null) && (this.savedTopScroll !== null)){ |