Bumping to v3.4.6

ruhley · Sep 22, 2017 · 772c6ec · 772c6ec
1 parent aa8f553
commit 772c6ec
Show file tree

Hide file tree

Showing 12 changed files with 166 additions and 29 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
+dist
 **/*{.,-}min.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 This is a summary of the changes. For a full list of changes see https://github.com/ruhley/angular-color-picker/releases.
 
+## v3.4.6
+
+#### Breaking Changes
+  * None
+
+#### New Features
+  * None
+
+#### Bug Fixes
+    * Bug #170 - Internal model not updating when changed programmatically
+
 ## v3.4.5
 
 #### 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.5",
+  "version": "3.4.6",
   "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.5
+ * angularjs-color-picker v3.4.6
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-19 08:53:33
+ * 2017-09-22 11:38:16
  *
  */
 .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.5
+ * angularjs-color-picker v3.4.6
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-19 08:53:31
+ * 2017-09-22 11:38:10
  *
  */
 
@@ -26,7 +26,118 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
 
 
+var asyncGenerator = function () {
+  function AwaitValue(value) {
+    this.value = value;
+  }
+
+  function AsyncGenerator(gen) {
+    var front, back;
+
+    function send(key, arg) {
+      return new Promise(function (resolve, reject) {
+        var request = {
+          key: key,
+          arg: arg,
+          resolve: resolve,
+          reject: reject,
+          next: null
+        };
+
+        if (back) {
+          back = back.next = request;
+        } else {
+          front = back = request;
+          resume(key, arg);
+        }
+      });
+    }
+
+    function resume(key, arg) {
+      try {
+        var result = gen[key](arg);
+        var value = result.value;
+
+        if (value instanceof AwaitValue) {
+          Promise.resolve(value.value).then(function (arg) {
+            resume("next", arg);
+          }, function (arg) {
+            resume("throw", arg);
+          });
+        } else {
+          settle(result.done ? "return" : "normal", result.value);
+        }
+      } catch (err) {
+        settle("throw", err);
+      }
+    }
+
+    function settle(type, value) {
+      switch (type) {
+        case "return":
+          front.resolve({
+            value: value,
+            done: true
+          });
+          break;
+
+        case "throw":
+          front.reject(value);
+          break;
+
+        default:
+          front.resolve({
+            value: value,
+            done: false
+          });
+          break;
+      }
+
+      front = front.next;
+
+      if (front) {
+        resume(front.key, front.arg);
+      } else {
+        back = null;
+      }
+    }
+
+    this._invoke = send;
+
+    if (typeof gen.return !== "function") {
+      this.return = undefined;
+    }
+  }
+
+  if (typeof Symbol === "function" && Symbol.asyncIterator) {
+    AsyncGenerator.prototype[Symbol.asyncIterator] = function () {
+      return this;
+    };
+  }
+
+  AsyncGenerator.prototype.next = function (arg) {
+    return this._invoke("next", arg);
+  };
+
+  AsyncGenerator.prototype.throw = function (arg) {
+    return this._invoke("throw", arg);
+  };
+
+  AsyncGenerator.prototype.return = function (arg) {
+    return this._invoke("return", arg);
+  };
 
+  return {
+    wrap: function (fn) {
+      return function () {
+        return new AsyncGenerator(fn.apply(this, arguments));
+      };
+    },
+    await: function (value) {
+      return new AwaitValue(value);
+    }
+  };
+}();
 
 
 
@@ -94,8 +205,6 @@ var AngularColorPickerController = function () {
                 this.ngModelOptions = this.$scope.control[0].$options.$$options;
             }
 
-            this.internalNgModel = this.ngModelOptions.getterSetter ? this.ngModel() : this.ngModel;
-
             // browser variables
             this.chrome = Boolean(window.chrome);
             var _android_version = window.navigator.userAgent.match(/Android\s([0-9\.]*)/i);
@@ -163,7 +272,7 @@ var AngularColorPickerController = function () {
 
             // ngModel
 
-            this.$scope.$watch('AngularColorPickerController.internalNgModel', this.watchNgModel.bind(this));
+            this.$scope.$watch('AngularColorPickerController.internalNgModel', this.watchInternalNgModel.bind(this));
             this.$scope.$watch('AngularColorPickerController.ngModel', this.watchNgModel.bind(this));
 
             // options
@@ -215,6 +324,17 @@ var AngularColorPickerController = function () {
                 _this.valueUpdate('opacity');
             });
         }
