From 25d639e6c7dd737f4671011faf07091c86c0e324 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 7 Jun 2012 13:13:01 -0700 Subject: fixing the body color chip for non banners templates Signed-off-by: Valerio Virgillito --- js/panels/properties.reel/properties.js | 4 ++-- js/panels/properties.reel/sections/custom.reel/custom.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'js/panels') 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, { controls = this.customSections[n].content.controls; if(controls["colorSelect"]) { controls["colorSelect"].destroy(); - } else if(controls["background"]) { - controls["background"].destroy(); + } else if(controls["background-color"]) { + controls["background-color"].destroy(); } } 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, { this.controls[aField.id] = obj; // TODO - Hack for now to reference the color select object to unregister color chips - this.controls["background"] = obj; + this.controls["background-color"] = obj; return obj; } -- cgit v1.2.3 From 4070475b8da7257eca629be7288bf7a31d5e384e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 7 Jun 2012 15:33:50 -0700 Subject: IKNINJA-1702: Fix the timeline resized throwing a debugger error Signed-off-by: Valerio Virgillito --- js/panels/resize-composer.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'js/panels') diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js index 0d1774cd..57126690 100644 --- a/js/panels/resize-composer.js +++ b/js/panels/resize-composer.js @@ -105,6 +105,8 @@ exports.ResizeComposer = Montage.create(Composer, { captureMouseup: { value: function(e) { e.preventDefault(); + e.stopImmediatePropagation(); + e.stopPropagation(); window.removeEventListener("mousemove", this, true); window.removeEventListener("mouseup", this, true); this._executeEvent("resizeEnd"); -- cgit v1.2.3 From 0e18d3d973da09d636e848820e30d22a5e554fc9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 8 Jun 2012 13:02:48 -0700 Subject: IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2 Signed-off-by: Valerio Virgillito --- js/panels/resize-composer.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js/panels') diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js index 57126690..2278623f 100644 --- a/js/panels/resize-composer.js +++ b/js/panels/resize-composer.js @@ -115,6 +115,9 @@ exports.ResizeComposer = Montage.create(Composer, { captureMousemove: { value: function(e) { + e.preventDefault(); + e.stopImmediatePropagation(); + e.stopPropagation(); if (this.xAxis) { this._deltaX = e.clientX - this._startX; } -- cgit v1.2.3