3 files changed, 30 insertions, 38 deletions

diff --git a/js/mediators/mouse-mediator.js b/js/mediators/mouse-mediator.js
deleted file mode 100755
index 4d1fb62a..00000000
--- a/js/mediators/mouse-mediator.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-exports.MouseMediator = Montage.create(Component, {
-    hasTemplate: {
-        value: false
-    },
-
-    deserializedFromTemplate: {
-        value: function() {
-            document.addEventListener("mouseup", this, false);
-        }
-    },
-
-    handleMouseup: {
-        value: function(event) {
-
-            if(event._event.target.id !== "drawingCanvas") {
-                NJevent( "appMouseUp");
-            }
-
-            return true;
-        }
-    }
-});
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index beae59d9..1bd002ae 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -261,10 +261,6 @@
                 }
             },
 
-            "mouseMediator": {
-                "prototype": "js/mediators/mouse-mediator"
-            },
-
             "keyboardMediator": {
                 "prototype": "js/mediators/keyboard-mediator",
                 "properties":{
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 319ffe87..14bc00eb 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -358,8 +358,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);
 
@@ -479,6 +477,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 +490,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 +517,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 +551,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 +610,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);
         }
     },