Skip to content

Commit 29caa3c

Browse files
committed
Bumping to v3.4.3
1 parent bbd675e commit 29caa3c

9 files changed

+33
-17
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+
## v3.4.3
4+
5+
#### Breaking Changes
6+
* None
7+
8+
#### New Features
9+
* None
10+
11+
#### Bug Fixes
12+
* Bug #167 - Cannot read property 'updateOn' of undefined `ngModelOptions`
13+
* Fixing up getterSetter = true setting internal ngModel to a function
14+
315
## v3.4.2
416

517
#### Breaking Changes

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": "3.4.2",
4+
"version": "3.4.3",
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
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.2
2+
* angularjs-color-picker v3.4.3
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-08-07 10:05:06
7+
* 2017-08-07 13:27:57
88
*
99
*/
1010
.color-picker-wrapper {

dist/angularjs-color-picker.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* angularjs-color-picker v3.4.2
2+
* angularjs-color-picker v3.4.3
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-08-07 10:05:04
7+
* 2017-08-07 13:27:55
88
*
99
*/
1010

@@ -71,6 +71,7 @@ var AngularColorPickerController = function () {
7171
this.$scope.init = this.init.bind(this);
7272

7373
// set default values
74+
this.ngModelOptions = {};
7475
this.hue = 0;
7576
this.saturation = undefined;
7677
this.lightness = undefined;
@@ -242,10 +243,13 @@ var AngularColorPickerController = function () {
242243
}, {
243244
key: 'init',
244245
value: function init() {
245-
this.internalNgModel = this.ngModel;
246246

247247
// ng model options
248-
this.ngModelOptions = this.$scope.control[0].$options.$$options;
248+
if (this.$scope.control[0].$options && this.$scope.control[0].$options.$$options) {
249+
this.ngModelOptions = this.$scope.control[0].$options.$$options;
250+
}
251+
252+
this.internalNgModel = this.ngModelOptions.getterSetter ? this.ngModel() : this.ngModel;
249253

250254
// browser variables
251255
this.chrome = Boolean(window.chrome);

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 v3.4.2
2+
* angularjs-color-picker v3.4.3
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-08-07 10:05:06
7+
* 2017-08-07 13:27:57
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 v3.4.2
2+
* angularjs-color-picker v3.4.3
33
* https://github.com/ruhley/angular-color-picker/
44
*
55
* Copyright 2017 ruhley
66
*
7-
* 2017-08-07 10:05:06
7+
* 2017-08-07 13:27:57
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": "3.4.2",
4+
"version": "3.4.3",
55
"license": "MIT",
66
"main": "dist/angularjs-color-picker.min.js",
77
"dependencies": {

0 commit comments

Comments
 (0)