diff options
author | Nivesh Rajbhandari | 2012-05-16 14:36:47 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-16 14:36:47 -0700 |
commit | 96c92ab93bdb6eb2dd42ef275b84d83aef8254bf (patch) | |
tree | cb9dcb27bc3d4dcdf47a93f292d0f05185624324 | |
parent | 4f46850b376b2d428a3d9415b1dc69b36b875a2c (diff) | |
download | ninja-96c92ab93bdb6eb2dd42ef275b84d83aef8254bf.tar.gz |
Fixing selection bugs in new templates.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-x | js/document/document-html.js | 2 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index 87c776d5..a26b74d5 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -41,7 +41,7 @@ exports.HtmlDocument = Montage.create(Component, { | |||
41 | //////////////////////////////////////////////////////////////////// | 41 | //////////////////////////////////////////////////////////////////// |
42 | // | 42 | // |
43 | exclusionList: { | 43 | exclusionList: { |
44 | value: ["HTML", "BODY"] //TODO: Update to correct list | 44 | value: ["HTML", "BODY", "NINJA-CONTENT"] //TODO: Update to correct list |
45 | }, | 45 | }, |
46 | //////////////////////////////////////////////////////////////////// | 46 | //////////////////////////////////////////////////////////////////// |
47 | // | 47 | // |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 05376527..854b5a2d 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -609,7 +609,7 @@ exports.Stage = Montage.create(Component, { | |||
609 | var point, element, | 609 | var point, element, |
610 | docView = this.application.ninja.currentDocument.model.views.design; | 610 | docView = this.application.ninja.currentDocument.model.views.design; |
611 | 611 | ||
612 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset, position.pageY - docView.iframe.contentWindow.pageYOffset)); | 612 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop)); |
613 | element = this.application.ninja.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); | 613 | element = this.application.ninja.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); |
614 | 614 | ||
615 | if(!element) debugger; | 615 | if(!element) debugger; |