Bumping to v3.4.7

ruhley · Sep 25, 2017 · 8e5e37a · 8e5e37a
1 parent ce95b52
commit 8e5e37a
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 This is a summary of the changes. For a full list of changes see https://github.com/ruhley/angular-color-picker/releases.
 
+## v3.4.7
+
+#### Breaking Changes
+  * None
+
+#### New Features
+  * None
+
+#### Bug Fixes
+    * Fixing up clear and reset buttons for initial values that are not set when color picker is initialised
+
 ## v3.4.6
 
 #### Breaking Changes

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "homepage": "https://github.com/ruhley/angular-color-picker",
   "repository": {
     "type": "git",

diff --git a/dist/angularjs-color-picker.css b/dist/angularjs-color-picker.css
@@ -1,10 +1,10 @@
 /*!
- * angularjs-color-picker v3.4.6
+ * angularjs-color-picker v3.4.7
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-22 11:38:16
+ * 2017-09-25 17:42:35
  *
  */
 .color-picker-wrapper {

diff --git a/dist/angularjs-color-picker.js b/dist/angularjs-color-picker.js
@@ -1,10 +1,10 @@
 /*!
- * angularjs-color-picker v3.4.6
+ * angularjs-color-picker v3.4.7
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-22 11:38:10
+ * 2017-09-25 18:00:22
  *
  */
 
@@ -342,7 +342,7 @@ var AngularColorPickerController = function () {
         key: 'watchNgModel',
         value: function watchNgModel(newValue, oldValue) {
             // set initial value if not already set
-            if (newValue !== undefined && oldValue !== undefined && !this.hasOwnProperty('initialNgModel')) {
+            if (newValue !== undefined && !this.hasOwnProperty('initialNgModel')) {
                 this.initialNgModel = newValue;
             }
 
@@ -659,11 +659,9 @@ var AngularColorPickerController = function () {
             };
 
             this.api.clear = function (event) {
-                if (_this4.internalNgModel !== '') {
-                    _this4.setNgModel('');
+                _this4.setNgModel(null);
 
-                    _this4.eventApiDispatch('onClear', [event]);
-                }
+                _this4.eventApiDispatch('onClear', [event]);
             };
 
             this.api.reset = function (event) {

diff --git a/dist/angularjs-color-picker.min.css b/dist/angularjs-color-picker.min.css
diff --git a/dist/angularjs-color-picker.min.js b/dist/angularjs-color-picker.min.js
diff --git a/dist/themes/angularjs-color-picker-bootstrap.css b/dist/themes/angularjs-color-picker-bootstrap.css
@@ -1,10 +1,10 @@
 /*!
- * angularjs-color-picker v3.4.6
+ * angularjs-color-picker v3.4.7
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-22 11:38:16
+ * 2017-09-25 17:42:35
  *
  */
 .color-picker-wrapper .color-picker-input-wrapper {

diff --git a/dist/themes/angularjs-color-picker-bootstrap.min.css b/dist/themes/angularjs-color-picker-bootstrap.min.css
@@ -1,9 +1,9 @@
 /*!
- * angularjs-color-picker v3.4.6
+ * angularjs-color-picker v3.4.7
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-22 11:38:16
+ * 2017-09-25 17:42:35
  *
  */.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}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angularjs-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "license": "MIT",
   "main": "dist/angularjs-color-picker.min.js",
   "dependencies": {