Skip to content

Commit

Permalink
chore(all): prepare release 1.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Jul 17, 2018
1 parent f82577f commit c1fb53a
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 597 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.1",
"version": "1.8.2",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down
12 changes: 9 additions & 3 deletions dist/amd/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -4824,16 +4824,18 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
var _this15 = this;

return this.createController(context).then(function (controller) {
controller.automate(context.overrideContext, context.owningView);

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(function () {
controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view);
}).then(function () {
return controller;
});
}

controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view).then(function () {
return controller;
});
Expand Down Expand Up @@ -4886,8 +4888,12 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
});
}

var ctor = context.viewModel.constructor;
var isClass = typeof context.viewModel === 'function';
var ctor = isClass ? context.viewModel : context.viewModel.constructor;
if (isClass) {
ctor = context.viewModel;
childContainer.autoRegister(ctor);
}
var m = _aureliaMetadata.metadata.getOrCreateOwn(_aureliaMetadata.metadata.resource, HtmlBehaviorResource, ctor);

m.elementName = m.elementName || 'dynamic-element';
Expand Down
23 changes: 16 additions & 7 deletions dist/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -5994,14 +5994,19 @@ export class CompositionEngine {

_createControllerAndSwap(context) {
return this.createController(context).then(controller => {
controller.automate(context.overrideContext, context.owningView);

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete()
.then(() => this._swap(context, controller.view))
return context.compositionTransactionOwnershipToken
.waitForCompositionComplete()
.then(() => {
controller.automate(context.overrideContext, context.owningView);

return this._swap(context, controller.view);
})
.then(() => controller);
}

controller.automate(context.overrideContext, context.owningView);

return this._swap(context, controller.view).then(() => controller);
});
}
Expand Down Expand Up @@ -6056,8 +6061,8 @@ export class CompositionEngine {

if (typeof context.viewModel === 'string') {
context.viewModel = context.viewResources
? context.viewResources.relativeToView(context.viewModel)
: context.viewModel;
? context.viewResources.relativeToView(context.viewModel)
: context.viewModel;

return this.viewEngine.importViewModelResource(context.viewModel).then(viewModelResource => {
childContainer.autoRegister(viewModelResource.value);
Expand All @@ -6074,8 +6079,12 @@ export class CompositionEngine {
// When viewModel in context is not a module path
// only prepare the metadata and ensure the view model instance is ready
// if viewModel is a class, instantiate it
let ctor = context.viewModel.constructor;
let isClass = typeof context.viewModel === 'function';
let ctor = isClass ? context.viewModel : context.viewModel.constructor;
if (isClass) {
ctor = context.viewModel;
childContainer.autoRegister(ctor);
}
let m = metadata.getOrCreateOwn(metadata.resource, HtmlBehaviorResource, ctor);
// We don't call ViewResources.prototype.convention here as it should be called later
// Just need to prepare the metadata for later usage
Expand Down
12 changes: 9 additions & 3 deletions dist/commonjs/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -4805,16 +4805,18 @@ var CompositionEngine = exports.CompositionEngine = (_dec10 = (0, _aureliaDepend
var _this15 = this;

return this.createController(context).then(function (controller) {
controller.automate(context.overrideContext, context.owningView);

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(function () {
controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view);
}).then(function () {
return controller;
});
}

controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view).then(function () {
return controller;
});
Expand Down Expand Up @@ -4867,8 +4869,12 @@ var CompositionEngine = exports.CompositionEngine = (_dec10 = (0, _aureliaDepend
});
}

var ctor = context.viewModel.constructor;
var isClass = typeof context.viewModel === 'function';
var ctor = isClass ? context.viewModel : context.viewModel.constructor;
if (isClass) {
ctor = context.viewModel;
childContainer.autoRegister(ctor);
}
var m = _aureliaMetadata.metadata.getOrCreateOwn(_aureliaMetadata.metadata.resource, HtmlBehaviorResource, ctor);

m.elementName = m.elementName || 'dynamic-element';
Expand Down
16 changes: 12 additions & 4 deletions dist/es2015/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -4474,12 +4474,16 @@ export let CompositionEngine = (_dec10 = inject(ViewEngine, ViewLocator), _dec10

_createControllerAndSwap(context) {
return this.createController(context).then(controller => {
controller.automate(context.overrideContext, context.owningView);

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(() => this._swap(context, controller.view)).then(() => controller);
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(() => {
controller.automate(context.overrideContext, context.owningView);

return this._swap(context, controller.view);
}).then(() => controller);
}

controller.automate(context.overrideContext, context.owningView);

return this._swap(context, controller.view).then(() => controller);
});
}
Expand Down Expand Up @@ -4526,8 +4530,12 @@ export let CompositionEngine = (_dec10 = inject(ViewEngine, ViewLocator), _dec10
});
}

let ctor = context.viewModel.constructor;
let isClass = typeof context.viewModel === 'function';
let ctor = isClass ? context.viewModel : context.viewModel.constructor;
if (isClass) {
ctor = context.viewModel;
childContainer.autoRegister(ctor);
}
let m = metadata.getOrCreateOwn(metadata.resource, HtmlBehaviorResource, ctor);

m.elementName = m.elementName || 'dynamic-element';
Expand Down
12 changes: 9 additions & 3 deletions dist/native-modules/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -4766,16 +4766,18 @@ export var CompositionEngine = (_dec10 = inject(ViewEngine, ViewLocator), _dec10
var _this15 = this;

return this.createController(context).then(function (controller) {
controller.automate(context.overrideContext, context.owningView);

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(function () {
controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view);
}).then(function () {
return controller;
});
}

controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view).then(function () {
return controller;
});
Expand Down Expand Up @@ -4828,8 +4830,12 @@ export var CompositionEngine = (_dec10 = inject(ViewEngine, ViewLocator), _dec10
});
}

var ctor = context.viewModel.constructor;
var isClass = typeof context.viewModel === 'function';
var ctor = isClass ? context.viewModel : context.viewModel.constructor;
if (isClass) {
ctor = context.viewModel;
childContainer.autoRegister(ctor);
}
var m = metadata.getOrCreateOwn(metadata.resource, HtmlBehaviorResource, ctor);

m.elementName = m.elementName || 'dynamic-element';
Expand Down
12 changes: 9 additions & 3 deletions dist/system/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -5133,16 +5133,18 @@ System.register(['aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aurelia-
var _this15 = this;

return this.createController(context).then(function (controller) {
controller.automate(context.overrideContext, context.owningView);

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(function () {
controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view);
}).then(function () {
return controller;
});
}

controller.automate(context.overrideContext, context.owningView);

return _this15._swap(context, controller.view).then(function () {
return controller;
});
Expand Down Expand Up @@ -5195,8 +5197,12 @@ System.register(['aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aurelia-
});
}

var ctor = context.viewModel.constructor;
var isClass = typeof context.viewModel === 'function';
var ctor = isClass ? context.viewModel : context.viewModel.constructor;
if (isClass) {
ctor = context.viewModel;
childContainer.autoRegister(ctor);
}
var m = metadata.getOrCreateOwn(metadata.resource, HtmlBehaviorResource, ctor);

m.elementName = m.elementName || 'dynamic-element';
Expand Down
Loading

0 comments on commit c1fb53a

Please sign in to comment.