Bumping to v2.4.2

Author: ruhley

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v2.4.2
+
+#### Breaking Changes
+  * None
+
+#### New Features
+  * None
+
+#### Bug Fixes
+  *  Bug #102 non assign error if options was set in html
+
 ## v2.4.1
 
 #### Breaking Changes

bower.json

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

dist/angularjs-color-picker.css

@@ -1,10 +1,10 @@
 /*!
- * angularjs-color-picker v2.4.1
+ * angularjs-color-picker v2.4.2
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-08-08 08:30:56
+ * 2016-08-11 13:26:59
  *
  */
 
@@ -418,7 +418,7 @@
       }, {
           key: 'initConfig',
           value: function initConfig() {
-              this.options = this.merge(this.options, this.ColorPickerOptions);
+              this.mergeOptions(this.options, this.ColorPickerOptions);
 
               this.visible = this.options.inline;
 
@@ -427,30 +427,19 @@
               }
           }
       }, {
-          key: 'merge',
-          value: function merge(options, defaultOptions) {
-              var newObject = {};
+          key: 'mergeOptions',
+          value: function mergeOptions(options, defaultOptions) {
               var attr;
 
               for (attr in defaultOptions) {
                   if (defaultOptions.hasOwnProperty(attr)) {
-                      newObject[attr] = defaultOptions[attr];
-                  }
-              }
-
-              if ((typeof options === 'undefined' ? 'undefined' : _typeof(options)) === 'object') {
-                  for (attr in options) {
-                      if (options.hasOwnProperty(attr)) {
-                          if (_typeof(options[attr]) === 'object') {
-                              newObject[attr] = this.merge(options[attr], newObject[attr]);
-                          } else {
-                              newObject[attr] = options[attr];
-                          }
+                      if (!options || !options.hasOwnProperty(attr)) {
+                          options[attr] = defaultOptions[attr];
+                      } else if (_typeof(defaultOptions[attr]) === 'object') {
+                          this.mergeOptions(options[attr], defaultOptions[attr]);
                       }
                   }
               }
-
-              return newObject;
           }
       }, {
           key: 'focus',

dist/angularjs-color-picker.js

@@ -1,10 +1,10 @@
 /*!
- * angularjs-color-picker v2.4.1
+ * angularjs-color-picker v2.4.2
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-08-08 08:30:59
+ * 2016-08-11 13:27:02
  *
  */
 .color-picker-wrapper .color-picker-input-wrapper {

dist/angularjs-color-picker.min.css

@@ -1,9 +1,9 @@
 /*!
- * angularjs-color-picker v2.4.1
+ * angularjs-color-picker v2.4.2
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-08-08 08:30:59
+ * 2016-08-11 13:27:02
  *
  */.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}

dist/angularjs-color-picker.min.js

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