Fixed #3376

primefaces · Jul 18, 2017 · caa7df2 · caa7df2
1 parent 7b09c85
commit caa7df2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/app/components/colorpicker/colorpicker.ts b/src/app/components/colorpicker/colorpicker.ts
@@ -174,7 +174,7 @@ export class ColorPicker implements ControlValueAccessor, AfterViewChecked, OnDe
         let val: any;
         switch(this.format) {
             case 'hex':
-                val = this.HSBtoHEX(this.value);
+                val = '#' + this.HSBtoHEX(this.value);
             break;
 
             case 'rgb':

diff --git a/src/app/showcase/components/colorpicker/colorpickerdemo.html b/src/app/showcase/components/colorpicker/colorpickerdemo.html
@@ -9,12 +9,12 @@
     <h3 class="first">Inline</h3>
     <p-colorPicker [(ngModel)]="color1" inline="true"></p-colorPicker>
 
-    <p style="margin-top:.5em">Selected Color: <span style="display:inline-block;width:32px;height:32px;vertical-align:middle" [style.backgroundColor]="'#' + color1"></span> {{color1}} </p>    
+    <p style="margin-top:.5em">Selected Color: <span style="display:inline-block;width:32px;height:32px;vertical-align:middle" [style.backgroundColor]="color1"></span> {{color1}} </p>    
 
     <h3>Overlay</h3>
     <p-colorPicker [(ngModel)]="color2"></p-colorPicker>
 
-    <p style="margin-top:.5em">Selected Color: <span [ngStyle]="{'color':'#' + color2}">{{color2}}</span></p> 
+    <p style="margin-top:.5em">Selected Color: <span [ngStyle]="{'color':color2}">{{color2}}</span></p> 
 </div>
 
 <div class="content-section documentation">
@@ -248,12 +248,12 @@ <h3>Dependencies</h3>
 &lt;h3 class="first"&gt;Inline&lt;/h3&gt;
 &lt;p-colorPicker [(ngModel)]="color1" inline="true"&gt;&lt;/p-colorPicker&gt;
 
-&lt;p style="margin-top:.5em"&gt;Selected Color: &lt;span style="display:inline-block;width:32px;height:32px;vertical-align:middle" [style.backgroundColor]="'#' + color1"&gt;&lt;/span&gt; &#123;&#123;color1&#125;&#125; &lt;/p&gt;    
+&lt;p style="margin-top:.5em"&gt;Selected Color: &lt;span style="display:inline-block;width:32px;height:32px;vertical-align:middle" [style.backgroundColor]="color1"&gt;&lt;/span&gt; &#123;&#123;color1&#125;&#125; &lt;/p&gt;    
 
 &lt;h3&gt;Overlay&lt;/h3&gt;
 &lt;p-colorPicker [(ngModel)]="color2"&gt;&lt;/p-colorPicker&gt;
 
-&lt;p style="margin-top:.5em"&gt;Selected Color: &lt;span [ngStyle]="&#123;'color':'#' + color2&#125;"&gt;&#123;&#123;color2&#125;&#125;&lt;/span&gt;&lt;/p&gt; 
+&lt;p style="margin-top:.5em"&gt;Selected Color: &lt;span [ngStyle]="&#123;'color':color2&#125;"&gt;&#123;&#123;color2&#125;&#125;&lt;/span&gt;&lt;/p&gt; 
 </code>
 </pre>
 
@@ -263,7 +263,7 @@ <h3>Dependencies</h3>
 
     color1: string;
 
-    color2: string = '1976D2';
+    color2: string = '#1976D2';
 &#125;
 </code>
 </pre>

diff --git a/src/app/showcase/components/colorpicker/colorpickerdemo.ts b/src/app/showcase/components/colorpicker/colorpickerdemo.ts
@@ -7,5 +7,5 @@ export class ColorPickerDemo {
 
     color1: string;
 
-    color2: string = '1976D2';
+    color2: string = '#1976D2';
 }