Bumping to v2.4.3

Author: ruhley

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v2.4.3
+
+#### Breaking Changes
+  * None
+
+#### New Features
+  * None
+
+#### Bug Fixes
+  *   Bug #103 error creating options if none provided
+
 ## v2.4.2
 
 #### Breaking Changes

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "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.2
+ * angularjs-color-picker v2.4.3
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-08-11 13:26:59
+ * 2016-08-12 09:20:07
  *
  */
 
@@ -418,6 +418,10 @@
       }, {
           key: 'initConfig',
           value: function initConfig() {
+              if (!this.options) {
+                  this.options = {};
+              }
+
               this.mergeOptions(this.options, this.ColorPickerOptions);
 
               this.visible = this.options.inline;
@@ -429,9 +433,7 @@
       }, {
           key: 'mergeOptions',
           value: function mergeOptions(options, defaultOptions) {
-              var attr;
-
-              for (attr in defaultOptions) {
+              for (var attr in defaultOptions) {
                   if (defaultOptions.hasOwnProperty(attr)) {
                       if (!options || !options.hasOwnProperty(attr)) {
                           options[attr] = defaultOptions[attr];

dist/angularjs-color-picker.js

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

dist/angularjs-color-picker.min.css

@@ -1,9 +1,9 @@
 /*!
- * angularjs-color-picker v2.4.2
+ * angularjs-color-picker v2.4.3
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2016 ruhley
  *
- * 2016-08-11 13:27:02
+ * 2016-08-12 09:20:10
  *
  */.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.2",
+  "version": "2.4.3",
   "license": "MIT",
   "main": "dist/angularjs-color-picker.min.js",
   "dependencies": {