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/controllers | |
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/controllers')
-rwxr-xr-x | js/controllers/selection-controller.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js index f50762f3..c4623d3f 100755 --- a/js/controllers/selection-controller.js +++ b/js/controllers/selection-controller.js | |||
@@ -47,6 +47,7 @@ exports.SelectionController = Montage.create(Component, { | |||
47 | this.eventManager.addEventListener("elementDeleted", this, false); | 47 | this.eventManager.addEventListener("elementDeleted", this, false); |
48 | this.eventManager.addEventListener("selectAll", this, false); | 48 | this.eventManager.addEventListener("selectAll", this, false); |
49 | this.eventManager.addEventListener("deleteSelection", this, false); | 49 | this.eventManager.addEventListener("deleteSelection", this, false); |
50 | this.eventManager.addEventListener("switchDocument", this, false); | ||
50 | // defaultEventManager.addEventListener( "undo", this, false); | 51 | // defaultEventManager.addEventListener( "undo", this, false); |
51 | // defaultEventManager.addEventListener( "redo", this, false); | 52 | // defaultEventManager.addEventListener( "redo", this, false); |
52 | } | 53 | } |
@@ -88,6 +89,18 @@ exports.SelectionController = Montage.create(Component, { | |||
88 | } | 89 | } |
89 | }, | 90 | }, |
90 | 91 | ||
92 | handleSwitchDocument: { | ||
93 | value: function() { | ||
94 | this._selectedItems = this.application.ninja.selectedElements.slice(0); | ||
95 | if(this._selectedItems.length === 0 ){ | ||
96 | this._isDocument = true; | ||
97 | }else{ | ||
98 | this._isDocument = false; | ||
99 | } | ||
100 | NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": this._isDocument} ); | ||
101 | } | ||
102 | }, | ||
103 | |||
91 | handleElementAdded: { | 104 | handleElementAdded: { |
92 | value: function(event) { | 105 | value: function(event) { |
93 | this.executeSelectElement(event.detail); | 106 | this.executeSelectElement(event.detail); |