diff options
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/layout.js | 2 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 4 |
2 files changed, 3 insertions, 3 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; |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index b181dc70..171c4f36 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -264,7 +264,7 @@ exports.Stage = Montage.create(Component, { | |||
264 | this._userContentLeft = 0; | 264 | this._userContentLeft = 0; |
265 | this._userContentTop = 0; | 265 | this._userContentTop = 0; |
266 | 266 | ||
267 | this.application.ninja.currentDocument._window.addEventListener("scroll", this, false); | 267 | //this.application.ninja.currentDocument._window.addEventListener("scroll", this, false); |
268 | } | 268 | } |
269 | 269 | ||
270 | 270 | ||
@@ -543,7 +543,7 @@ exports.Stage = Montage.create(Component, { | |||
543 | var point, element; | 543 | var point, element; |
544 | 544 | ||
545 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); | 545 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); |
546 | element = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); | 546 | element = this.application.ninja.currentDocument.model.views.design.getElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop); |
547 | 547 | ||
548 | // workaround Chrome 3d bug | 548 | // workaround Chrome 3d bug |
549 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(element) !== -1) { | 549 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(element) !== -1) { |