diff options
| author | Kris Kowal | 2012-07-06 11:52:06 -0700 |
|---|---|---|
| committer | Kris Kowal | 2012-07-06 15:01:48 -0700 |
| commit | 648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch) | |
| tree | 8f0f55557bd0c47a84e49c1977c950645d284607 /js/components/ui/color-chip.reel | |
| parent | aedd14b18695d031f695d27dfbd94df5614495bb (diff) | |
| download | ninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz | |
Expand tabs
Diffstat (limited to 'js/components/ui/color-chip.reel')
| -rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.html | 2 | ||||
| -rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.js | 6 |
2 files changed, 4 insertions, 4 deletions
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. | |||
| 46 | </script> | 46 | </script> |
| 47 | </head> | 47 | </head> |
| 48 | <body> | 48 | <body> |
| 49 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> | 49 | <!-- TODO: This should not use the 'colortoolbar' class, this is the wrong application of this class --> |
| 50 | <div data-montage-id="colorChipContainer" class="colortoolbar"> | 50 | <div data-montage-id="colorChipContainer" class="colortoolbar"> |
| 51 | <div data-montage-id="chipIcon"></div> | 51 | <div data-montage-id="chipIcon"></div> |
| 52 | <div class="chipContainer"> | 52 | <div class="chipContainer"> |
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, { | |||
| 107 | var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)"; | 107 | var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)"; |
| 108 | 108 | ||
| 109 | if(this.color && this.color.color) { | 109 | if(this.color && this.color.color) { |
| 110 | var g = this.color.color; | 110 | var g = this.color.color; |
| 111 | g.wasSetByCode = true; | 111 | g.wasSetByCode = true; |
| 112 | this.chipBtn.color(this.color.mode, g); | 112 | this.chipBtn.color(this.color.mode, g); |
| 113 | } else if (this.color) { | 113 | } else if (this.color) { |
| 114 | var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css); | 114 | var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css); |
| 115 | mode = colorObj.mode; | 115 | mode = colorObj.mode; |