Skip to content

Commit a184a2e

Browse files
committed
Bumping to v2.5.0
1 parent 5a3fba6 commit a184a2e

10 files changed

+42
-26
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Changelog
22

3+
## v2.5.0
4+
5+
#### Breaking Changes
6+
* None
7+
8+
#### New Features
9+
* Improvement #116 Allow access to $scope
10+
11+
#### Bug Fixes
12+
* None
13+
314
## v2.4.8
415

516
#### Breaking Changes

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,21 @@ $scope.options = {
105105
};
106106

107107
// exposed api functions
108-
$scope.api.open();
109-
$scope.api.close();
110-
$scope.api.clear();
111-
$scope.api.reset();
112-
$scope.api.getElement();
108+
$scope.api.open(); // opens the popup
109+
$scope.api.close(); // closes the popup
110+
$scope.api.clear(); // removes value
111+
$scope.api.reset(); // resets color value to original value
112+
$scope.api.getElement(); // returns the wrapping <color-picker> element
113+
$scope.api.getScope(); // returns the color picker $scope
113114

114115
// api event handlers
115116
$scope.eventApi = {
116-
onChange: function(api, color, $event) {},
117-
onBlur: function(api, color, $event) {},
118-
onOpen: function(api, color, $event) {},
119-
onClose: function(api, color, $event) {},
120-
onClear: function(api, color, $event) {},
121-
onReset: function(api, color, $event) {},
117+
onChange: function(api, color, $event) {},
118+
onBlur: function(api, color, $event) {},
119+
onOpen: function(api, color, $event) {},
120+
onClose: function(api, color, $event) {},
121+
onClear: function(api, color, $event) {},
122+
onReset: function(api, color, $event) {},
122123
onDestroy: function(api, color) {},
123124
};
124125

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.4.8",
4+
"version": "2.5.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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v2.4.8
2+
* angularjs-color-picker v2.5.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-09-26 08:41:56
7+
* 2016-09-28 08:11:52
88
*
99
*/
1010

@@ -272,6 +272,10 @@ var AngularColorPickerController = function () {
272272
this.api.getElement = function () {
273273
return _this3.$element;
274274
};
275+
276+
this.api.getScope = function () {
277+
return _this3.$scope;
278+
};
275279
}
276280
}, {
277281
key: 'reInit',

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 v2.4.8
2+
* angularjs-color-picker v2.5.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-09-26 08:41:59
7+
* 2016-09-28 08:11:55
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.4.8
2+
* angularjs-color-picker v2.5.0
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2016 ruhley
66
*
7-
* 2016-09-26 08:41:59
7+
* 2016-09-28 08:11:55
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.4.8",
4+
"version": "2.5.0",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)