Skip to content
Permalink
Browse files

Bumping to v3.4.3

  • Loading branch information
ruhley committed Aug 7, 2017
1 parent bbd675e commit 29caa3c936ec57a1f89dbcb30777afef952ea109
@@ -1,5 +1,17 @@
# Changelog

## v3.4.3

#### Breaking Changes
* None

#### New Features
* None

#### Bug Fixes
* Bug #167 - Cannot read property 'updateOn' of undefined `ngModelOptions`
* Fixing up getterSetter = true setting internal ngModel to a function

## v3.4.2

#### Breaking Changes
@@ -1,7 +1,7 @@
{
"name": "angular-color-picker",
"description": "Color Picker Directive For AngularJS",
"version": "3.4.2",
"version": "3.4.3",
"homepage": "https://github.com/ruhley/angular-color-picker",
"repository": {
"type": "git",
@@ -1,10 +1,10 @@
/*!
* angularjs-color-picker v3.4.2
* angularjs-color-picker v3.4.3
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-08-07 10:05:06
* 2017-08-07 13:27:57
*
*/
.color-picker-wrapper {
@@ -1,10 +1,10 @@
/*!
* angularjs-color-picker v3.4.2
* angularjs-color-picker v3.4.3
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-08-07 10:05:04
* 2017-08-07 13:27:55
*
*/

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

// set default values
this.ngModelOptions = {};
this.hue = 0;
this.saturation = undefined;
this.lightness = undefined;
@@ -242,10 +243,13 @@ var AngularColorPickerController = function () {
}, {
key: 'init',
value: function init() {
this.internalNgModel = this.ngModel;

// ng model options
this.ngModelOptions = this.$scope.control[0].$options.$$options;
if (this.$scope.control[0].$options && this.$scope.control[0].$options.$$options) {
this.ngModelOptions = this.$scope.control[0].$options.$$options;
}

this.internalNgModel = this.ngModelOptions.getterSetter ? this.ngModel() : this.ngModel;

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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -1,10 +1,10 @@
/*!
* angularjs-color-picker v3.4.2
* angularjs-color-picker v3.4.3
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-08-07 10:05:06
* 2017-08-07 13:27:57
*
*/
.color-picker-wrapper .color-picker-input-wrapper {
@@ -1,9 +1,9 @@
/*!
* angularjs-color-picker v3.4.2
* angularjs-color-picker v3.4.3
* https://github.com/ruhley/angular-color-picker/
*
* Copyright 2017 ruhley
*
* 2017-08-07 10:05:06
* 2017-08-07 13:27:57
*
*/.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}
@@ -1,7 +1,7 @@
{
"name": "angularjs-color-picker",
"description": "Color Picker Directive For AngularJS",
"version": "3.4.2",
"version": "3.4.3",
"license": "MIT",
"main": "dist/angularjs-color-picker.min.js",
"dependencies": {

0 comments on commit 29caa3c

Please sign in to comment.
You can’t perform that action at this time.