Skip to content

Commit 78ab5de

Browse files
committed
Bumping to v1.1.6
1 parent 004b66e commit 78ab5de

8 files changed

+34
-28
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.5",
4+
"version": "1.1.6",
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: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v1.1.5
2+
* angularjs-color-picker v1.1.6
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-06-21 07:56:41
7+
* 2016-06-23 08:36:52
88
*
99
*/
1010
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -206,9 +206,11 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
206206
$scope.opacityMouse = false;
207207
$scope.colorMouse = false;
208208

209-
// force the grid selection circle to redraw and fix its position
209+
// force the sliders to re-caculate their position
210+
$scope.hueUpdate();
210211
$scope.saturationUpdate();
211212
$scope.lightnessUpdate();
213+
$scope.opacityUpdate();
212214
};
213215

214216
$scope.hide = function () {
@@ -384,22 +386,26 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
384386
});
385387

386388
$scope.huePosUpdate = function() {
387-
var container = element[0].querySelector('.color-picker-hue');
388-
var el = angular.element(element[0].querySelector('.color-picker-hue .color-picker-slider'));
389-
var bounding = container.getBoundingClientRect();
389+
$timeout(function() {
390+
var container = element[0].querySelector('.color-picker-hue');
391+
var el = angular.element(element[0].querySelector('.color-picker-hue .color-picker-slider'));
392+
var bounding = container.getBoundingClientRect();
390393

391-
el.css({
392-
'top': (bounding.height * $scope.huePos / 100) + 'px',
394+
el.css({
395+
'top': (bounding.height * $scope.huePos / 100) + 'px',
396+
});
393397
});
394398
};
395399

396400
$scope.opacityPosUpdate = function() {
397-
var container = element[0].querySelector('.color-picker-opacity');
398-
var el = angular.element(element[0].querySelector('.color-picker-opacity .color-picker-slider'));
399-
var bounding = container.getBoundingClientRect();
401+
$timeout(function() {
402+
var container = element[0].querySelector('.color-picker-opacity');
403+
var el = angular.element(element[0].querySelector('.color-picker-opacity .color-picker-slider'));
404+
var bounding = container.getBoundingClientRect();
400405

401-
el.css({
402-
'top': (bounding.height * $scope.opacityPos / 100) + 'px',
406+
el.css({
407+
'top': (bounding.height * $scope.opacityPos / 100) + 'px',
408+
});
403409
});
404410
};
405411

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: 5 additions & 5 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 v1.1.5
2+
* angularjs-color-picker v1.1.6
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-06-21 07:56:41
7+
* 2016-06-23 08:36:52
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 v1.1.5
2+
* angularjs-color-picker v1.1.6
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-06-21 07:56:41
7+
* 2016-06-23 08:36:52
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": "1.1.5",
4+
"version": "1.1.6",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)