Skip to content

Commit b555051

Browse files
committed
Merge pull request #20 from hilnius/master
0.6.4 : make color panel update the first time an input is correct
2 parents 216d366 + ed8c506 commit b555051

File tree

8 files changed

+22
-26
lines changed

8 files changed

+22
-26
lines changed

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.

angularjs-color-picker.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angular-color-picker v0.6.3
2+
* angular-color-picker v0.6.4
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2015 ruhley
66
*
7-
* 2015-07-24 09:07:56
7+
* 2015-07-29 13:11:21
88
*
99
*/
1010
(function() {
@@ -155,14 +155,12 @@
155155
if (color.isValid()) {
156156
var hsl = color.toHsv();
157157

158-
if ($scope.isValid) {
159-
$scope.hue = hsl.h;
160-
$scope.saturation = hsl.s * 100;
161-
$scope.lightness = hsl.v * 100;
158+
$scope.hue = hsl.h;
159+
$scope.saturation = hsl.s * 100;
160+
$scope.lightness = hsl.v * 100;
162161

163-
if ($scope.config.alpha) {
164-
$scope.opacity = hsl.a * 100;
165-
}
162+
if ($scope.config.alpha) {
163+
$scope.opacity = hsl.a * 100;
166164
}
167165

168166
$scope.isValid = true;

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.

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.

angularjs-color-picker.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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": "0.6.3",
4+
"version": "0.6.4",
55
"homepage": "https://github.com/ruhley/angular-color-picker",
66
"repository": {
77
"type": "git",

lib/scripts/directive.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,12 @@
140140
if (color.isValid()) {
141141
var hsl = color.toHsv();
142142

143-
if ($scope.isValid) {
144-
$scope.hue = hsl.h;
145-
$scope.saturation = hsl.s * 100;
146-
$scope.lightness = hsl.v * 100;
143+
$scope.hue = hsl.h;
144+
$scope.saturation = hsl.s * 100;
145+
$scope.lightness = hsl.v * 100;
147146

148-
if ($scope.config.alpha) {
149-
$scope.opacity = hsl.a * 100;
150-
}
147+
if ($scope.config.alpha) {
148+
$scope.opacity = hsl.a * 100;
151149
}
152150

153151
$scope.isValid = true;

package.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": "0.6.3",
4+
"version": "0.6.4",
55
"dependencies": {},
66
"repository": {
77
"type": "git",

0 commit comments

Comments
 (0)