Skip to content

Commit 8e5e37a

Browse files
Bumping to v3.4.7
1 parent ce95b52 commit 8e5e37a

9 files changed

+29
-20
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
This is a summary of the changes. For a full list of changes see https://github.com/ruhley/angular-color-picker/releases.
44

5+
## v3.4.7
6+
7+
#### Breaking Changes
8+
* None
9+
10+
#### New Features
11+
* None
12+
13+
#### Bug Fixes
14+
* Fixing up clear and reset buttons for initial values that are not set when color picker is initialised
15+
516
## v3.4.6
617

718
#### Breaking Changes

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-color-picker",
33
"description": "Color Picker Directive For AngularJS",
4-
"version": "3.4.6",
4+
"version": "3.4.7",
55
"homepage": "https://github.com/ruhley/angular-color-picker",
66
"repository": {
77
"type": "git",

dist/angularjs-color-picker.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.6
2+
* angularjs-color-picker v3.4.7
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-09-22 11:38:16
7+
* 2017-09-25 17:42:35
88
*
99
*/
1010
.color-picker-wrapper {

dist/angularjs-color-picker.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.6
2+
* angularjs-color-picker v3.4.7
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-09-22 11:38:10
7+
* 2017-09-25 18:00:22
88
*
99
*/
1010

@@ -342,7 +342,7 @@ var AngularColorPickerController = function () {
342342
key: 'watchNgModel',
343343
value: function watchNgModel(newValue, oldValue) {
344344
// set initial value if not already set
345-
if (newValue !== undefined && oldValue !== undefined && !this.hasOwnProperty('initialNgModel')) {
345+
if (newValue !== undefined && !this.hasOwnProperty('initialNgModel')) {
346346
this.initialNgModel = newValue;
347347
}
348348

@@ -659,11 +659,9 @@ var AngularColorPickerController = function () {
659659
};
660660

661661
this.api.clear = function (event) {
662-
if (_this4.internalNgModel !== '') {
663-
_this4.setNgModel('');
662+
_this4.setNgModel(null);
664663

665-
_this4.eventApiDispatch('onClear', [event]);
666-
}
664+
_this4.eventApiDispatch('onClear', [event]);
667665
};
668666

669667
this.api.reset = function (event) {

dist/angularjs-color-picker.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angularjs-color-picker.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/themes/angularjs-color-picker-bootstrap.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.6
2+
* angularjs-color-picker v3.4.7
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-09-22 11:38:16
7+
* 2017-09-25 17:42:35
88
*
99
*/
1010
.color-picker-wrapper .color-picker-input-wrapper {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*!
2-
* angularjs-color-picker v3.4.6
2+
* angularjs-color-picker v3.4.7
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-09-22 11:38:16
7+
* 2017-09-25 17:42:35
88
*
99
*/.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}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angularjs-color-picker",
33
"description": "Color Picker Directive For AngularJS",
4-
"version": "3.4.6",
4+
"version": "3.4.7",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)