4 files changed, 59 insertions, 21 deletions

diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 2a9c63db..c8818021 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -96,12 +96,6 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             viewUtils.pushViewportObj( stage );
             var eltCtr = viewUtils.getCenterOfProjection();
             viewUtils.popViewportObj();
-//            if(this.application.ninja.documentController.webTemplate)
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
-            {
-                eltCtr[0] = stage.scrollWidth/2;
-                eltCtr[1] = stage.scrollHeight/2;
-            }
 
             var curMat = viewUtils.getMatrixFromElement(stage);
             var curMatInv = glmat4.inverse(curMat, []);
@@ -118,17 +112,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
             }
 
             this._origin = viewUtils.localToGlobal(eltCtr, stage);
-
-//            if(this.application.ninja.documentController.webTemplate)
-            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent")
-            {
-                this._startOriginArray = [];
-                this._startOriginArray.push(this._origin.slice());
-            }
-            else
-            {
-                this._setTransformOrigin(false);
-            }
+            this._setTransformOrigin(false);
             this.DrawHandles();
         }
     },
@@ -155,7 +139,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
                         // let the document and stage manager know about the zoom change
                         this.application.ninja.stage._firstDraw = true;
                         this.application.ninja.documentBar.zoomFactor = 100;
-                        this.application.ninja.currentDocument.iframe.style.zoom = 1.0;
+            this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0;
                         this.application.ninja.stage._firstDraw = false;
 
            // TODO - Any updates to the stage should redraw stage's children. Move this to mediator?
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 07c26b8c..5c8b15ae 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -165,10 +165,11 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                                         box[3] = point.y;
 
                     //selectionManagerModule.selectionManager.marqueeSelection(box);
-                    var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes;
+                    var childNodes = this.application.ninja.currentDocument.documentRoot.childNodes,
+                        selectionController = this.application.ninja.selectionController;
                     childNodes = Array.prototype.slice.call(childNodes, 0);
                     childNodes.forEach(function(item) {
-                        if(item.nodeType == 1 && SelectionTool._complicatedCollisionDetection(item, box)) {
+                        if(selectionController.isNodeTraversable(item) && SelectionTool._complicatedCollisionDetection(item, box)) {
                             selectedItems.push(item);
                         }
                     });
diff --git a/js/tools/ZoomTool.js b/js/tools/ZoomTool.js
index 93caf984..17301262 100755
--- a/js/tools/ZoomTool.js
+++ b/js/tools/ZoomTool.js
@@ -280,7 +280,9 @@ exports.ZoomTool = Montage.create(DrawingTool, {
                         this.application.ninja.documentBar.zoomFactor = zoomFactor*100;
             //this.application.ninja.stage.zoomFactor = zoomFactor;
                         if (zoomFactor >= 1)
-                                this.application.ninja.currentDocument.iframe.style.zoom = zoomFactor;
+            {
+                this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = zoomFactor;
+            }
                         this.application.ninja.stage._firstDraw = false;
                         //tmp3 = viewUtils.localToGlobal( localPt,  userContent );      // DEBUG - remove this line
 
diff --git a/js/tools/bindingTool.js b/js/tools/bindingTool.js
new file mode 100644
index 00000000..282e3408
--- /dev/null
+++ b/js/tools/bindingTool.js
@@ -0,0 +1,51 @@
+/* <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,
+    DrawingTool = require("js/tools/drawing-tool").DrawingTool,
+ModifierToolBase = require("js/tools/modifier-tool-base").ModifierToolBase;
+
+
+exports.BindingTool = Montage.create(ModifierToolBase, {
+    drawingFeedback: { value: { mode: "Draw2D", type: "" } },
+
+    Configure: {
+        value: function (doActivate)
+        {
+            if (doActivate)
+            {
+                NJevent("enableStageMove");
+                document.body.classList.add("ws-binding");
+
+            }
+            else
+            {
+                NJevent("disableStageMove");
+                document.body.classList.remove("ws-binding");
+            }
+        }
+    },
+
+    HandleLeftButtonDown: {
+        value: function(event) {
+            NJevent("enableStageMove");
+
+        }
+    },
+
+    HandleMouseMove: {
+        value: function(event) {
+            this.doDraw(event);
+        }
+    },
+
+    HandleLeftButtonUp: {
+        value: function(event) {
+            this.endDraw(event);
+            NJevent("disableStageMove");
+        }
+    }
+});
\ No newline at end of file