Skip to content

Commit cb10041

Browse files
committed
Bumping to v2.2.0
1 parent 43c882a commit cb10041

10 files changed

+189
-51
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.2.0
4+
5+
#### Breaking Changes
6+
* None
7+
8+
#### New Features
9+
* New `hue` option to show or hide the hue selector
10+
* New `close`, `clear` and `reset` options to show extra buttons
11+
12+
#### Bug Fixes
13+
* Bug #82 Support touch events
14+
315
## v2.1.6
416

517
#### Breaking Changes

README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ $scope.color = '#FF0000';
7373
$scope.options = {
7474
disabled: [false, true],
7575
format: ['hsl', 'hsv', 'rgb', 'hex', 'hex8'],
76+
hue: [true, false],
7677
alpha: [true, false],
7778
swatch: [true, false],
7879
swatchPos: ['left', 'right'],
@@ -82,11 +83,28 @@ $scope.options = {
8283
case: ['upper', 'lower'],
8384
inline: [false, true],
8485
placeholder: '',
86+
close: {
87+
show: [false, true],
88+
label: 'Close',
89+
class: '',
90+
},
91+
clear: {
92+
show: [false, true],
93+
label: 'Clear',
94+
class: '',
95+
},
96+
reset: {
97+
show: [false, true],
98+
label: 'Reset',
99+
class: '',
100+
},
85101
};
86102

87103
// exposed api functions
88104
$scope.api.open();
89105
$scope.api.close();
106+
$scope.api.clear();
107+
$scope.api.reset();
90108
$scope.api.getElement();
91109

92110
// api event handlers
@@ -95,6 +113,8 @@ $scope.eventApi = {
95113
onBlur: function(api, color, $event) {},
96114
onOpen: function(api, color, $event) {},
97115
onClose: function(api, color, $event) {},
116+
onClear: function(api, color, $event) {},
117+
onReset: function(api, color, $event) {},
98118
onDestroy: function(api, color) {},
99119
};
100120
```

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

dist/angularjs-color-picker.css

Lines changed: 29 additions & 16 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: 116 additions & 23 deletions
Large diffs are not rendered by default.

dist/angularjs-color-picker.min.css

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/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.6
2+
* angularjs-color-picker v2.2.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-07-22 08:24:45
7+
* 2016-07-26 09:55:21
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.6
2+
* angularjs-color-picker v2.2.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-07-22 08:24:45
7+
* 2016-07-26 09:55:21
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.6",
4+
"version": "2.2.0",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)