diff options
author | Nivesh Rajbhandari | 2012-07-19 13:37:04 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-07-19 13:37:04 -0700 |
commit | 71795a786342b3d84ef904dc448b4ce840a44810 (patch) | |
tree | 26fb676e48bf6d1a64c638362868b3aff1e5f68a /js/stage | |
parent | 1fde3bdcaeec81702d58e95607076603d61f946e (diff) | |
download | ninja-71795a786342b3d84ef904dc448b4ce840a44810.tar.gz |
IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding panel causes error.
Canvas sizes were not updated when using the splitter to toggle collapse/expansion of panels. This was fixed by the StageDrawingFixes pull request. We should also guard agains null value in stage's getElement routine.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 7ac64976..7c2fa903 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -894,7 +894,9 @@ exports.Stage = Montage.create(Component, { | |||
894 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop)); | 894 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop)); |
895 | element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); | 895 | element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); |
896 | 896 | ||
897 | // if(!element) debugger; | 897 | if(!element) { |
898 | return this.currentDocument.model.domContainer; | ||
899 | } | ||
898 | // workaround Chrome 3d bug | 900 | // workaround Chrome 3d bug |
899 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) { | 901 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) { |
900 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); | 902 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); |