5 files changed, 50 insertions, 48 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/panels/Splitter.js b/js/panels/Splitter.js
index c6d46911..4f2a137e 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -156,7 +156,7 @@ exports.Splitter = Montage.create(Component, {
         }
     },
     restore:{
-        value: function() {
+        value: function(onSwitchFromCodeDocument) {
             //Get splitter initial value from SettingManager
             var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")), temp = this.collapsed;
             if(storedData && this.element.getAttribute("data-montage-id") !== null) {
@@ -172,7 +172,11 @@ exports.Splitter = Montage.create(Component, {
                     this.panel.addEventListener("webkitTransitionEnd", this, false);
                 }
                 this.disabled = false;
-                this.needsDraw = true;
+                if(onSwitchFromCodeDocument) {
+                    this.draw();    // When switching from code document, draw immediately so stage size is correct
+                } else {
+                    this.needsDraw = true;
+                }
             }
         }
     }
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 5e913c76..14bc00eb 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -19,6 +19,7 @@ exports.Stage = Montage.create(Component, {
     // TODO - Need to figure out how to remove this dependency
     // Needed by some tools that depend on selectionDrawn event to set up some logic
     drawNow: { value : false },
+    switchedFromCodeDoc: { value : false },
 
     // TO REVIEW
     zoomFactor: {value : 1 },
@@ -256,6 +257,8 @@ exports.Stage = Montage.create(Component, {
 
                 //call configure false with the old document on the selected tool to tear down down any temp. stuff
                 this.application.ninja.toolsData.selectedToolInstance._configure(false);
+            } else if(this.currentDocument && (this.currentDocument.currentView === "code")) {
+                this.switchedFromCodeDoc = true;   // Switching from code document affects stage's size and scrollbar
             }
 
             this._currentDocument = value;
@@ -266,7 +269,8 @@ exports.Stage = Montage.create(Component, {
                 drawUtils._eltArray.length = 0;
                 drawUtils._planesArray.length = 0;
             } else if(this._currentDocument.currentView === "design") {
-                this.restoreAllPanels();
+                this.restoreAllPanels(this.switchedFromCodeDoc);
+                this.switchedFromCodeDoc = false;
                 this.hideCanvas(false);
                 this.showRulers();
 
@@ -354,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);
 
@@ -475,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);
         }
@@ -487,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;
@@ -501,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();
 
@@ -530,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);
 
@@ -584,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);
         }
     },
 
@@ -1271,11 +1302,11 @@ exports.Stage = Montage.create(Component, {
         }
     },
     restoreAllPanels:{
-        value:function(){
-            this.application.ninja.panelSplitter.restore();
-            this.application.ninja.timelineSplitter.restore();
-            this.application.ninja.toolsSplitter.restore();
-            this.application.ninja.optionsSplitter.restore();
+        value:function(onSwitchDocument){
+            this.application.ninja.panelSplitter.restore(onSwitchDocument);
+            this.application.ninja.timelineSplitter.restore(onSwitchDocument);
+            this.application.ninja.toolsSplitter.restore(onSwitchDocument);
+            this.application.nin