aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-05 11:15:00 -0700
committerNivesh Rajbhandari2012-04-05 11:15:00 -0700
commitc950fc80742f54f6b485bbda66f69d42cb762d40 (patch)
tree26deb4d6d7e8a56b59864c38cf5e849d2947e499
parentf38b97c6134242831e203f7036219aa2f7fad71e (diff)
downloadninja-c950fc80742f54f6b485bbda66f69d42cb762d40.tar.gz
Undoing bad auto-merge resize-composer.js.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rw-r--r--js/panels/resize-composer.js34
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;
9 9
10exports.ResizeComposer = Montage.create(Composer, { 10exports.ResizeComposer = Montage.create(Composer, {
11 11
12 xAxis: {
13 value: true
14 },
15
16 yAxis: {
17 value: true
18 },
19
12 enabled : { 20 enabled : {
13 enumerable: false, 21 enumerable: false,
14 value: true 22 value: true
@@ -69,6 +77,7 @@ exports.ResizeComposer = Montage.create(Composer, {
69 load: { 77 load: {
70 value: function() { 78 value: function() {
71 this.element.addEventListener("mousedown", this, true); 79 this.element.addEventListener("mousedown", this, true);
80 this.element.addEventListener("dblclick", this, true);
72 } 81 }
73 }, 82 },
74 83
@@ -104,18 +113,29 @@ exports.ResizeComposer = Montage.create(Composer, {
104 113
105 captureMousemove: { 114 captureMousemove: {
106 value: function(e) { 115 value: function(e) {
107 this._deltaX = e.clientX - this._startX; 116 if (this.xAxis) {
108 this._deltaY = e.clientY - this._startY; 117 this._deltaX = e.clientX - this._startX;
118 }
119 else {
120 this._deltaX = 0;
121 }
122 if (this.yAxis) {
123 this._deltaY = e.clientY - this._startY;
124 }
125 else {
126 this._deltaY = 0;
127 }
109 this._executeEvent("resizeMove"); 128 this._executeEvent("resizeMove");
110 } 129 }
111 }, 130 },
112 131
113 deserializedFromTemplate: { 132 captureDblclick: {
114 value: function() { 133 value:function(e) {
115 if (this.component) { 134 this._reset();
116 this.component.addComposer(this); 135 this._executeEvent("resizeReset");
117 }
118 } 136 }
119 } 137 }
120 138
139
140
121}); \ No newline at end of file 141}); \ No newline at end of file