diff --git a/bower.json b/bower.json index 97f4f309..07a51cfa 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "aurelia-templating", - "version": "1.1.0", + "version": "1.1.1", "description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.", "keywords": [ "aurelia", @@ -28,6 +28,6 @@ "aurelia-metadata": "^1.0.0", "aurelia-pal": "^1.0.0", "aurelia-path": "^1.0.0", - "aurelia-task-queue": "^1.0.0" + "aurelia-task-queue": "^1.1.0" } } diff --git a/dist/amd/aurelia-templating.js b/dist/amd/aurelia-templating.js index a7526743..abefcbff 100644 --- a/dist/amd/aurelia-templating.js +++ b/dist/amd/aurelia-templating.js @@ -3514,13 +3514,17 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli var oldValue = this.currentValue; if (oldValue !== newValue) { - if (this.publishing && this.notqueued) { - this.notqueued = false; - this.taskQueue.queueMicroTask(this); - } - this.oldValue = oldValue; this.currentValue = newValue; + + if (this.publishing && this.notqueued) { + if (this.taskQueue.flushing) { + this.call(); + } else { + this.notqueued = false; + this.taskQueue.queueMicroTask(this); + } + } } }; diff --git a/dist/aurelia-templating.js b/dist/aurelia-templating.js index 9826fdb9..2ee94c95 100644 --- a/dist/aurelia-templating.js +++ b/dist/aurelia-templating.js @@ -4363,13 +4363,17 @@ export class BehaviorPropertyObserver { let oldValue = this.currentValue; if (oldValue !== newValue) { - if (this.publishing && this.notqueued) { - this.notqueued = false; - this.taskQueue.queueMicroTask(this); - } - this.oldValue = oldValue; this.currentValue = newValue; + + if (this.publishing && this.notqueued) { + if (this.taskQueue.flushing) { + this.call(); + } else { + this.notqueued = false; + this.taskQueue.queueMicroTask(this); + } + } } } diff --git a/dist/commonjs/aurelia-templating.js b/dist/commonjs/aurelia-templating.js index ad9e4e2c..2302c42d 100644 --- a/dist/commonjs/aurelia-templating.js +++ b/dist/commonjs/aurelia-templating.js @@ -3495,13 +3495,17 @@ var BehaviorPropertyObserver = exports.BehaviorPropertyObserver = (_dec9 = (0, _ var oldValue = this.currentValue; if (oldValue !== newValue) { - if (this.publishing && this.notqueued) { - this.notqueued = false; - this.taskQueue.queueMicroTask(this); - } - this.oldValue = oldValue; this.currentValue = newValue; + + if (this.publishing && this.notqueued) { + if (this.taskQueue.flushing) { + this.call(); + } else { + this.notqueued = false; + this.taskQueue.queueMicroTask(this); + } + } } }; diff --git a/dist/es2015/aurelia-templating.js b/dist/es2015/aurelia-templating.js index 8fc43c40..2b405fc2 100644 --- a/dist/es2015/aurelia-templating.js +++ b/dist/es2015/aurelia-templating.js @@ -3222,13 +3222,17 @@ export let BehaviorPropertyObserver = (_dec9 = subscriberCollection(), _dec9(_cl let oldValue = this.currentValue; if (oldValue !== newValue) { - if (this.publishing && this.notqueued) { - this.notqueued = false; - this.taskQueue.queueMicroTask(this); - } - this.oldValue = oldValue; this.currentValue = newValue; + + if (this.publishing && this.notqueued) { + if (this.taskQueue.flushing) { + this.call(); + } else { + this.notqueued = false; + this.taskQueue.queueMicroTask(this); + } + } } } diff --git a/dist/native-modules/aurelia-templating.js b/dist/native-modules/aurelia-templating.js index 389948d9..0698fa80 100644 --- a/dist/native-modules/aurelia-templating.js +++ b/dist/native-modules/aurelia-templating.js @@ -3458,13 +3458,17 @@ export var BehaviorPropertyObserver = (_dec9 = subscriberCollection(), _dec9(_cl var oldValue = this.currentValue; if (oldValue !== newValue) { - if (this.publishing && this.notqueued) { - this.notqueued = false; - this.taskQueue.queueMicroTask(this); - } - this.oldValue = oldValue; this.currentValue = newValue; + + if (this.publishing && this.notqueued) { + if (this.taskQueue.flushing) { + this.call(); + } else { + this.notqueued = false; + this.taskQueue.queueMicroTask(this); + } + } } }; diff --git a/dist/system/aurelia-templating.js b/dist/system/aurelia-templating.js index 5a8771b4..68b52518 100644 --- a/dist/system/aurelia-templating.js +++ b/dist/system/aurelia-templating.js @@ -3917,13 +3917,17 @@ System.register(['aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aurelia- var oldValue = this.currentValue; if (oldValue !== newValue) { - if (this.publishing && this.notqueued) { - this.notqueued = false; - this.taskQueue.queueMicroTask(this); - } - this.oldValue = oldValue; this.currentValue = newValue; + + if (this.publishing && this.notqueued) { + if (this.taskQueue.flushing) { + this.call(); + } else { + this.notqueued = false; + this.taskQueue.queueMicroTask(this); + } + } } }; diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 4f0e8a1b..19224596 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [1.1.1](https://github.com/aurelia/templating/compare/1.1.0...v1.1.1) (2016-09-29) + + +### Bug Fixes + +* **BehaviorPropertyObserver:** publish immediately when TaskQueue already flushing ([06be105](https://github.com/aurelia/templating/commit/06be105)), closes [aurelia/binding#496](https://github.com/aurelia/binding/issues/496) [aurelia/binding#479](https://github.com/aurelia/binding/issues/479) [#363](https://github.com/aurelia/templating/issues/363) + + + # [1.1.0](https://github.com/aurelia/templating/compare/1.0.1...v1.1.0) (2016-09-07) diff --git a/package.json b/package.json index 590e98dd..bb313756 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-templating", - "version": "1.1.0", + "version": "1.1.1", "description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.", "keywords": [ "aurelia", @@ -37,7 +37,7 @@ "aurelia-metadata": "^1.0.0", "aurelia-pal": "^1.0.0", "aurelia-path": "^1.0.0", - "aurelia-task-queue": "^1.0.0" + "aurelia-task-queue": "^1.1.0" }, "dependencies": { "aurelia-binding": "^1.0.0", @@ -47,11 +47,11 @@ "aurelia-metadata": "^1.0.0", "aurelia-pal": "^1.0.0", "aurelia-path": "^1.0.0", - "aurelia-task-queue": "^1.0.0" + "aurelia-task-queue": "^1.1.0" }, "devDependencies": { - "aurelia-pal-browser": "^1.0.0-rc.1.0.0", - "aurelia-polyfills": "^1.0.0-rc.1.0.0", + "aurelia-pal-browser": "^1.0.0", + "aurelia-polyfills": "^1.0.0", "babel": "babel-core@^5.8.24", "babel-runtime": "^5.8.24", "core-js": "^2.0.3" @@ -65,7 +65,7 @@ "aurelia-metadata": "^1.0.0", "aurelia-pal": "^1.0.0", "aurelia-path": "^1.0.0", - "aurelia-task-queue": "^1.0.0" + "aurelia-task-queue": "^1.1.0" }, "devDependencies": { "aurelia-tools": "^0.2.4",