Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snapping_II

1 files changed, 7 insertions, 27 deletions

diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 0d1774cd..6e5e89f8 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -9,14 +9,6 @@ var Composer = require("montage/ui/composer/composer").Composer;
 
 exports.ResizeComposer = Montage.create(Composer, {
 
-    xAxis: {
-        value: true
-    },
-
-    yAxis: {
-        value: true
-    },
-
     enabled : {
         enumerable: false,
         value: true
@@ -77,7 +69,6 @@ exports.ResizeComposer = Montage.create(Composer, {
     load: {
         value: function() {
             this.element.addEventListener("mousedown", this, true);
-            this.element.addEventListener("dblclick", this, true);
         }
     },
 
@@ -113,29 +104,18 @@ exports.ResizeComposer = Montage.create(Composer, {
 
     captureMousemove: {
         value: function(e) {
-            if (this.xAxis) {
-                this._deltaX = e.clientX - this._startX;
-            }
-            else {
-                this._deltaX = 0;
-            }
-            if (this.yAxis) {
-                this._deltaY = e.clientY - this._startY;
-            }
-            else {
-                this._deltaY = 0;
-            }
+            this._deltaX = e.clientX - this._startX;
+            this._deltaY = e.clientY - this._startY;
             this._executeEvent("resizeMove");
         }
     },
 
-    captureDblclick: {
-        value:function(e) {
-            this._reset();
-            this._executeEvent("resizeReset");
+    deserializedFromTemplate: {
+        value: function() {
+            if (this.component) {
+                this.component.addComposer(this);
+            }
         }
     }
 
-
-
 });
\ No newline at end of file