+    }, {
+        key: 'watchInternalNgModel',
+        value: function watchInternalNgModel(newValue, oldValue) {
+            // the mouse is still moving so don't do anything yet
+            if (this.colorMouse) {
+                return;
+            }
+
+            // calculate and set color values
+            this.watchNgModelSet(newValue);
+        }
 
         /** Triggered on change to internal or external ngModel value */
 
@@ -229,6 +349,9 @@ var AngularColorPickerController = function () {
             // sets the field to pristine or dirty for angular
             this.checkDirty(newValue);
 
+            // update the internal model from external model
+            this.internalNgModel = this.ngModelOptions.getterSetter ? this.ngModel() : this.ngModel;
+
             // the mouse is still moving so don't do anything yet
             if (this.colorMouse) {
                 return;
@@ -974,7 +1097,6 @@ var AngularColorPickerController = function () {
             var isValid = color.isValid();
 
             if (isValid && this.options.restrictToFormat) {
-                var format = this.options.format;
                 isValid = color.getFormat() === this.getTinyColorFormat();
             }
 

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.5
+ * angularjs-color-picker v3.4.6
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-19 08:53:33
+ * 2017-09-22 11:38:16
  *
  */
 .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.5
+ * angularjs-color-picker v3.4.6
  * https://github.com/ruhley/angular-color-picker/
  *
  * Copyright 2017 ruhley
  *
- * 2017-09-19 08:53:33
+ * 2017-09-22 11:38:16
  *
  */.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/grunt/options/rollup.js b/grunt/options/rollup.js
@@ -9,7 +9,7 @@ var today = moment();
 
 module.exports = {
     options: {
-        entry: 'src/scripts/module.js',
+        input: 'src/scripts/module.js',
         plugins: [
             babel({
                 exclude: 'node_modules/**',
@@ -18,7 +18,7 @@ module.exports = {
         ]
     },
     options_min: {
-        entry: 'src/scripts/module.js',
+        input: 'src/scripts/module.js',
         plugins: [
             babel({
                 exclude: 'node_modules/**',
@@ -39,11 +39,14 @@ module.exports = {
         ]
     },
     writeOptions: {
-        dest: 'dist/angularjs-color-picker.js',
+        file: 'dist/angularjs-color-picker.js',
         format: 'umd',
-        moduleName: 'AngularjsColorPicker',
-        sourceMap: false,
-        banner: '/*!\n * ' + pjson.name + ' v' + pjson.version + '\n * https://github.com/ruhley/angular-color-picker/\n *\n * Copyright ' + today.format('YYYY') + ' ruhley\n *\n * ' + today.format('YYYY-MM-DD HH:mm:ss') + '\n *\n */\n'
+        name: 'AngularjsColorPicker',
+        sourcemap: false,
+        banner: '/*!\n * ' + pjson.name + ' v' + pjson.version + '\n * https://github.com/ruhley/angular-color-picker/\n *\n * Copyright ' + today.format('YYYY') + ' ruhley\n *\n * ' + today.format('YYYY-MM-DD HH:mm:ss') + '\n *\n */\n',
+        globals: {
+            tinycolor2: 'tinycolor',
+        },
     },
     writeFile: function(writer, writeOptions) {
         try {

diff --git a/grunt/rollup.js b/grunt/rollup.js
@@ -6,9 +6,9 @@ var rollup_options = require('./options/rollup');
 
 rollup.rollup(rollup_options.options).then(function(writer) {
     rollup_options.writeFile(writer, rollup_options.writeOptions);
-}, rollup_options.reject);
 
-rollup.rollup(rollup_options.options_min).then(function(writer) {
-    rollup_options.writeOptions.dest = rollup_options.writeOptions.dest.replace('.js', '.min.js');
-    rollup_options.writeFile(writer, rollup_options.writeOptions);
+    rollup.rollup(rollup_options.options_min).then(function(writer) {
+        rollup_options.writeOptions.file = rollup_options.writeOptions.file.replace('.js', '.min.js');
+        rollup_options.writeFile(writer, rollup_options.writeOptions);
+    }, rollup_options.reject);
 }, rollup_options.reject);
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.5",
+  "version": "3.4.6",
   "license": "MIT",
   "main": "dist/angularjs-color-picker.min.js",
   "dependencies": {