diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/ui/color-chip.reel | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/ui/color-chip.reel')
-rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.html | 4 | ||||
-rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.js | 6 |
2 files changed, 5 insertions, 5 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..fb862a4d 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 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -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; |