Bumping to v3.4.3

ruhley · Aug 7, 2017 · 29caa3c · 29caa3c
1 parent bbd675e
commit 29caa3c
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/bower.json b/bower.json
@@ -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",

diff --git a/dist/angularjs-color-picker.css b/dist/angularjs-color-picker.css
@@ -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 {

diff --git a/dist/angularjs-color-picker.js b/dist/angularjs-color-picker.js
@@ -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);

diff --git a/dist/angularjs-color-picker.min.css b/dist/angularjs-color-picker.min.css
diff --git a/dist/angularjs-color-picker.min.js b/dist/angularjs-color-picker.min.js
diff --git a/dist/themes/angularjs-color-picker-bootstrap.css b/dist/themes/angularjs-color-picker-bootstrap.css
@@ -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 {

diff --git a/dist/themes/angularjs-color-picker-bootstrap.min.css b/dist/themes/angularjs-color-picker-bootstrap.min.css
@@ -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}
diff --git a/package.json b/package.json
@@ -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": {