Bug #103 error creating options if none provided

Author: ruhley

examples/01-simple.html

@@ -145,15 +145,26 @@ <h1>AngularJS Color Picker</h1>
                 </div>
 
                 <div class="row">
-                    <h2>No Options</h2>
+                    <h2>HTML Options</h2>
                     <label class="control-label">Color</label>
-                    <color-picker class='col-sm-1' ng-model="entity.color" options="{'format':'hex','swatchOnly':true}" /></color-picker>
+                    <color-picker class='col-sm-1' ng-model="color2" options="{'format':'hex','swatchOnly':true}"></color-picker>
                 </div>
 
                 <div class="row">
                     Two Way Binding
                     {{color2}}
                 </div>
+
+                <div class="row">
+                    <h2>No Options</h2>
+                    <label class="control-label">Color</label>
+                    <color-picker class='col-sm-1' ng-model="color3"></color-picker>
+                </div>
+
+                <div class="row">
+                    Two Way Binding
+                    {{color3}}
+                </div>
             </form>
         </div>
     </body>

src/scripts/controller.js

@@ -365,6 +365,10 @@ export default class AngularColorPickerController {
     }
 
     initConfig () {
+        if (!this.options) {
+            this.options = {};
+        }
+
         this.mergeOptions(this.options, this.ColorPickerOptions);
 
         this.visible = this.options.inline;
@@ -375,9 +379,7 @@ export default class AngularColorPickerController {
     }
 
     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];