From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/components/ui/color-chip.reel/color-chip.html | 2 +- js/components/ui/color-chip.reel/color-chip.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'js/components/ui/color-chip.reel') diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index 4cc7bb29..482f999c 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html @@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE. - +
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js index 1c1c6054..2353d2a5 100755 --- a/js/components/ui/color-chip.reel/color-chip.js +++ b/js/components/ui/color-chip.reel/color-chip.js @@ -107,9 +107,9 @@ var ColorChip = exports.ColorChip = Montage.create(Component, { var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)"; if(this.color && this.color.color) { - var g = this.color.color; - g.wasSetByCode = true; - this.chipBtn.color(this.color.mode, g); + var g = this.color.color; + g.wasSetByCode = true; + this.chipBtn.color(this.color.mode, g); } else if (this.color) { var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css); mode = colorObj.mode; -- cgit v1.2.3 From 9461e7731f91dd03a15b0a62667e722a60c84721 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:44:57 -0700 Subject: Remove byte order markers (BOM) --- js/components/ui/color-chip.reel/color-chip.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/ui/color-chip.reel') diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index 482f999c..400e868a 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html @@ -1,4 +1,4 @@ - +