diff options
author | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
commit | 446f475c35e3d0d5d6cb6ca35346e548de6c36f9 (patch) | |
tree | 0b7e7154979754db2c0ebb7b7908c555068d515d /js/stage | |
parent | 7867aec2620b65605180979b5049cfa154ca7dd1 (diff) | |
parent | 35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (diff) | |
download | ninja-446f475c35e3d0d5d6cb6ca35346e548de6c36f9.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/layout.js | 3 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js index 28484b71..99c3a403 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
@@ -46,6 +46,9 @@ exports.Layout = Montage.create(Component, { | |||
46 | return; | 46 | return; |
47 | } | 47 | } |
48 | 48 | ||
49 | drawUtils._eltArray.length = 0; | ||
50 | drawUtils._planesArray.length = 0; | ||
51 | |||
49 | this._currentDocument = value; | 52 | this._currentDocument = value; |
50 | 53 | ||
51 | if(!value) { | 54 | if(!value) { |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 33c4fd22..340bbff2 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -707,7 +707,7 @@ exports.Stage = Montage.create(Component, { | |||
707 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop)); | 707 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop)); |
708 | element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); | 708 | element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop); |
709 | 709 | ||
710 | if(!element) debugger; | 710 | // if(!element) debugger; |
711 | // workaround Chrome 3d bug | 711 | // workaround Chrome 3d bug |
712 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) { | 712 | if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) { |
713 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); | 713 | point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY)); |