Fixing up setting ng-model to null

Author: ruhley

angularjs-color-picker.css

@@ -4,7 +4,7 @@
  *
  * Copyright 2015 ruhley
  *
- * 2015-09-28 08:53:52
+ * 2015-10-15 10:30:38
  *
  */
 if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -152,7 +152,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                 };
 
                 $scope.$watch('ngModel', function (newValue, oldValue) {
-                    if (newValue !== undefined && newValue !== oldValue && newValue.length > 4) {
+                    if (typeof newValue === 'string' && newValue !== oldValue && newValue.length > 4) {
                         $scope.log('Color Picker: MODEL - CHANGED', newValue);
                         var color = tinycolor(newValue);
 
@@ -177,6 +177,8 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                         if (oldValue !== undefined) {
                             control[0].$setDirty();
                         }
+                    } else {
+                        $scope.swatchColor = '';
                     }
                 });
 

angularjs-color-picker.js

@@ -74,6 +74,8 @@ <h1>AngularJS Color Picker</h1>
                         color-picker-case="case"
                         color-picker-swatch-only="swatchOnly">
                     </color-picker>
+
+                    <button class="btn btn-primary" ng-click="color = null;">Clear</button>
                 </div>
 
                 <div class="row">

angularjs-color-picker.min.css

@@ -133,7 +133,7 @@
                 };
 
                 $scope.$watch('ngModel', function (newValue, oldValue) {
-                    if (newValue !== undefined && newValue !== oldValue && newValue.length > 4) {
+                    if (typeof newValue === 'string' && newValue !== oldValue && newValue.length > 4) {
                         $scope.log('Color Picker: MODEL - CHANGED', newValue);
                         var color = tinycolor(newValue);
 
@@ -158,6 +158,8 @@
                         if (oldValue !== undefined) {
                             control[0].$setDirty();
                         }
+                    } else {
+                        $scope.swatchColor = '';
                     }
                 });