Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 27 insertions, 7 deletions

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