1 files changed, 37 insertions, 8 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 319ffe87..8cbe3210 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -27,6 +27,9 @@ exports.Stage = Montage.create(Component, {
     _canvasSelectionPrefs:  { value: { "thickness" : 1.0, "color" : "#46a1ff" } },
     _canvasDrawingPrefs:    { value: { "thickness" : 1.0, "color" : "#000" } },
     drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } },
+    bindingView: {
+        value: null
+    },
 
     _iframeContainer: {
         value: null,
@@ -320,9 +323,8 @@ exports.Stage = Montage.create(Component, {
         value: function() {
             if(this.resizeCanvases) {
                 // TODO GET THE SCROLL SIZE FROM THE CSS -- 11 px
-                this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ;
-                this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11;// - 26 - 26;
-
+                this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.bindingView.width = this.element.offsetWidth - 11;
+                this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height =  this.bindingView.height = this.element.offsetHeight - 11;// - 26 - 26;
                 // Hack for now until a full component
                 this.layout.draw();
                 if(this.currentDocument && (this.currentDocument.currentView === "design")) {
@@ -358,8 +360,6 @@ exports.Stage = Montage.create(Component, {
             // Hide the canvas
             this.hideCanvas(true);
 
-            this.eventManager.addEventListener( "appMouseUp", this, false);
-
             this.eventManager.addEventListener( "enableStageMove", this, false);
             this.eventManager.addEventListener( "disableStageMove", this, false);
 
@@ -409,8 +409,8 @@ exports.Stage = Montage.create(Component, {
             }
 
             // Recalculate the canvas sizes because of splitter resizing
-            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.element.offsetWidth - 11 ;
-            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.element.offsetHeight - 11;
+            this._canvas.width = this._layoutCanvas.width = this._drawingCanvas.width = this._gridCanvas.width = this.bindingView.width = this.element.offsetWidth - 11 ;
+            this._canvas.height = this._layoutCanvas.height = this._drawingCanvas.height = this._gridCanvas.height = this.bindingView.height = this.element.offsetHeight - 11;
 
             designView.iframe.contentWindow.addEventListener("scroll", this, false);
 
@@ -479,6 +479,7 @@ exports.Stage = Montage.create(Component, {
 
     enableMouseInOut: {
         value: function() {
+            document.addEventListener("mouseup", this, true);
             this._drawingCanvas.addEventListener("mouseout", this, false);
             this._drawingCanvas.addEventListener("mouseover", this, false);
         }
@@ -491,6 +492,19 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+    captureMouseup: {
+        value: function(event) {
+            var target = event._event.target.getAttribute("data-montage-id");
+
+            if(target && target === "drawingCanvas") {
+                return true;
+            } else {
+                this.handleAppMouseUp(event);
+                return true;
+            }
+        }
+    },
+
     handleMouseout: {
         value: function(event) {
             this.outFlag = true;
@@ -505,6 +519,11 @@ exports.Stage = Montage.create(Component, {
 
     handleMousedown: {
         value: function(event) {
+
+            // Increase the canvas to cover the scroll bars
+            this._drawingCanvas.height = this._drawingCanvas.height + 11;
+            this._drawingCanvas.width = this._drawingCanvas.width + 11;
+
             // Call the focus manager to set focus to blur any focus'd elements
             this.focusManager.setFocus();
 
@@ -534,13 +553,18 @@ exports.Stage = Montage.create(Component, {
 
     handleMouseup: {
         value: function(event) {
+            // Restore canvas to un-cover the scroll bars.
+            this._drawingCanvas.height = this._drawingCanvas.height - 11;
+            this._drawingCanvas.width = this._drawingCanvas.width - 11;
             // If the mouse up comes from dismissing the context menu return
+
             if(this.contextMenu) {
                 this.contextMenu = false;
                 return;
             }
 
-            //this.disableMouseInOut();
+            this.disableMouseInOut();
+            document.removeEventListener("mouseup", this, true);
 
             this.application.ninja.toolsData.selectedToolInstance.HandleLeftButtonUp(event);
 
@@ -588,12 +612,17 @@ exports.Stage = Montage.create(Component, {
     handleAppMouseUp: {
         value: function(event) {
             if(this.outFlag) {
+                this._drawingCanvas.height = this._drawingCanvas.height - 11;
+                this._drawingCanvas.width = this._drawingCanvas.width - 11;
+
                 if(this.application.ninja.toolsData.selectedToolInstance.isDrawing) {
                     this.application.ninja.toolsData.selectedToolInstance.HandleLeftButtonUp(event);
                 }
                 this.disableMouseInOut();
                 this.outFlag = false;
             }
+
+            document.removeEventListener("mouseup", this, true);
         }
     },