diff options
author | Nivesh Rajbhandari | 2012-05-04 14:39:33 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-04 14:39:33 -0700 |
commit | 8f1385d4aa12173fb4d9af695b8e5036f675b621 (patch) | |
tree | 5c25b7f37150265a3ccb3097c35ef5810759d942 /js/tools | |
parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
download | ninja-8f1385d4aa12173fb4d9af695b8e5036f675b621.tar.gz |
Fixing selection and layout code to exclude SCRIPT and STYLE tags.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/SelectionTool.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index 855c7b8c..d3e4ebf9 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.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 | }); |