From db749e10fdff655c2f3b8336a8cc58bf4f389e2c Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 17 May 2012 10:47:53 -0700
Subject: IKNinja-1628 - Can't draw shapes inside canvas after double-clicking
 into canvas.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/tools/ShapeTool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index 0562dbc2..367ab78d 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -72,7 +72,7 @@ exports.ShapeTool = Montage.create(DrawingTool, {
                     if(!canvas.elementModel.shapeModel) {
                         canvas.elementModel.shapeModel = Montage.create(ShapeModel);
                     }
-					this.application.ninja.elementMediator.addElements(canvas, canvas.elementModel.data);
+                    this.RenderShape(drawData.width, drawData.height, drawData.planeMat, drawData.midPt, canvas);
                 }
             }
 
-- 
cgit v1.2.3


From 2ba4a6fab3b81b537521760ee5f95f1bc80027f9 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 17 May 2012 11:09:45 -0700
Subject: Adding default padding for banner templates.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/views/design.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 3b2eb11f..2ccb82d1 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -184,6 +184,10 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         	this._bodyFragment = null;
         	//Calling standard method to finish opening document
         	this.bodyContentLoaded(null);
+
+            // TODO: Clean up this code
+            this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
+            this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 6ce2f2a5af1bc66d8dbec04abfae2e07f43afcfe Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 17 May 2012 11:22:03 -0700
Subject: Fixed chrome preview for banner templates.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/document/templates/banner/main.js      | 8 +++++++-
 js/document/templates/banner/package.json | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/document/templates/banner/main.js b/js/document/templates/banner/main.js
