Skip to content

Commit

Permalink
chore(all): prepare release 1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Sep 25, 2018
1 parent 37d23ea commit eba6110
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-templating",
"version": "1.8.3",
"version": "1.9.0",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down
4 changes: 2 additions & 2 deletions dist/amd/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
function StaticViewStrategy(config) {


if (typeof config === 'string' || config instanceof HTMLTemplateElement) {
if (typeof config === 'string' || config instanceof _aureliaPal.DOM.Element && config.tagName === 'TEMPLATE') {
config = {
template: config
};
Expand Down Expand Up @@ -777,7 +777,7 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
return Promise.all(elDeps.map(function (el) {
return el.load(container, el.target);
})).then(function () {
var factory = viewCompiler.compile(_this2.template, viewResources, compileInstruction);
var factory = _this2.template !== null ? viewCompiler.compile(_this2.template, viewResources, compileInstruction) : null;
_this2.factoryIsReady = true;
_this2.factory = factory;
return factory;
Expand Down
10 changes: 6 additions & 4 deletions dist/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ export class NoViewStrategy {
* @param dependencies A list of view resource dependencies of this view.
* @param dependencyBaseUrl The base url for the view dependencies.
*/
constructor(dependencies?: Array<string|Function|Object>, dependencyBaseUrl?: string) {
constructor(dependencies?: Array<string | Function | Object>, dependencyBaseUrl?: string) {
this.dependencies = dependencies || null;
this.dependencyBaseUrl = dependencyBaseUrl || '';
}
Expand Down Expand Up @@ -923,7 +923,7 @@ export class InlineViewStrategy {
* @param dependencies A list of view resource dependencies of this view.
* @param dependencyBaseUrl The base url for the view dependencies.
*/
constructor(markup: string, dependencies?: Array<string|Function|Object>, dependencyBaseUrl?: string) {
constructor(markup: string, dependencies?: Array<string | Function | Object>, dependencyBaseUrl?: string) {
this.markup = markup;
this.dependencies = dependencies || null;
this.dependencyBaseUrl = dependencyBaseUrl || '';
Expand Down Expand Up @@ -981,7 +981,7 @@ export class StaticViewStrategy {
factory: ViewFactory;

constructor(config: string | HTMLTemplateElement | IStaticViewConfig) {
if (typeof config === 'string' || config instanceof HTMLTemplateElement) {
if (typeof config === 'string' || (config instanceof DOM.Element && config.tagName === 'TEMPLATE')) {
config = {
template: config
};
Expand Down Expand Up @@ -1045,7 +1045,9 @@ export class StaticViewStrategy {
}
// only load custom element as first step.
return Promise.all(elDeps.map(el => el.load(container, el.target))).then(() => {
const factory = viewCompiler.compile(this.template, viewResources, compileInstruction);
const factory = this.template !== null
? viewCompiler.compile(this.template, viewResources, compileInstruction)
: null;
this.factoryIsReady = true;
this.factory = factory;
return factory;
Expand Down
4 changes: 2 additions & 2 deletions dist/commonjs/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ var StaticViewStrategy = exports.StaticViewStrategy = (_dec6 = viewStrategy(), _
function StaticViewStrategy(config) {


if (typeof config === 'string' || config instanceof HTMLTemplateElement) {
if (typeof config === 'string' || config instanceof _aureliaPal.DOM.Element && config.tagName === 'TEMPLATE') {
config = {
template: config
};
Expand Down Expand Up @@ -758,7 +758,7 @@ var StaticViewStrategy = exports.StaticViewStrategy = (_dec6 = viewStrategy(), _
return Promise.all(elDeps.map(function (el) {
return el.load(container, el.target);
})).then(function () {
var factory = viewCompiler.compile(_this2.template, viewResources, compileInstruction);
var factory = _this2.template !== null ? viewCompiler.compile(_this2.template, viewResources, compileInstruction) : null;
_this2.factoryIsReady = true;
_this2.factory = factory;
return factory;
Expand Down
4 changes: 2 additions & 2 deletions dist/es2015/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ export let InlineViewStrategy = (_dec5 = viewStrategy(), _dec5(_class6 = class I
export let StaticViewStrategy = (_dec6 = viewStrategy(), _dec6(_class7 = class StaticViewStrategy {

constructor(config) {
if (typeof config === 'string' || config instanceof HTMLTemplateElement) {
if (typeof config === 'string' || config instanceof DOM.Element && config.tagName === 'TEMPLATE') {
config = {
template: config
};
Expand Down Expand Up @@ -622,7 +622,7 @@ export let StaticViewStrategy = (_dec6 = viewStrategy(), _dec6(_class7 = class S
}

return Promise.all(elDeps.map(el => el.load(container, el.target))).then(() => {
const factory = viewCompiler.compile(this.template, viewResources, compileInstruction);
const factory = this.template !== null ? viewCompiler.compile(this.template, viewResources, compileInstruction) : null;
this.factoryIsReady = true;
this.factory = factory;
return factory;
Expand Down
4 changes: 2 additions & 2 deletions dist/native-modules/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ export var StaticViewStrategy = (_dec6 = viewStrategy(), _dec6(_class7 = functio
function StaticViewStrategy(config) {


if (typeof config === 'string' || config instanceof HTMLTemplateElement) {
if (typeof config === 'string' || config instanceof DOM.Element && config.tagName === 'TEMPLATE') {
config = {
template: config
};
Expand Down Expand Up @@ -721,7 +721,7 @@ export var StaticViewStrategy = (_dec6 = viewStrategy(), _dec6(_class7 = functio
return Promise.all(elDeps.map(function (el) {
return el.load(container, el.target);
})).then(function () {
var factory = viewCompiler.compile(_this2.template, viewResources, compileInstruction);
var factory = _this2.template !== null ? viewCompiler.compile(_this2.template, viewResources, compileInstruction) : null;
_this2.factoryIsReady = true;
_this2.factory = factory;
return factory;
Expand Down
4 changes: 2 additions & 2 deletions dist/system/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ System.register(['aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aurelia-
function StaticViewStrategy(config) {


if (typeof config === 'string' || config instanceof HTMLTemplateElement) {
if (typeof config === 'string' || config instanceof DOM.Element && config.tagName === 'TEMPLATE') {
config = {
template: config
};
Expand Down Expand Up @@ -1505,7 +1505,7 @@ System.register(['aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aurelia-
return Promise.all(elDeps.map(function (el) {
return el.load(container, el.target);
})).then(function () {
var factory = viewCompiler.compile(_this2.template, viewResources, compileInstruction);
var factory = _this2.template !== null ? viewCompiler.compile(_this2.template, viewResources, compileInstruction) : null;
_this2.factoryIsReady = true;
_this2.factory = factory;
return factory;
Expand Down
11 changes: 11 additions & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<a name="1.9.0"></a>
# [1.9.0](https://github.com/aurelia/templating/compare/1.8.3...1.9.0) (2018-09-25)


### Bug Fixes

* **StaticViewStrategy:** check for null template before compiling ([37d23ea](https://github.com/aurelia/templating/commit/37d23ea))
* **StaticViewStrategy:** use DOM.Element instead of HTMLTemplateElement ([f9fb639](https://github.com/aurelia/templating/commit/f9fb639))



<a name="1.8.3"></a>
## [1.8.3](https://github.com/aurelia/templating/compare/1.8.2...1.8.3) (2018-09-07)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-templating",
"version": "1.8.3",
"version": "1.9.0",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down

0 comments on commit eba6110

Please sign in to comment.