aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Splitter.js2
-rw-r--r--js/panels/resize-composer.js23
2 files changed, 22 insertions, 3 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index e92cb2dd..6791e0d5 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, {
55 }, 55 },
56 set: function(value) { 56 set: function(value) {
57 this._collapsed = value; 57 this._collapsed = value;
58 58 this.needsDraw = true;
59 this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); 59 this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value});
60 } 60 }
61 }, 61 },
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 6e5e89f8..450dc7b6 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
@@ -104,8 +112,19 @@ exports.ResizeComposer = Montage.create(Composer, {
104 112
105 captureMousemove: { 113 captureMousemove: {
106 value: function(e) { 114 value: function(e) {
107 this._deltaX = e.clientX - this._startX; 115
108 this._deltaY = e.clientY - this._startY; 116 if (this.xAxis) {
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 },