Merge pull request #157 from enricodeleo/master

Support hex formats as per TinyColor apis

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v3.3.0
+
+#### Breaking Changes
+  * `hex` and `hex8` formats are now returning the hex value without the hash `#` character.
+
+#### New Features
+  * Now supporting values with and without the `#` for both hex and hex8 formats.
+
+#### Bug Fixes
+  * None
+
 ## v3.2.1
 
 #### Breaking Changes

README.md

@@ -85,7 +85,7 @@ $scope.options = {
     restrictToFormat: [false, true],
     allowEmpty: [false, true],
     // color
-    format: ['hsl', 'hsv', 'rgb', 'hex', 'hex8', 'raw'],
+    format: ['hsl', 'hsv', 'rgb', 'hex', 'hexString', 'hex8', 'hex8String', 'raw'],
     hue: [true, false],
     saturation: [false, true],
     lightness: [false, true], // Note: In the square mode this is HSV and in round mode this is HSL

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "homepage": "https://github.com/ruhley/angular-color-picker",
   "repository": {
     "type": "git",

dist/angularjs-color-picker.css

@@ -4,7 +4,7 @@
  *
  * Copyright 2017 ruhley
  *
- * 2017-03-23 08:33:58
+ * 2017-05-15 02:14:57
  *
  */
 .color-picker-wrapper {

dist/angularjs-color-picker.js

@@ -4,7 +4,7 @@
  *
  * Copyright 2017 ruhley
  *
- * 2017-03-23 08:33:55
+ * 2017-05-15 02:14:55
  *
  */
 
@@ -19,13 +19,19 @@ tinycolor = 'default' in tinycolor ? tinycolor['default'] : tinycolor;
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
   return typeof obj;
 } : function (obj) {
-  return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj;
+  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
 };
 
 
 
 
 
+
+
+
+
+
+
 var classCallCheck = function (instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -607,14 +613,30 @@ var AngularColorPickerController = function () {
                         break;
 
                     case 'hex':
+                        if (this.options.case === 'lower') {
+                            this.ngModel = color.toHex().toLowerCase();
+                        } else {
+                            this.ngModel = color.toHex().toUpperCase();
+                        }
+                        break;
+
+                    case 'hex8':
+                        if (this.options.case === 'lower') {
+                            this.ngModel = color.toHex8().toLowerCase();
+                        } else {
+                            this.ngModel = color.toHex8().toUpperCase();
+                        }
+                        break;
+
+                    case 'hexString':
                         if (this.options.case === 'lower') {
                             this.ngModel = color.toHexString().toLowerCase();
                         } else {
                             this.ngModel = color.toHexString().toUpperCase();
                         }
                         break;
 
-                    case 'hex8':
+                    case 'hex8String':
                         if (this.options.case === 'lower') {
                             this.ngModel = color.toHex8String().toLowerCase();
                         } else {

dist/themes/angularjs-color-picker-bootstrap.css

@@ -4,7 +4,7 @@
  *
  * Copyright 2017 ruhley
  *
- * 2017-03-23 08:33:58
+ * 2017-05-15 02:14:57
  *
  */
 .color-picker-wrapper .color-picker-input-wrapper {

dist/themes/angularjs-color-picker-bootstrap.min.css

@@ -4,6 +4,6 @@
  *
  * Copyright 2017 ruhley
  *
- * 2017-03-23 08:33:58
+ * 2017-05-15 02:14:57
  *
  */.color-picker-wrapper .color-picker-input-wrapper{width:100%}.color-picker-wrapper .color-picker-swatch:not(.input-group-addon){height:28px}.color-picker-wrapper.color-picker-swatch-only .input-group .input-group-addon{border-radius:4px}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angularjs-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "license": "MIT",
   "main": "dist/angularjs-color-picker.min.js",
   "dependencies": {

src/scripts/controller.js

@@ -547,14 +547,30 @@ export default class AngularColorPickerController {
                     break;
 
                 case 'hex':
+                    if (this.options.case === 'lower') {
+                        this.ngModel = color.toHex().toLowerCase();
+                    } else {
+                        this.ngModel = color.toHex().toUpperCase();
+                    }
+                    break;
+
+                case 'hex8':
+                    if (this.options.case === 'lower') {
+                        this.ngModel = color.toHex8().toLowerCase();
+                    } else {
+                        this.ngModel = color.toHex8().toUpperCase();
+                    }
+                    break;
+
+                case 'hexstring':
                     if (this.options.case === 'lower') {
                         this.ngModel = color.toHexString().toLowerCase();
                     } else {
                         this.ngModel = color.toHexString().toUpperCase();
                     }
                     break;
 
-                case 'hex8':
+                case 'hex8string':
                     if (this.options.case === 'lower') {
                         this.ngModel = color.toHex8String().toLowerCase();
                     } else {