aboutsummaryrefslogtreecommitdiff
path: root/js/tools/SelectionTool.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 12:20:03 -0700
committerPushkar Joshi2012-05-31 12:20:03 -0700
commit4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch)
treec5b17297aba04bd54a59cf6214d29486e089031b /js/tools/SelectionTool.js
parent75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/tools/SelectionTool.js')
-rwxr-xr-xjs/tools/SelectionTool.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 07c26b8c..4bafa12a 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -165,10 +165,11 @@ 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 childNodes = Array.prototype.slice.call(childNodes, 0); 170 childNodes = Array.prototype.slice.call(childNodes, 0);
170 childNodes.forEach(function(item) { 171 childNodes.forEach(function(item) {
171 if(item.nodeType == 1 && SelectionTool._complicatedCollisionDetection(item, box)) { 172 if(selectionController.isNodeTraversable(item) && SelectionTool._complicatedCollisionDetection(item, box)) {
172 selectedItems.push(item); 173 selectedItems.push(item);
173 } 174 }
174 }); 175 });
@@ -223,7 +224,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
223 if(this.application.ninja.selectedElements.length > 0) { 224 if(this.application.ninja.selectedElements.length > 0) {
224 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0]; 225 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0];
225 } else { 226 } else {
226 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot; 227 this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.model.documentRoot;
227 } 228 }
228 } 229 }
229 }, 230 },
@@ -689,7 +690,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
689 this.application.ninja.stage.clearDrawingCanvas(); 690 this.application.ninja.stage.clearDrawingCanvas();
690 691
691 var item = this._target; 692 var item = this._target;
692 if(!item || (item === this.application.ninja.currentDocument.documentRoot)) 693 if(!item || (item === this.application.ninja.currentDocument.model.documentRoot))
693 { 694 {
694 return; 695 return;
695 } 696 }