Skip to content

Commit 5b73fde

Browse files
committed
Bumping to v2.1.1
1 parent 04c4910 commit 5b73fde

9 files changed

+33
-17
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## v2.1.1
4+
5+
#### Breaking Chnages
6+
* None
7+
8+
#### New Features
9+
* None
10+
11+
#### Bug Fixes
12+
* #87 fixing onBlur and onClose
13+
* #88 Fixing hue updating when moving in grid on rgb and hex
14+
315
## v2.1.0
416

517
#### Breaking Chnages

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": "2.1.0",
4+
"version": "2.1.1",
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
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angularjs-color-picker.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v2.1.0
2+
* angularjs-color-picker v2.1.1
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-07-13 08:32:24
7+
* 2016-07-14 08:05:35
88
*
99
*/
1010

@@ -115,6 +115,10 @@
115115
value: function watchNgModel(newValue, oldValue) {
116116
var _this2 = this;
117117

118+
if (this.colorMouse) {
119+
return;
120+
}
121+
118122
if (newValue !== undefined && newValue !== null && newValue !== oldValue && newValue.length > 4) {
119123
var color = tinycolor(newValue);
120124

@@ -198,7 +202,7 @@
198202
_this4.eventApiDispatch('onOpen', [event]);
199203
};
200204

201-
this.api.close = function () {
205+
this.api.close = function (event) {
202206
if (!_this4.options.inline && (_this4.visible || _this4.$element[0].querySelector('.color-picker-panel').offsetParent !== null)) {
203207

204208
_this4.visible = false;
@@ -361,7 +365,7 @@
361365
this.update();
362366
}
363367

364-
this.eventApiDispatch(this.api, 'onBlur', [event]);
368+
this.eventApiDispatch('onBlur', [event]);
365369
}
366370
}, {
367371
key: 'initConfig',

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 v2.1.0
2+
* angularjs-color-picker v2.1.1
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-07-13 08:32:26
7+
* 2016-07-14 08:05:37
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 v2.1.0
2+
* angularjs-color-picker v2.1.1
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-07-13 08:32:26
7+
* 2016-07-14 08:05:37
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": "2.1.0",
4+
"version": "2.1.1",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)