Merge pull request #3 from billyaraujo/master

Update angular-pick-a-color.js
cdjackson · Jun 2, 2015 · 284af9c · 284af9c
2 parents 5620351 + 1b6cbbc
commit 284af9c
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/angular-pick-a-color.js b/src/angular-pick-a-color.js
@@ -41,34 +41,40 @@ angular.module('pickAColor', [])
                 return function (scope, element, attrs, controller) {
                     // Process options
                     var options = pickAColor.getOptions();
-                    if (attrs.inlineDropdown != null) {
+                    if (attrs.inlineDropdown !== null) {
                         options.inlineDropdown = attrs.inlineDropdown;
                     }
-                    if (attrs.showSpectrum != null) {
+                    if (attrs.showSpectrum !== null) {
                         options.showSpectrum = attrs.showSpectrum;
                     }
-                    if (attrs.showSavedColors != null) {
+                    if (attrs.showSavedColors !== null) {
                         options.showSavedColors = attrs.showSavedColors;
                     }
-                    if (attrs.saveColorsPerElement != null) {
+                    if (attrs.saveColorsPerElement !== null) {
                         options.saveColorsPerElement = attrs.saveColorsPerElement;
                     }
-                    if (attrs.fadeMenuToggle != null) {
+                    if (attrs.fadeMenuToggle !== null) {
                         options.fadeMenuToggle = attrs.fadeMenuToggle;
                     }
-                    if (attrs.showAdvanced != null) {
+                    if (attrs.showAdvanced !== null) {
                         options.showAdvanced = attrs.showAdvanced;
                     }
-                    if (attrs.showBasicColors != null) {
+                    if (attrs.showBasicColors !== null) {
                         options.showBasicColors = attrs.showBasicColors;
                     }
-                    if (attrs.showHexInput != null) {
+                    if (attrs.showHexInput !== null) {
                         options.showHexInput = attrs.showHexInput;
                     }
-                    if (attrs.allowBlank != null) {
+                    if (attrs.allowBlank !== null) {
                         options.allowBlank = attrs.allowBlank;
                     }
 
+                    scope.$watch(model, function(value) {
+                        element.val(model(scope));
+                        element.focus();
+                        element.blur();
+                    });
+
                     // Set the value before we initialise the picker
                     element.val(model(scope));