Merge branch 'master' into pentool

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, {
                                         box[3] = point.y;
 
                     //selectionManagerModule.selectionManager.marqueeSelection(box);
-                    var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes;
+                    var childNodes = this.application.ninja.currentDocument.model.documentRoot.childNodes,
+                        selectionController = this.application.ninja.selectionController;
                     childNodes = Array.prototype.slice.call(childNodes, 0);
                     childNodes.forEach(function(item) {
-                        if(item.nodeType == 1 && SelectionTool._complicatedCollisionDetection(item, box)) {
+                        if(selectionController.isNodeTraversable(item) && SelectionTool._complicatedCollisionDetection(item, box)) {
                             selectedItems.push(item);
                         }
                     });
@@ -223,7 +224,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             if(this.application.ninja.selectedElements.length > 0) {
                 this.application.ninja.currentSelectedContainer = this.application.ninja.selectedElements[0];
             } else {
-                this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.documentRoot;
+                this.application.ninja.currentSelectedContainer = this.application.ninja.currentDocument.model.documentRoot;
             }
         }
     },
@@ -689,7 +690,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             this.application.ninja.stage.clearDrawingCanvas();
 
             var item = this._target;
-            if(!item || (item === this.application.ninja.currentDocument.documentRoot))
+            if(!item || (item === this.application.ninja.currentDocument.model.documentRoot))
             {
                 return;
             }