Skip to content

Commit 008e584

Browse files
committed
Bumping to v1.1.2
1 parent 84a16ea commit 008e584

8 files changed

+28
-24
lines changed

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": "1.1.1",
4+
"version": "1.1.2",
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: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v1.1.1
2+
* angularjs-color-picker v1.1.2
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-06 09:41:26
7+
* 2016-05-18 10:16:06
88
*
99
*/
1010
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -162,8 +162,10 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
162162
};
163163

164164
$scope.onBlur = function() {
165-
$scope.updateModel = true;
166-
$scope.update();
165+
if ($scope.ngModel !== $scope.onChangeValue) {
166+
$scope.updateModel = true;
167+
$scope.update();
168+
}
167169
};
168170

169171
$scope.initConfig = function() {
@@ -190,6 +192,11 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
190192
};
191193

192194
$scope.show = function () {
195+
// if already visible then don't run show again
196+
if ($scope.visible) {
197+
return true;
198+
}
199+
193200
$scope.log('Color Picker: Show Event');
194201
$scope.visible = true;
195202
$scope.hueMouse = false;

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: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v1.1.1
2+
* angularjs-color-picker v1.1.2
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-06 09:41:26
7+
* 2016-05-18 10:16:06
88
*
99
*/
1010
.color-picker-wrapper .color-picker-input-wrapper {
@@ -16,8 +16,3 @@
1616
.color-picker-wrapper.color-picker-swatch-only .input-group .input-group-addon {
1717
border-radius: 4px;
1818
}
19-
.form-inline .color-picker-wrapper {
20-
width: auto;
21-
display: inline-block;
22-
vertical-align: middle;
23-
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*!
2-
* angularjs-color-picker v1.1.1
2+
* angularjs-color-picker v1.1.2
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-06 09:41:26
7+
* 2016-05-18 10:16:06
88
*
9-
*/.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}.form-inline .color-picker-wrapper{width:auto;display:inline-block;vertical-align:middle}
9+
*/.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": "1.1.1",
4+
"version": "1.1.2",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)