1 files changed, 20 insertions, 7 deletions

diff --git a/js/tools/bindingTool.js b/js/tools/bindingTool.js
index 08f9333c..2d459a61 100644
--- a/js/tools/bindingTool.js
+++ b/js/tools/bindingTool.js
@@ -12,6 +12,18 @@ SelectionTool = require("js/tools/SelectionTool").SelectionTool;
 
 exports.BindingTool = Montage.create(ModifierToolBase, {
     drawingFeedback: { value: { mode: "Draw2D", type: "" } },
+    _selectedComponent: {
+        value: null
+    },
+
+    selectedComponent: {
+        get:function() {
+            return this._selectedComponent;
+        },
+        set: function(val) {
+            this._selectedComponent = val;
+        }
+    },
 
     Configure: {
         value: function (doActivate)
@@ -20,7 +32,6 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
             {
                 NJevent("enableStageMove");
                 this.application.ninja.workspaceMode = "binding";
-
             }
             else
             {
@@ -33,12 +44,13 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
     HandleLeftButtonDown: {
         value: function(event) {
             NJevent("enableStageMove");
+            this.application.ninja.stage.bindingView.handleMousedown(event);
         }
     },
 
     HandleMouseMove: {
         value: function(event) {
-            this.doDraw(event);
+            //this.doDraw(event);
         }
     },
 
@@ -52,16 +64,17 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
 
             if(this._hasDraw) {
                 this._hasDraw = false;
-                this.endDraw(event);
+                //this.endDraw(event);
             } else {
                 this.doSelection(event);
                 if (this.application.ninja.selectedElements.length !== 0 ) {
-                    this.selectedElement = this.application.ninja.selectedElements[0];
+                    if(this.application.ninja.selectedElements[0].controller) {
+                        this.selectedComponent = this.application.ninja.selectedElements[0].controller;
+                    }
                 } else {
-                    this.selectedElement = null;
+                    this.selectedComponent = null;
                 }
-                this.application.ninja.stage.bindingView.selectedElement = this.selectedElement;
-                this.application.ninja.objectsController.currentObject = this.selectedElement.controller;
+                this.application.ninja.stage.bindingView.selectedComponent = this.selectedComponent;
                 this._isDrawing = false;
             }
             //this.endDraw(event);