aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/properties.reel/properties.js4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js2
-rw-r--r--js/panels/resize-composer.js5
3 files changed, 8 insertions, 3 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 934a3851..cc99ca6c 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -243,8 +243,8 @@ exports.Properties = Montage.create(Component, {
243 controls = this.customSections[n].content.controls; 243 controls = this.customSections[n].content.controls;
244 if(controls["colorSelect"]) { 244 if(controls["colorSelect"]) {
245 controls["colorSelect"].destroy(); 245 controls["colorSelect"].destroy();
246 } else if(controls["background"]) { 246 } else if(controls["background-color"]) {
247 controls["background"].destroy(); 247 controls["background-color"].destroy();
248 } 248 }
249 } 249 }
250 250
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index ae408f11..9df16112 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, {
400 this.controls[aField.id] = obj; 400 this.controls[aField.id] = obj;
401 401
402 // TODO - Hack for now to reference the color select object to unregister color chips 402 // TODO - Hack for now to reference the color select object to unregister color chips
403 this.controls["background"] = obj; 403 this.controls["background-color"] = obj;
404 404
405 return obj; 405 return obj;
406 } 406 }
diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 0d1774cd..2278623f 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -105,6 +105,8 @@ exports.ResizeComposer = Montage.create(Composer, {
105 captureMouseup: { 105 captureMouseup: {
106 value: function(e) { 106 value: function(e) {
107 e.preventDefault(); 107 e.preventDefault();
108 e.stopImmediatePropagation();
109 e.stopPropagation();
108 window.removeEventListener("mousemove", this, true); 110 window.removeEventListener("mousemove", this, true);
109 window.removeEventListener("mouseup", this, true); 111 window.removeEventListener("mouseup", this, true);
110 this._executeEvent("resizeEnd"); 112 this._executeEvent("resizeEnd");
@@ -113,6 +115,9 @@ exports.ResizeComposer = Montage.create(Composer, {
113 115
114 captureMousemove: { 116 captureMousemove: {
115 value: function(e) { 117 value: function(e) {
118 e.preventDefault();
119 e.stopImmediatePropagation();
120 e.stopPropagation();
116 if (this.xAxis) { 121 if (this.xAxis) {
117 this._deltaX = e.clientX - this._startX; 122 this._deltaX = e.clientX - this._startX;
118 } 123 }