Skip to content

Commit 9c9ae76

Browse files
committed
Bumping to v1.1.0
1 parent b4184b3 commit 9c9ae76

8 files changed

+32
-19
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.0.7",
4+
"version": "1.1.0",
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v1.0.7
2+
* angularjs-color-picker v1.1.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-05 09:17:16
7+
* 2016-05-06 09:23:49
88
*
99
*/
1010
if (typeof module !== "undefined" && typeof exports !== "undefined" && module.exports === exports){
@@ -373,35 +373,48 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
373373
});
374374

375375
$scope.$watch('huePos', function(newValue) {
376+
var container = element[0].querySelector('.color-picker-hue');
376377
var el = angular.element(element[0].querySelector('.color-picker-hue .color-picker-slider'));
378+
var bounding = container.getBoundingClientRect();
379+
377380
el.css({
378-
'top': newValue + '%',
381+
'top': (bounding.height * newValue / 100) + 'px',
379382
});
380383
});
381384

382385
$scope.$watch('opacityPos', function(newValue) {
386+
var container = element[0].querySelector('.color-picker-opacity');
383387
var el = angular.element(element[0].querySelector('.color-picker-opacity .color-picker-slider'));
388+
var bounding = container.getBoundingClientRect();
389+
384390
el.css({
385-
'top': newValue + '%',
391+
'top': (bounding.height * newValue / 100) + 'px',
386392
});
387393
});
388394

389395
$scope.$watch('lightnessPos', function(newValue) {
396+
var container = element[0].querySelector('.color-picker-grid');
390397
var el = angular.element(element[0].querySelector('.color-picker-grid .color-picker-picker'));
398+
var bounding = container.getBoundingClientRect();
399+
391400
el.css({
392-
'top': newValue + '%',
401+
'top': (bounding.height * newValue / 100) + 'px',
393402
});
394403
});
395404

396405
$scope.$watch('saturationPos', function(newValue) {
406+
var container = element[0].querySelector('.color-picker-grid');
397407
var el = angular.element(element[0].querySelector('.color-picker-grid .color-picker-picker'));
408+
var bounding = container.getBoundingClientRect();
409+
398410
el.css({
399-
'left': newValue + '%',
411+
'left': (bounding.width * newValue / 100) + 'px',
400412
});
401413
});
402414

403415
$scope.$watch('grid', function(newValue) {
404416
var el = angular.element(element[0].querySelector('.color-picker-grid'));
417+
405418
el.css({
406419
'background-color': newValue,
407420
});

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 v1.0.7
2+
* angularjs-color-picker v1.1.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-05 09:17:16
7+
* 2016-05-06 09:23:49
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.0.7
2+
* angularjs-color-picker v1.1.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-05-05 09:17:16
7+
* 2016-05-06 09:23:49
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}.form-inline .color-picker-wrapper{width:auto;display:inline-block;vertical-align:middle}

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.0.7",
4+
"version": "1.1.0",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)