Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

Conflicts:
	js/document/templates/montage-web/default_html.css

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 515165bf..2e49fc04 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -264,7 +264,7 @@ exports.Stage = Montage.create(Component, {
                 this._userContentLeft = 0;
                 this._userContentTop = 0;
 
-                this.application.ninja.currentDocument._window.addEventListener("scroll", this, false);
+                //this.application.ninja.currentDocument._window.addEventListener("scroll", this, false);
             }
 
 
@@ -543,7 +543,7 @@ exports.Stage = Montage.create(Component, {
             var point, element;
 
             point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY));
-            element = this.application.ninja.currentDocument.GetElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop);
+            element = this.application.ninja.currentDocument.model.views.design.getElementFromPoint(point.x + this.scrollLeft,point.y + this.scrollTop);
 
             // workaround Chrome 3d bug
             if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.application.ninja.currentDocument.inExclusion(element) !== -1) {