index d5ac88d5..2acbe8f3 100644
--- a/js/document/templates/banner/main.js
+++ b/js/document/templates/banner/main.js
@@ -4,7 +4,9 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    Component = require("montage/ui/component").Component,
+    Template =			require("montage/ui/template").Template,
+    TemplateCreator =	require("tools/template/template-creator").TemplateCreator;
 
 exports.Main = Montage.create(Component, {
 
@@ -37,6 +39,10 @@ exports.Main = Montage.create(Component, {
 
             };
 
+            window.mjsTemplateCreator = TemplateCreator;
+            //
+            window.mjsTemplate = Template;
+
             // Dispatch event when this template has loaded.
             /*
             var newEvent = document.createEvent( "CustomEvent" );
diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json
index d1e839dc..4f36090a 100755
--- a/js/document/templates/banner/package.json
+++ b/js/document/templates/banner/package.json
@@ -4,6 +4,7 @@
        },
        "mappings": {
            "montage": "../../../../node_modules/montage/",
+           "tools": "../../../../node_modules/tools/",
            "montage-google": "../../../../node_modules/montage-google/"
        }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From e713d437a3918b9e417d1a0bc9f11275fc9e6634 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 17 May 2012 12:16:43 -0700
Subject: Sharing app data in banner and html templates

Syncing the files to avoid duplicates and ensure consistency.
---
 js/document/templates/app/main.js               | 61 +++++++++++++++++++++++++
 js/document/templates/app/package.json          | 10 ++++
 js/document/templates/banner/index.html         |  2 +-
 js/document/templates/banner/main.js            | 55 ----------------------
 js/document/templates/banner/package.json       | 10 ----
 js/document/templates/html/index.html           |  2 +-
 js/document/templates/html/main.js              | 57 -----------------------
 js/document/templates/html/package.json         | 10 ----
 js/document/templates/montage-html/package.json |  9 ----
 9 files changed, 73 insertions(+), 143 deletions(-)
 create mode 100644 js/document/templates/app/main.js
 create mode 100755 js/document/templates/app/package.json
 delete mode 100644 js/document/templates/banner/main.js
 delete mode 100755 js/document/templates/banner/package.json
 delete mode 100644 js/document/templates/html/main.js
 delete mode 100755 js/document/templates/html/package.json
 delete mode 100755 js/document/templates/montage-html/package.json

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
new file mode 100644
index 00000000..a406abdb
--- /dev/null
+++ b/js/document/templates/app/main.js
@@ -0,0 +1,61 @@
+/* <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,
+    Template =			require("montage/ui/template").Template,
+    TemplateCreator =	require("tools/template/template-creator").TemplateCreator;
+
+exports.Main = Montage.create(Component, {
+
+    hasTemplate: {
+        value: false
+    },
+
+    /**
+     * Adding window hooks to callback into this object from Ninja.
+     */
+    templateDidLoad: {
+        value: function(){
+            var self = this;
+            //
+            window.addComponent = function(element, data, callback) {
+                var component;
+
+                component = require.async(data.path)
+                    .then(function(component) {
+                        var componentRequire = component[data.name];
+                        var componentInstance = componentRequire.create();
+
+                        componentInstance.element = element;
+
+                        componentInstance.needsDraw = true;
+                        componentInstance.ownerComponent = self;
+
+                        callback(componentInstance, element);
+                    })
+                    .end();
+
+            };
+            //
+            window.mjsTemplateCreator = TemplateCreator;
+            //
+            window.mjsTemplate = Template;
+            //
+            var templateEvent = document.createEvent("CustomEvent");
+            templateEvent.initCustomEvent("mjsTemplateReady", false, true);
+            document.body.dispatchEvent(templateEvent);
+			
+			
+            // Dispatch event when this template has loaded.
+            /*
+            var newEvent = document.createEvent( "CustomEvent" );
+            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
+            document.body.dispatchEvent( newEvent );
+            */
+
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/document/templates/app/package.json b/js/document/templates/app/package.json
new file mode 100755
index 00000000..4f36090a
--- /dev/null
+++ b/js/document/templates/app/package.json
@@ -0,0 +1,10 @@
+{
+       "directories": {
+           "lib": ""
+       },
+       "mappings": {
+           "montage": "../../../../node_modules/montage/",
+           "tools": "../../../../node_modules/tools/",
+           "montage-google": "../../../../node_modules/montage-google/"
+       }
+}
\ No newline at end of file
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 91ef06de..f1ee3d98 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -81,7 +81,7 @@
     	
     	<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
     
-    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+    	<script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
 
         <script type="text/montage-serialization" data-ninja-template="true">
         {
diff --git a/js/document/templates/banner/main.js b/js/document/templates/banner/main.js
deleted file mode 100644
index 2acbe8f3..00000000
--- a/js/document/templates/banner/main.js
+++ /dev/null
@@ -1,55 +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,
-    Template =			require("montage/ui/template").Template,
-    TemplateCreator =	require("tools/template/template-creator").TemplateCreator;
-
-exports.Main = Montage.create(Component, {
-
-    hasTemplate: {
-        value: false
-    },
-
-    /**
-     * Adding window hooks to callback into this object from Ninja.
-     */
-    templateDidLoad: {
-        value: function(){
-            var self = this;
-            window.addComponent = function(element, data, callback) {
-                var component;
-
-                component = require.async(data.path)
-                    .then(function(component) {
-                        var componentRequire = component[data.name];
-                        var componentInstance = componentRequire.create();
-
-                        componentInstance.element = element;
-
-                        componentInstance.needsDraw = true;
-                        componentInstance.ownerComponent = self;
-
-                        callback(componentInstance, element);
-                    })
-                    .end();
-
-            };
-
-            window.mjsTemplateCreator = TemplateCreator;
-            //
-            window.mjsTemplate = Template;
-
-            // Dispatch event when this template has loaded.
-            /*
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
-            document.body.dispatchEvent( newEvent );
-            */
-
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json
deleted file mode 100755
index 4f36090a..00000000
--- a/js/document/templates/banner/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-       "directories": {
-           "lib": ""
-       },
-       "mappings": {
-           "montage": "../../../../node_modules/montage/",
-           "tools": "../../../../node_modules/tools/",
-           "montage-google": "../../../../node_modules/montage-google/"
-       }
-}
\ No newline at end of file
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 24159841..933df157 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -62,7 +62,7 @@
         	}
     	</script>
     
-    	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+    	<script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
 
         <script type="text/montage-serialization" data-ninja-template="true">
         {
diff --git a/js/document/templates/html/main.js b/js/document/templates/html/main.js
deleted file mode 100644
index ffa3fab2..00000000
--- a/js/document/templates/html/main.js
+++ /dev/null
@@ -1,57 +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,
-    Template =			require("montage/ui/template").Template,
-    TemplateCreator =	require("tools/template/template-creator").TemplateCreator;
-
-exports.Main = Montage.create(Component, {
-
-    hasTemplate: {
-        value: false
-    },
-
-    /**
-     * Adding window hooks to callback into this object from Ninja.
-     */
-    templateDidLoad: {
-        value: function(){
-            var self = this;
-            //
-            window.addComponent = function(element, data, callback) {
-                var component;
-
-                component = require.async(data.path)
-                    .then(function(component) {
-                        var componentRequire = component[data.name];
-                        var componentInstance = componentRequire.create();
-
-                        componentInstance.element = element;
-
-                        componentInstance.needsDraw = true;
-                        componentInstance.ownerComponent = self;
-
-                        callback(componentInstance, element);
-                    })
-                    .end();
-
-            };
-            //
-            window.mjsTemplateCreator = TemplateCreator;
-            //
-            window.mjsTemplate = Template;
-			
-			
-            // Dispatch event when this template has loaded.
-            /*
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
-            document.body.dispatchEvent( newEvent );
-            */
-
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/document/templates/html/package.json b/js/document/templates/html/package.json
deleted file mode 100755
index 4f36090a..00000000
--- a/js/document/templates/html/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-       "directories": {
-           "lib": ""
-       },
-       "mappings": {
-           "montage": "../../../../node_modules/montage/",
-           "tools": "../../../../node_modules/tools/",
-           "montage-google": "../../../../node_modules/montage-google/"
-       }
-}
\ No newline at end of file
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json
deleted file mode 100755
index d1e839dc..00000000
--- a/js/document/templates/montage-html/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "directories": {
-           "lib": ""
-       },
-       "mappings": {
-           "montage": "../../../../node_modules/montage/",
-           "montage-google": "../../../../node_modules/montage-google/"
-       }
-}
\ No newline at end of file
-- 
cgit v1.2.3


From b97570f5daff9d0c40f274c2c29a457079da1c1a Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 17 May 2012 12:23:31 -0700
Subject: fixing the breadcrumb

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../layout/bread-crumb.reel/bread-crumb.html       | 37 ++++++++--------------
 .../layout/bread-crumb.reel/bread-crumb.js         | 24 ++++----------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index ae3e2022..0dabc781 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -32,30 +32,23 @@
                         }
                     ],
                     "bindings": {
-                        "label": {
-                            "boundObject": {"@": "repetition1"},
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.label",
-                            "oneway": true
-                        },
-                        "value": {
-                            "boundObject": {"@": "repetition1"},
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid",
-                            "oneway": true
-                        }
+                        "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
+                        "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
+                    }
+                },
+
+                "buttonsListController": {
+                    "prototype": "montage/ui/controller/array-controller",
+                    "bindings": {
+                        "content": {"<<->": "@owner.containerElements"}
                     }
                 },
 
-                "repetition1": {
+                "buttonsList": {
                     "prototype": "montage/ui/repetition.reel",
                     "properties": {
-                        "element": {"#": "breadcrumb_container"}
-                    },
-                    "bindings": {
-                        "objects": {
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "containerElements",
-                            "oneway": true
-                        }
+                        "element": {"#": "breadcrumb_container"},
+                        "contentController": {"@": "buttonsListController"}
                     }
                 },
 
@@ -65,11 +58,7 @@
                         "element": {"#": "disabledCondition"}
                     },
                     "bindings": {
-                        "condition": {
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "disabled",
-                            "oneway": true
-                        }
+                        "condition": {"<-": "@owner.disabled"}
                     }
                 }
             }
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index c1b021a3..d2a6b1e4 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -60,30 +60,18 @@ exports.Breadcrumb = Montage.create(Component, {
         value: function() {
             var parentNode;
 
-            this.containerElements.length = 0;
+//            delete this.containerElements;
+                this.containerElements = [];
 
             parentNode = this.container;
 
-            // This is for the old template support.
-            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
-            if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
-                while(parentNode.id !== "UserContent") {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-
-                // This is always the top container which is now hardcoded to body
-                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-            } else {
-                while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-
-                // This is always the top container which is now hardcoded to body
+            while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
                 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                parentNode = parentNode.parentNode;
             }
 
+            // This is always the top container which is now hardcoded to body
+            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
         }
     },
 
-- 
cgit v1.2.3


From 495a56081219c0c77814cb72f2d787195ef58285 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 17 May 2012 12:23:31 -0700
Subject: fixing the breadcrumb

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../layout/bread-crumb.reel/bread-crumb.html       | 37 ++++++++--------------
 .../layout/bread-crumb.reel/bread-crumb.js         | 24 ++++----------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index ae3e2022..0dabc781 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -32,30 +32,23 @@
                         }
                     ],
                     "bindings": {
-                        "label": {
-                            "boundObject": {"@": "repetition1"},
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.label",
-                            "oneway": true
-                        },
-                        "value": {
-                            "boundObject": {"@": "repetition1"},
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid",
-                            "oneway": true
-                        }
+                        "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
+                        "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
+                    }
+                },
+
+                "buttonsListController": {
+                    "prototype": "montage/ui/controller/array-controller",
+                    "bindings": {
+                        "content": {"<<->": "@owner.containerElements"}
                     }
                 },
 
-                "repetition1": {
+                "buttonsList": {
                     "prototype": "montage/ui/repetition.reel",
                     "properties": {
-                        "element": {"#": "breadcrumb_container"}
-                    },
-                    "bindings": {
-                        "objects": {
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "containerElements",
-                            "oneway": true
-                        }
+                        "element": {"#": "breadcrumb_container"},
+                        "contentController": {"@": "buttonsListController"}
                     }
                 },
 
@@ -65,11 +58,7 @@
                         "element": {"#": "disabledCondition"}
                     },
                     "bindings": {
-                        "condition": {
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "disabled",
-                            "oneway": true
-                        }
+                        "condition": {"<-": "@owner.disabled"}
                     }
                 }
             }
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index c1b021a3..d2a6b1e4 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -60,30 +60,18 @@ exports.Breadcrumb = Montage.create(Component, {
         value: function() {
             var parentNode;
 
-            this.containerElements.length = 0;
+//            delete this.containerElements;
+                this.containerElements = [];
 
             parentNode = this.container;
 
-            // This is for the old template support.
-            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
-            if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
-                while(parentNode.id !== "UserContent") {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-
-                // This is always the top container which is now hardcoded to body
-                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-            } else {
-                while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-
-                // This is always the top container which is now hardcoded to body
+            while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
                 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                parentNode = parentNode.parentNode;
             }
 
+            // This is always the top container which is now hardcoded to body
+            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
         }
     },
 
-- 
cgit v1.2.3


From 43994432117686f18eb1783418ef83744ae01d79 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 17 May 2012 15:43:40 -0700
Subject: Fixed border radius hot-text linking that was broken by update to
 montage v.10.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../rect-properties.reel/rect-properties.html      | 49 ++++++++++++--
 .../rect-properties.reel/rect-properties.js        | 79 +++++++++-------------
 2 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index 42746caa..7aa91314 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -15,8 +15,19 @@
                 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "TLRadiusControl"},
-                    "acceptableUnits" : ["px", "pt", "%"]
-                }
+                    "acceptableUnits" : ["px", "pt", "%"],
+                    "identifier": "TLRadiusControl"
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "changing",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "hottext2": {
@@ -25,7 +36,13 @@
                     "element": {"#": "TRRadiusControl"},
                     "acceptableUnits" : ["px", "pt", "%"],
                     "enabled": false
-                }
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "hottext3": {
@@ -34,7 +51,13 @@
                     "element": {"#": "BLRadiusControl"},
                     "acceptableUnits" : ["px", "pt", "%"],
                     "enabled": false
-                }
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "hottext4": {
@@ -43,7 +66,13 @@
                     "element": {"#": "BRRadiusControl"},
                     "acceptableUnits" : ["px", "pt", "%"],
                     "enabled": false
-                }
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "lockButton": {
@@ -53,8 +82,14 @@
                     "pressed": true,
                     "pressedClass": "lockUp",
                     "preventFocus": true,
-                    "identifier": "ratio"
-                }
+                    "identifier": "lockButton"
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
 
             "owner": {
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js
index c1cb3945..2f8ea4dd 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.js
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js
@@ -19,12 +19,6 @@ exports.RectProperties = Montage.create(ToolProperties, {
 
     _subPrepare: {
         value: function() {
-            this.lockButton.identifier = "lockButton";
-            this.lockButton.addEventListener("action", this, false);
-
-            this._setBindings([this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
-            this._setCap([this.TLRadiusControl,this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
-
         }
     },
 
@@ -33,11 +27,8 @@ exports.RectProperties = Montage.create(ToolProperties, {
             this.TRRadiusControl.enabled = this.BLRadiusControl.enabled = this.BRRadiusControl.enabled = !this.lockButton.pressed;
 
             if(this.lockButton.pressed) {
-                this._setBindings([this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
-            } else {
-                this._removeBindings([this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
+                this._syncRadii(this.TLRadiusControl.value, this.TLRadiusControl.units);
             }
-
         }
     },
 
@@ -80,57 +71,51 @@ exports.RectProperties = Montage.create(ToolProperties, {
         get: function() { return this.base._fillMaterial.value; }
     },
 
-    _setBindings: {
-        value: function(els) {
-            var that = this;
-            els.forEach(function(el) {
-                Object.defineBinding(el, "value", {
-                    boundObject: that.TLRadiusControl,
-                    boundObjectPropertyPath: "value",
-                    boundValueMutator: function(value) {
-                        if (typeof value === "string") {
-                            return parseFloat(value);
-                        }
-
-                        return value;
-                    }
-                });
-
-                Object.defineBinding(el, "units", {
-                    boundObject: that.TLRadiusControl,
-                    boundObjectPropertyPath: "units"
-                });
-            });
-        }
-    },
+    handleChanging: {
+        value: function(event) {
+            if(event.wasSetByCode) {
+                return;
+            }
 
-    _removeBindings: {
-        value: function(els) {
-            els.forEach(function(el) {
-                Object.deleteBindings(el);
-            });
+            this._setBorderRadius(event);
         }
     },
 
-    _setCap: {
-        value: function(els) {
-            var that = this;
-            els.forEach(function(el) {
-                el.addEventListener("change", that, false);
-            });
+    handleChange: {
+        value: function(event) {
+            if(event.wasSetByCode) {
+                return;
+            }
+
+            this._setBorderRadius(event);
         }
     },
 
-    handleChange: {
+    _setBorderRadius: {
         value: function(event) {
             var hotTxt = event.currentTarget;
             if(hotTxt.units === "%") {
                 if(hotTxt.value > 50) {
                     hotTxt.maxValue = 50;
                 }
-                return hotTxt.value;
             }
-            
+
+            if(this.lockButton.pressed && (this.TLRadiusControl === hotTxt)) {
+                this._syncRadii(hotTxt.value, hotTxt.units);
+            }
+        }
+    },
+
+    _syncRadii: {
+        value: function(value, units) {
+            this.TRRadiusControl.value = value;
+            this.BLRadiusControl.value = value;
+            this.BRRadiusControl.value = value;
+
+            this.TRRadiusControl.units = units;
+            this.BLRadiusControl.units = units;
+            this.BRRadiusControl.units = units;
         }
     }
+
 });
\ No newline at end of file
-- 
cgit v1.2.3


From 6636b2729b421740e49142b7e8b1a76540508306 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 17 May 2012 15:46:56 -0700
Subject: Removed unneeded identifier.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../tools-properties/rect-properties.reel/rect-properties.html         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index 7aa91314..a7bf6a7c 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -15,8 +15,7 @@
                 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "TLRadiusControl"},
-                    "acceptableUnits" : ["px", "pt", "%"],
-                    "identifier": "TLRadiusControl"
+                    "acceptableUnits" : ["px", "pt", "%"]
                 },
                 "listeners": [
                     {
-- 
cgit v1.2.3


From 792c83a0fe8f7f22d139684ed6d711a2c334c098 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Thu, 17 May 2012 16:55:19 -0700
Subject: Adding component initialization on open

This is for opening components, selection is still not reflecting component data.
---
 js/document/views/design.js | 29 +++++++++--------
 js/mediators/io-mediator.js | 78 +++++++++++++++++++++++++--------------------
 2 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 2ccb82d1..bd8c25ec 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -184,8 +184,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         	this._bodyFragment = null;
         	//Calling standard method to finish opening document
         	this.bodyContentLoaded(null);
-
-            // TODO: Clean up this code
+            //TODO: Move this to be set via the controller
             this.application.ninja.stage.documentOffsetLeft = parseInt((this.document.body.scrollWidth - this._template.size.width)/2);
             this.application.ninja.stage.documentOffsetTop = parseInt((this.document.body.scrollHeight - this._template.size.height)/2);
     	}
@@ -243,17 +242,15 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
 					}
 				}
 			}
-            //Checking and initializing webGL
+           	//Checking for script tags then parsing check for montage and webgl
             if (scripttags.length > 0) {
+            	//Checking and initializing webGL
             	this.initWebGl(scripttags);
-            } //Else there is not data to parse
-    		
-    		
-    		
-    		//TODO: Load Montage Components (blocking)
-    		//this.initMontage();
-    		
-    		
+            	//Checking and initializing Montage
+            	this.initMontage(scripttags);
+            } else {
+            	//Else there is not data to parse
+            }
     		//Makign callback if specified
     		if (this._callback) this._callback();
     	}
@@ -350,8 +347,14 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     ////////////////////////////////////////////////////////////////////
 	//
     initMontage: {
-        value: function () {
-        	//initWithDocument(window.document) instantiateWithOwnerAndDocument(null, window.document)
+        value: function (scripttags) {
+        	//
+        	this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
+        		//Initializing template with user's seriliazation
+        		var template = this.iframe.contentWindow.mjsTemplate.create();
+        		template.initWithDocument(this.iframe.contentWindow.document);
+        		template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (e){/*Nothing just a required extra parameter*/});
+        	}.bind(this), false);
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index b1916446..c506e186 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -225,7 +225,7 @@ exports.IoMediator = Montage.create(Component, {
             	mjsCreator = template.mjsTemplateCreator.create(),
             	mJsSerialization,
             	montageTemplate;
-            //
+            //Creating instance of template creator
             montageTemplate = mjsCreator.initWithDocument(template.document);
             //Setting up expression for parsing URLs
             regexRootUrl = new RegExp(rootUrl.replace(/\//gi, '\\\/'), 'gi');
@@ -239,7 +239,6 @@ exports.IoMediator = Montage.create(Component, {
             	template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, '');
 	            template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, '');
             }
-            
             //Copying attributes to maintain same properties as the <body>
 			for (var n in template.body.attributes) {
 				if (template.body.attributes[n].value) {
@@ -250,6 +249,7 @@ exports.IoMediator = Montage.create(Component, {
             //TODO: Add attribute copying for <HEAD> and <HTML>
             
             
+            //console.log(template.file.content.document.getElementsByTagName('html')[0].innerHTML);
             
             
             //Getting all CSS (style or link) tags
@@ -266,7 +266,7 @@ exports.IoMediator = Montage.create(Component, {
     		}
     		//////////////////////////////////////////////////
     		
-    		//
+    		//Adding to tags to be removed form template
     		for (var f in njtemplatetags) {
     			if (njtemplatetags[f].getAttribute) toremovetags.push(njtemplatetags[f]);
     		}
@@ -405,6 +405,31 @@ exports.IoMediator = Montage.create(Component, {
                     }
                 }
             }
+            //
+            var matchingtags = [], scripts = template.file.content.document.getElementsByTagName('script'), webgltag, webgljstag, webgllibtag, webglrdgetag, mjstag, mjslibtag;
+            //
+            for (var i in scripts) {
+            	if (scripts[i].getAttribute) {
+               		if (scripts[i].getAttribute('data-ninja-webgl') !== null) {//TODO: Use querySelectorAll
+               			matchingtags.push(scripts[i]);
+                    }
+                    if (scripts[i].getAttribute('data-ninja-webgl-js') !== null) {
+               	        webgljstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                    if (scripts[i].getAttribute('data-ninja-webgl-lib') !== null) {
+                        webgllibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                    if (scripts[i].getAttribute('data-ninja-webgl-rdge') !== null) {
+               	        webglrdgetag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                    if (scripts[i].getAttribute('type') === 'text/montage-serialization') {
+                        mjstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                    if (scripts[i].getAttribute('data-mjs-lib') !== null) {
+                     	mjslibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+                    }
+                }
+            }
             //Checking for webGL elements in document
             if (template.webgl && template.webgl.length > 1) {//TODO: Should be length 0, hack for a temp fix
                 var rdgeDirName, rdgeVersion;
@@ -420,31 +445,6 @@ exports.IoMediator = Montage.create(Component, {
                     }
                 }
                 //
-                var json, matchingtags = [], webgltag, scripts = template.file.content.document.getElementsByTagName('script'), webgljstag, webgllibtag, webglrdgetag, mjstag, mjslibtag;
-                //
-                for (var i in scripts) {
-                    if (scripts[i].getAttribute) {
-                        if (scripts[i].getAttribute('data-ninja-webgl') !== null) {//TODO: Use querySelectorAll
-                            matchingtags.push(scripts[i]);
-                        }
-                        if (scripts[i].getAttribute('data-ninja-webgl-js') !== null) {
-                            webgljstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-                        }
-                        if (scripts[i].getAttribute('data-ninja-webgl-lib') !== null) {
-                            webgllibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-                        }
-                        if (scripts[i].getAttribute('data-ninja-webgl-rdge') !== null) {
-                            webglrdgetag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-                        }
-                        if (scripts[i].getAttribute('type') === 'text/montage-serialization') {
-                            mjstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-                        }
-                        if (scripts[i].getAttribute('data-mjs-lib') !== null) {
-                            mjslibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
-                        }
-                    }
-                }
-                //
                 if (matchingtags.length) {
                     if (matchingtags.length === 1) {
                         webgltag = matchingtags[0];
@@ -510,7 +510,7 @@ function loadWebGL (e) {\n\
 }\
     			";
                 //TODO: This data should be saved to a JSON file eventually
-                json = '\n({\n\t"version": "' + rdgeVersion + '",\n\t"directory": "' + rdgeDirName + '/",\n\t"data": [';
+                var json = '\n({\n\t"version": "' + rdgeVersion + '",\n\t"directory": "' + rdgeDirName + '/",\n\t"data": [';
                 //Looping through data to create escaped array
                 for (var j = 0; template.webgl[j]; j++) {
                     if (j === 0) {
@@ -524,11 +524,6 @@ function loadWebGL (e) {\n\
                 //Setting string in tag
                 webgltag.innerHTML = json;
             }
-
-
-
-
-			
 			//Checking for Montage
 			if (mJsSerialization) {
 				//Copy Montage library if needed
@@ -538,8 +533,21 @@ function loadWebGL (e) {\n\
                         mjsDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name + this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
                         mjsVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
                         this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.file.root, mjsDirName);
+                        
+                        
+                        
                         //TODO: Fix to allow no overwrite and nested locations
-                        var packjson = this.application.ninja.coreIoApi.createFile({ uri: template.file.root + 'package.json', contents: '{"mappings": {"montage": "' + mjsDirName + '/montage/"}}' });
+                        var mjsCheck, mjsPath = template.file.root + 'package.json';
+                        mjsCheck = this.application.ninja.coreIoApi.fileExists({uri: mjsPath});
+                        //
+                        if (!mjsCheck || mjsCheck.status !== 204) {
+	                        var packjson = this.application.ninja.coreIoApi.createFile({ uri: mjsPath, contents: '{"mappings": {"montage": "' + mjsDirName + '/montage/"}}' });
+                        } else {
+                        	//Already exists
+                        }
+                        
+                        
+                        
                     } else {
                         //TODO: Error handle no available library to copy
                     }
-- 
cgit v1.2.3


From eff40602cac6821f8272177c24b6bf3de399f8b1 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 17 May 2012 21:11:33 -0700
Subject: multiple documents - enable opening multiple documents and initial
 switching

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/controllers/document-controller.js | 71 +++++++++++++++++------------------
 js/document/document-html.js          |  2 -
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index cf46e73e..50874725 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -454,58 +454,57 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     // Open document callback
     _onOpenDocument: {
         value: function(doc){
-
+            var currentDocument;
             if(this.activeDocument) {
                 // There is a document currently opened
-
-
+                currentDocument = this.activeDocument;
 
                 //this.application.ninja.stage.stageView.showCodeViewBar(false);
                 //this.application.ninja.stage.stageView.restoreAllPanels();
 
-                //
-                /*
-                if(this.activeDocument.currentView === "design"){
-                    this.activeDocument.saveAppState();
-                    this.activeDocument.container.parentNode.style["display"] = "none";
-                    this.application.ninja.stage.hideCanvas(true);
-                    this.application.ninja.stage.stageView.hideRulers();
-                }
+                //this.activeDocument.saveAppState();
 
-                this.activeDocument.container.style["display"] = "none";
-                */
-
-                /*
-                this.activeDocument.container.style["display"] = "block";
-                                if(this.activeDocument.currentView === "design"){
-                                    this.activeDocument.container.parentNode.style["display"] = "block";
-                                    this.activeDocument.restoreAppState();
-                                }else{
-                                    //hide the iframe when switching to code view
-                                    document.getElementById("iframeContainer").style.display = "none";
-                                }
-
-                */
-                // hide current document
+                // TODO: Do we need this?
+                //this.application.ninja.stage.hideCanvas(true);
+                //this.application.ninja.stage.stageView.hideRulers();
+
+                //this.activeDocument.restoreAppState();             
             } else {
                 // There is no document opened
 
-                // Set the active document
-                this.activeDocument = doc;
+                // Show the rulers
+                // TODO: Move this indo design view
+                this.application.ninja.stage.stageView.showRulers();
 
                 // Show the canvas
                 this.application.ninja.stage.hideCanvas(false);
+            }
 
-                // Show the rulers
-                // TODO: Move this indo design view
-                this.application.ninja.stage.stageView.showRulers();
 
-                // Initialize the documentRoot styles
-                this.initializeRootStyles(doc.documentRoot);
-                // Flag to stop stylesheet dirty event
-                this._hackInitialStyles = false;
+            // Set the active document
+            this.activeDocument = doc;
+
+            // Initialize the documentRoot styles
+            this.initializeRootStyles(doc.documentRoot);
+            // Flag to stop stylesheet dirty event
+            this._hackInitialStyles = false;
+
+            this.switchDocuments(currentDocument, doc);
+
+            NJevent("onOpenDocument", doc);
+
+            //Setting opacity to be viewable after load
+            //doc.model.views.design.iframe.style.opacity = 1;
+
+        }
+    },
+
+    switchDocuments: {
+        value: function(current, newDocument) {
+            newDocument.model.views.design.iframe.style.opacity = 1;
 
-                NJevent("onOpenDocument", doc);
+            if(current) {
+                current.model.views.design.hide();
             }
         }
     },
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 56d9db02..c77ed7bc 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -119,8 +119,6 @@ exports.HtmlDocument = Montage.create(Component, {
     		this._observer = null;
     		//Making callback after view is loaded
     	    this.loaded.callback.call(this.loaded.context, this);
-    	    //Setting opacity to be viewable after load
-		   	this.model.views.design.iframe.style.opacity = 1;
     	}
     },
     ////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From b72c5f72ea5df4aa164350e1ba66fd1b4e23369d Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 17 May 2012 23:07:48 -0700
Subject: removing all stageDeps for drawing classes.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/helper-classes/3D/draw-utils.js   |  2 +-
 js/helper-classes/3D/snap-manager.js | 13 ++------
 js/helper-classes/3D/view-utils.js   | 53 ++++++++++++-------------------
 js/stage/stage-deps.js               | 61 +++++-------------------------------
 js/stage/stage.reel/stage.html       |  3 --
 js/tools/drawing-tool-base.js        | 39 ++++++++---------------
 6 files changed, 45 insertions(+), 126 deletions(-)

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a6d2d899..a8bc16ef 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -138,7 +138,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     l,
                     t,
                     plane,
-                    elt
+                    elt;
                 for(i=0; i<len; i++) {
                     elt = documentRootChildren[i];
                     plane = this.addElement(elt);
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 2e8020d3..7194524e 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -21,7 +21,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 	///////////////////////////////////////////////////////////////////////
 	// Instance variables
 	///////////////////////////////////////////////////////////////////////
-    currentStage: { value: null, writable: true },
     drawingCanvas: { value: null, writable: true},
     
 	// we keep a stack of working planes to facilitate working on other planes temporarily
@@ -84,14 +83,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 	popWorkingPlane : { value: function ()		{ workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
 	getStageWidth : { value: function ()		{
-		return parseInt(this.currentStage.offsetWidth);
+		return parseInt(this.application.ninja.currentDocument.documentRoot.offsetWidth);
 	}},
 
 	getStageHeight : { value: function ()		{
-		return parseInt(this.currentStage.offsetHeight);
+		return parseInt(this.application.ninja.currentDocument.documentRoot.offsetHeight);
 	}},
 
-    getStage : { value: function()		{        return this.currentStage;    }},
+    getStage : { value: function()		{        return this.application.ninja.currentDocument.documentRoot;    }},
 
 	getGridVertexHitRad : { value: function()		{  return this._gridVertexHitRad;				}},
 	getGridEdgeHitRad : { value: function()		{  return this._gridEdgeHitRad;					}},
@@ -185,12 +184,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         }
     },
 
-    setCurrentStage: {
-        value: function(stage) {
-            this.currentStage = stage;
-        }
-    },
-
 	snap : {
 		value: function (xScreen, yScreen, snap3D,  quadPt) 
 		{
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 8c338f84..20f61be1 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -18,18 +18,14 @@ exports.ViewUtils = Montage.create(Component, {
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
 
-    m_viewportObj : { value: null, writable: true},
-    _perspectiveDist: { value: null, writable: true},
+    m_viewportObj : { value: null},
+    _perspectiveDist: { value: null},
 
     // keep a stack of viewport objects
-    _viewportObjStack: { value: [], writable: true },
+    _viewportObjStack: { value: []},
 
-    _currentDocument: { value: null , writable: true},
-    _userContentLeft: { value: null , writable: true},
-    _userContentTop: { value: null , writable: true},
-
-    _rootElement: { value: null, writable: true},
-    _stageElement: { value: null, writable: true},
+    _userContentLeft: { value: null},
+    _userContentTop: { value: null},
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
@@ -43,18 +39,9 @@ exports.ViewUtils = Montage.create(Component, {
     },
     getViewportObj: { value: function()                 {  return this.m_viewportObj;   } },
 
-    setRootElement: { value: function( elt )            { this._rootElement = elt; } },
-    getRootElement: { value: function ()                { return this._rootElement;        } },
-
-    setStageElement: { value: function( elt )    {  this._stageElement = elt;    } },
-    getStageElement: { value: function () { return this._stageElement; } },
-
-    setCurrentDocument: { value: function(value) { this._currentDocument = value; }},
-
     setUserContentLeft: { value: function(value) { this._userContentLeft = value; }},
     setUserContentTop: { value: function(value) { this._userContentTop = value; }},
 
-
     getPerspectiveDistance: { value: function () { return this._perspectiveDist; } },
 
     ///////////////////////////////////////////////////////////////////////
@@ -302,7 +289,7 @@ exports.ViewUtils = Montage.create(Component, {
     // into stage world space.
     postViewToStageWorld: {
         value: function( localPt, elt ) {
-            if ((elt == null) || (elt === this._stageElement))  return localPt;
+            if ((elt == null) || (elt === this.application.ninja.currentDocument.documentRoot))  return localPt;
 
             // get the 3D transformation and 2D offset from the element
             var pt = localPt.slice(0);
@@ -329,7 +316,7 @@ exports.ViewUtils = Montage.create(Component, {
                 this.popViewportObj();
 
                 // check if we are done
-                if (parent === this._stageElement)  break;
+                if (parent === this.application.ninja.currentDocument.documentRoot)  break;
 
                 if (this.elementHas3D( parent ))
                 {
@@ -358,13 +345,13 @@ exports.ViewUtils = Montage.create(Component, {
             {
                 pt = this.childToParent( pt, child );
 
-//                if (child === this._stageElement)  break;
+//                if (child === this.application.ninja.currentDocument.documentRoot)  break;
 //                child = child.offsetParent;
 
-                if (child === this._stageElement)  break;
-                if (child === this._rootElement)  break;
+                if (child === this.application.ninja.currentDocument.documentRoot)  break;
+                if (child === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
                 child = child.offsetParent;
-                if (child === this._rootElement)  break;
+                if (child === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
             }
 
             /////////////////////////////////////////////////////////
@@ -414,7 +401,7 @@ exports.ViewUtils = Montage.create(Component, {
                 {
                     // TODO - Commenting out flatten support until new perspective workflow is fully working
                     // if (flatten)  pt[2] = 0;
-//                    var flatten = (parent !== this._rootElement) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
+//                    var flatten = (parent !== this.application.ninja.currentDocument.documentRoot.parentNode) && (ElementsMediator.getProperty(parent, "-webkit-transform-style") !== "preserve-3d");
 //                    if(flatten)
 //                    {
 //                        pt[2] = 0;
@@ -699,7 +686,7 @@ exports.ViewUtils = Montage.create(Component, {
         //        if (elt.__ninjaXOff)  xOff = elt.__ninjaXOff;
         //        if (elt.__ninjaYOff)  yOff = elt.__ninjaYOff;
             var offset = [xOff, yOff];
-            if(elt.offsetParent && (elt.offsetParent !== this._stageElement))
+            if(elt.offsetParent && (elt.offsetParent !== this.application.ninja.currentDocument.documentRoot))
             {
                 var pS = elt.ownerDocument.defaultView.getComputedStyle(elt.offsetParent);
 
@@ -715,7 +702,7 @@ exports.ViewUtils = Montage.create(Component, {
                 }
             }
 
-            if(elt === this._stageElement)
+            if(elt === this.application.ninja.currentDocument.documentRoot)
             {
                 // TODO - Call a routine from the user document controller to get the offsets/margins
                 // Once we expose the document controller to ViewUtils
@@ -1006,7 +993,7 @@ exports.ViewUtils = Montage.create(Component, {
                     glmat4.multiply( v2s, mat, mat );
 
                 // TODO - Commenting out flatten support until new perspective workflow is fully working
-//                    var flatten = (elt !== this._rootElement) && (elt.parentElement !== this._rootElement) && (ElementsMediator.getProperty(elt.parentElement, "-webkit-transform-style") !== "preserve-3d");
+//                    var flatten = (elt !== this.application.ninja.currentDocument.documentRoot.parentNode) && (elt.parentElement !== this.application.ninja.currentDocument.documentRoot.parentNode) && (ElementsMediator.getProperty(elt.parentElement, "-webkit-transform-style") !== "preserve-3d");
 //                    if(flatten)
 //                    {
 //                        glmat4.multiply( zMat, mat, mat );
@@ -1020,10 +1007,10 @@ exports.ViewUtils = Montage.create(Component, {
 
                 this.popViewportObj();
 
-                if (elt === this._stageElement)  break;
-                if (elt === this._rootElement)  break;
+                if (elt === this.application.ninja.currentDocument.documentRoot)  break;
+                if (elt === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
                 elt = elt.offsetParent;
-                if (elt === this._rootElement)  break;
+                if (elt === this.application.ninja.currentDocument.documentRoot.parentNode)  break;
             }
 
             return mat;
@@ -1057,7 +1044,7 @@ exports.ViewUtils = Montage.create(Component, {
                 // multiply all the matrices together
                 //mat = s2v.multiply( mat );
                 glmat4.multiply( s2v, mat, mat );
-                if (elt === this._stageElement)  break;
+                if (elt === this.application.ninja.currentDocument.documentRoot)  break;
                 //mat = objMat.multiply( mat );
                 glmat4.multiply( objMat, mat, mat );
                 if(shouldProject && pDist)
@@ -1106,7 +1093,7 @@ exports.ViewUtils = Montage.create(Component, {
                 // multiply all the matrices together
                 //mat = s2v.multiply( mat );
                 glmat4.multiply( s2v, mat, mat );
-                if (elt === this._stageElement)  break;
+                if (elt === this.application.ninja.currentDocument.documentRoot)  break;
                 //mat = objMat.multiply( mat );
                 if (shouldLocalTransform) {
                     glmat4.multiply( objMat, mat, mat );
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 1825eb06..17039438 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -11,8 +11,7 @@ var Montage = 			require("montage/core/core").Montage,
     drawUtils = 		require("js/helper-classes/3D/draw-utils").DrawUtils,
     ElementPlanes = 	require("js/helper-classes/3D/element-planes").ElementPlanes,
     MathUtilsClass = 	require("js/helper-classes/3D/math-utils").MathUtilsClass,
-    VecUtils = 			require("js/helper-classes/3D/vec-utils").VecUtils,
-    DrawingToolBase =	require("js/tools/drawing-tool-base").DrawingToolBase;
+    VecUtils = 			require("js/helper-classes/3D/vec-utils").VecUtils;
 
 exports.StageDeps = Montage.create(Component, {
     viewUtils: {
@@ -27,24 +26,6 @@ exports.StageDeps = Montage.create(Component, {
         value: drawUtils
     },
 
-    currentStage: {
-        value: null
-    },
-    
-    _currentDocument: {
-        value: null
-    },
-
-    currentDocument: {
-        get: function() { return this._currentDocument; },
-        set: function(value) {
-            if(value) {
-                this._currentDocument = value;
-                this.currentStage = value.documentRoot;
-            }
-        }
-    },
-
     _userContentLeft: {
         value: null
     },
@@ -112,7 +93,9 @@ exports.StageDeps = Montage.create(Component, {
             // bind the snap properties to the snap manager
             snapManager.bindSnap();
 
-
+            drawUtils.viewUtils = viewUtils;
+            drawUtils.snapManager = snapManager;
+            drawUtils.ElementPlanes = ElementPlanes;
         }
     },
 
@@ -121,22 +104,8 @@ exports.StageDeps = Montage.create(Component, {
 
             workingPlane = [0,0,1,0];
 
-            snapManager.setCurrentStage(this.currentStage);
-
-            viewUtils.setCurrentDocument(this.currentDocument);
-            viewUtils.setRootElement(this.currentStage.parentNode);
-            viewUtils.setStageElement(this.currentStage);
-
-            drawUtils.viewUtils = viewUtils;
-            drawUtils.snapManager = snapManager;
-            drawUtils.ElementPlanes = ElementPlanes;
-
-            snapManager._isCacheInvalid=true;
-
-            snapManager.setupDragPlaneFromPlane ( workingPlane );
-
-            DrawingToolBase.stage = this.currentStage;
-            DrawingToolBase.stageComponent = this.stage;
+            snapManager._isCacheInvalid = true;
+            snapManager.setupDragPlaneFromPlane (workingPlane);
 
             drawUtils.initializeFromDocument();
         }
@@ -147,22 +116,8 @@ exports.StageDeps = Montage.create(Component, {
 
             workingPlane = [0,0,1,0];
 
-            snapManager.setCurrentStage(this.currentStage);
-
-            viewUtils.setCurrentDocument(this.currentDocument);
-            viewUtils.setRootElement(this.currentStage.parentNode);
-            viewUtils.setStageElement(this.curr