diff options
author | Nivesh Rajbhandari | 2012-05-24 13:54:00 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-24 13:54:00 -0700 |
commit | fd4af6d81725dfa0630ac5e52ba95405336f4074 (patch) | |
tree | 868197f79862e98b9c7f5a1f296d64832c68d48f /js/tools/SelectionTool.js | |
parent | de25d2b7d05476d4f0d385b5e910db189f682d21 (diff) | |
parent | 70ff8dd670bc37c14caf850e06791d1e293b1e4b (diff) | |
download | ninja-fd4af6d81725dfa0630ac5e52ba95405336f4074.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-x | js/tools/SelectionTool.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 5c8b15ae..4bafa12a 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -165,7 +165,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
165 | box[3] = point.y; | 165 | box[3] = point.y; |
166 | 166 | ||
167 | //selectionManagerModule.selectionManager.marqueeSelection(box); | 167 | //selectionManagerModule.selectionManager.marqueeSelection(box); |
168 | var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes, | 168 | var childNodes = this.application.ninja.currentDocument.model.documentRoot.childNodes, |
169 | selectionController = this.application.ninja.selectionController; | 169 | selectionController = this.application.ninja.selectionController; |
170 | childNodes = Array.prototype.slice.call(childNodes, 0); | 170 | childNodes = Array.prototype.slice.call(childNodes, 0); |
171 | childNodes.forEach(function(item) { | 171 | childNodes.forEach(function(item) { |
@@ -224,7 +224,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
224 | if(this.application.ninja.selectedElements.length > 0) { | 224 | if(this.application.ninja.selectedElements.length > 0) { |
225 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; | 225 | this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; |
226 | } else { | 226 | } else { |
227 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; | 227 | this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.model.documentRoot; |
228 | } | 228 | } |
229 | } | 229 | } |
230 | }, | 230 | }, |
@@ -690,7 +690,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
690 | this.application.ninja.stage.clearDrawingCanvas(); | 690 | this.application.ninja.stage.clearDrawingCanvas(); |
691 | 691 | ||
692 | var item = this._target; | 692 | var item = this._target; |
693 | if(!item || (item === this.application.ninja.currentDocument.documentRoot)) | 693 | if(!item || (item === this.application.ninja.currentDocument.model.documentRoot)) |
694 | { | 694 | { |
695 | return; | 695 | return; |
696 | } | 696 | } |