aboutsummaryrefslogtreecommitdiff
path: root/js/stage/layout.js
diff options
context:
space:
mode:
authorEric Guzman2012-05-17 17:43:05 -0700
committerEric Guzman2012-05-17 17:43:05 -0700
commit458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch)
treeee329e409fe28ae54c894b9e27e82e1f85aefc85 /js/stage/layout.js
parent82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff)
parent52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff)
downloadninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
Diffstat (limited to 'js/stage/layout.js')
-rwxr-xr-xjs/stage/layout.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 0a76dbe5..9c5e2167 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -156,7 +156,7 @@ exports.Layout = Montage.create(Component, {
156 drawTagOutline: { 156 drawTagOutline: {
157 value: function (item) { 157 value: function (item) {
158 158
159 if(!item || (item.nodeType !== 1)) return; 159 if(!item || !this.application.ninja.selectionController.isNodeTraversable(item)) return;
160 160
161 // TODO Bind the layoutview mode to the current document 161 // TODO Bind the layoutview mode to the current document
162 // var mode = this.application.ninja.currentDocument.layoutMode; 162 // var mode = this.application.ninja.currentDocument.layoutMode;