Merge branch 'refs/heads/NINJA-master' into TimelineUber

2 files changed, 4 insertions, 2 deletions

diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js
index 3e83281e..b207cc3d 100755
--- a/js/stage/binding-view.reel/binding-view.js
+++ b/js/stage/binding-view.reel/binding-view.js
@@ -365,7 +365,7 @@ exports.BindingView = Montage.create(Component, {
             this.mouseOverHud = overHud;
             if(this._isDrawingConnection && !overHud) {
                 //NOTE : Continue This content. mouse over select
-                var obj = this.application.ninja.stage.getElement(event, true);
+                var obj = this.application.ninja.stage.getElement(e, true);
                 if (obj && obj !== this.selectedElement)
                 {
                     if (!obj.controller || obj === null)
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index b7235d19..817220d4 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -894,7 +894,9 @@ exports.Stage = Montage.create(Component, {
             point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX - docView.iframe.contentWindow.pageXOffset + this.documentOffsetLeft, position.pageY - docView.iframe.contentWindow.pageYOffset + this.documentOffsetTop));
             element = this.currentDocument.model.views.design.getElementFromPoint(point.x - this.userContentLeft,point.y - this.userContentTop);
 
-//            if(!element) debugger;
+            if(!element) {
+                return this.currentDocument.model.domContainer;
+            }
             // workaround Chrome 3d bug
             if(this.application.ninja.toolsData.selectedToolInstance._canSnap && this.currentDocument.inExclusion(element) !== -1) {
                 point = webkitConvertPointFromPageToNode(this.canvas, new WebKitPoint(position.pageX, position.pageY));