Skip to content

Commit

Permalink
chore(all): prepare release 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@EisenbergEffect
EisenbergEffect committed Feb 26, 2017
1 parent 7085a25 commit fae7342
Show file tree
Hide file tree
Showing 11 changed files with 410 additions and 208 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-templating",
"version": "1.2.0",
"version": "1.3.0",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down
104 changes: 68 additions & 36 deletions dist/amd/aurelia-templating.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.TemplatingEngine = exports.ElementConfigResource = exports.CompositionEngine = exports.HtmlBehaviorResource = exports.BindableProperty = exports.BehaviorPropertyObserver = exports.Controller = exports.ViewEngine = exports.ModuleAnalyzer = exports.ResourceDescription = exports.ResourceModule = exports.ViewCompiler = exports.ViewFactory = exports.BoundViewFactory = exports.ViewSlot = exports.View = exports.ViewResources = exports.ShadowDOM = exports.ShadowSlot = exports.PassThroughSlot = exports.SlotCustomAttribute = exports.BindingLanguage = exports.ViewLocator = exports.InlineViewStrategy = exports.TemplateRegistryViewStrategy = exports.NoViewStrategy = exports.ConventionalViewStrategy = exports.RelativeViewStrategy = exports.viewStrategy = exports.TargetInstruction = exports.BehaviorInstruction = exports.ViewCompileInstruction = exports.ResourceLoadContext = exports.ElementEvents = exports.ViewEngineHooksResource = exports.CompositionTransaction = exports.CompositionTransactionOwnershipToken = exports.CompositionTransactionNotifier = exports.Animator = exports.animationEvent = undefined;
exports.TemplatingEngine = exports.ElementConfigResource = exports.CompositionEngine = exports.SwapStrategies = exports.HtmlBehaviorResource = exports.BindableProperty = exports.BehaviorPropertyObserver = exports.Controller = exports.ViewEngine = exports.ModuleAnalyzer = exports.ResourceDescription = exports.ResourceModule = exports.ViewCompiler = exports.ViewFactory = exports.BoundViewFactory = exports.ViewSlot = exports.View = exports.ViewResources = exports.ShadowDOM = exports.ShadowSlot = exports.PassThroughSlot = exports.SlotCustomAttribute = exports.BindingLanguage = exports.ViewLocator = exports.InlineViewStrategy = exports.TemplateRegistryViewStrategy = exports.NoViewStrategy = exports.ConventionalViewStrategy = exports.RelativeViewStrategy = exports.viewStrategy = exports.TargetInstruction = exports.BehaviorInstruction = exports.ViewCompileInstruction = exports.ResourceLoadContext = exports.ElementEvents = exports.ViewEngineHooksResource = exports.CompositionTransaction = exports.CompositionTransactionOwnershipToken = exports.CompositionTransactionNotifier = exports.Animator = exports.animationEvent = undefined;
exports._hyphenate = _hyphenate;
exports._isAllWhitespace = _isAllWhitespace;
exports.viewEngineHooks = viewEngineHooks;
Expand Down Expand Up @@ -1882,7 +1882,11 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli

if (returnToCache) {
for (i = 0; i < ii; ++i) {
children[i].returnToCache();
var _child3 = children[i];

if (_child3) {
_child3.returnToCache();
}
}
}

Expand Down Expand Up @@ -2466,10 +2470,10 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli

if (node.innerHTML.trim()) {
var fragment = _aureliaPal.DOM.createDocumentFragment();
var _child3 = void 0;
var _child4 = void 0;

while (_child3 = node.firstChild) {
fragment.appendChild(_child3);
while (_child4 = node.firstChild) {
fragment.appendChild(_child4);
}

instruction.slotFallbackFactory = compiler.compile(fragment, resources);
Expand Down Expand Up @@ -2614,7 +2618,10 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
}

if (info.command && info.command !== 'options' && type.primaryProperty) {
attrName = info.attrName = type.primaryProperty.name;
var primaryProperty = type.primaryProperty;
attrName = info.attrName = primaryProperty.name;

info.defaultBindingMode = primaryProperty.defaultBindingMode;
}
}
}
Expand Down Expand Up @@ -2748,7 +2755,10 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
}

if (info.command && info.command !== 'options' && type.primaryProperty) {
attrName = info.attrName = type.primaryProperty.name;
var primaryProperty = type.primaryProperty;
attrName = info.attrName = primaryProperty.name;

info.defaultBindingMode = primaryProperty.defaultBindingMode;
}
}
}
Expand Down Expand Up @@ -4157,6 +4167,7 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli

if (descriptor) {
descriptor.writable = true;
descriptor.configurable = true;
}

selectorOrConfig.all = all;
Expand Down Expand Up @@ -4413,6 +4424,24 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
return ChildObserverBinder;
}();

function remove(viewSlot, previous) {
return Array.isArray(previous) ? viewSlot.removeMany(previous, true) : viewSlot.remove(previous, true);
}

var SwapStrategies = exports.SwapStrategies = {
before: function before(viewSlot, previous, callback) {
return previous === undefined ? callback() : callback().then(function () {
return remove(viewSlot, previous);
});
},
with: function _with(viewSlot, previous, callback) {
return previous === undefined ? callback() : Promise.all([remove(viewSlot, previous), callback()]);
},
after: function after(viewSlot, previous, callback) {
return Promise.resolve(viewSlot.removeAll(true)).then(callback);
}
};

function tryActivateViewModel(context) {
if (context.skipActivation || typeof context.viewModel.activate !== 'function') {
return Promise.resolve();
Expand All @@ -4429,38 +4458,45 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
this.viewLocator = viewLocator;
}

CompositionEngine.prototype._createControllerAndSwap = function _createControllerAndSwap(context) {
function swap(controller) {
return Promise.resolve(context.viewSlot.removeAll(true)).then(function () {
CompositionEngine.prototype._swap = function _swap(context, view) {
var swapStrategy = SwapStrategies[context.swapOrder] || SwapStrategies.after;
var previousViews = context.viewSlot.children.slice();

return swapStrategy(context.viewSlot, previousViews, function () {
return Promise.resolve(context.viewSlot.add(view)).then(function () {
if (context.currentController) {
context.currentController.unbind();
}

context.viewSlot.add(controller.view);

if (context.compositionTransactionNotifier) {
context.compositionTransactionNotifier.done();
}

return controller;
});
}
}).then(function () {
if (context.compositionTransactionNotifier) {
context.compositionTransactionNotifier.done();
}
});
};

CompositionEngine.prototype._createControllerAndSwap = function _createControllerAndSwap(context) {
var _this14 = this;

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

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(function () {
return swap(controller);
return _this14._swap(context, controller.view);
}).then(function () {
return controller;
});
}

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

CompositionEngine.prototype.createController = function createController(context) {
var _this14 = this;
var _this15 = this;

var childContainer = void 0;
var viewModel = void 0;
Expand All @@ -4473,7 +4509,7 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
viewModelResource = context.viewModelResource;
m = viewModelResource.metadata;

var viewStrategy = _this14.viewLocator.getViewStrategy(context.view || viewModel);
var viewStrategy = _this15.viewLocator.getViewStrategy(context.view || viewModel);

if (context.viewResources) {
viewStrategy.makeRelativeTo(context.viewResources.viewUrl);
Expand Down Expand Up @@ -4513,6 +4549,8 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
};

CompositionEngine.prototype.compose = function compose(context) {
var _this16 = this;

context.childContainer = context.childContainer || context.container.createChild();
context.view = this.viewLocator.getViewStrategy(context.view);

Expand All @@ -4536,23 +4574,17 @@ define(['exports', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pal', 'aureli
var result = viewFactory.create(context.childContainer);
result.bind(context.bindingContext, context.overrideContext);

var work = function work() {
return Promise.resolve(context.viewSlot.removeAll(true)).then(function () {
context.viewSlot.add(result);

if (context.compositionTransactionNotifier) {
context.compositionTransactionNotifier.done();
}

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(function () {
return _this16._swap(context, result);
}).then(function () {
return result;
});
};

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(work);
}

return work();
return _this16._swap(context, result).then(function () {
return result;
});
});
} else if (context.viewSlot) {
context.viewSlot.removeAll();
Expand Down
1 change: 1 addition & 0 deletions dist/aurelia-templating.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1784,6 +1784,7 @@ export declare function children(selectorOrConfig: string | Object): any;
* Creates a behavior property that references an immediate content child element that matches the provided selector.
*/
export declare function child(selectorOrConfig: string | Object): any;
export declare const SwapStrategies: any;

/**
* Used to dynamically compose components.
Expand Down
95 changes: 64 additions & 31 deletions dist/aurelia-templating.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2495,7 +2495,11 @@ export class ViewSlot {

if (returnToCache) {
for (i = 0; i < ii; ++i) {
children[i].returnToCache();
const child = children[i];

if (child) {
child.returnToCache();
}
}
}

Expand Down Expand Up @@ -3302,7 +3306,11 @@ export class ViewCompiler {
// associate the attribute value with the name of the default bindable property
// (otherwise it will remain associated with "value")
if (info.command && (info.command !== 'options') && type.primaryProperty) {
attrName = info.attrName = type.primaryProperty.name;
const primaryProperty = type.primaryProperty;
attrName = info.attrName = primaryProperty.name;
// note that the defaultBindingMode always overrides the attribute bindingMode which is only used for "single-value" custom attributes
// when using the syntax `<div square.bind="color"></div>`
info.defaultBindingMode = primaryProperty.defaultBindingMode;
}
}
}
Expand Down Expand Up @@ -3439,7 +3447,11 @@ export class ViewCompiler {
// associate the attribute value with the name of the default bindable property
// (otherwise it will remain associated with "value")
if (info.command && (info.command !== 'options') && type.primaryProperty) {
attrName = info.attrName = type.primaryProperty.name;
const primaryProperty = type.primaryProperty;
attrName = info.attrName = primaryProperty.name;
// note that the defaultBindingMode always overrides the attribute bindingMode which is only used for "single-value" custom attributes
// when using the syntax `<div square.bind="color"></div>`
info.defaultBindingMode = primaryProperty.defaultBindingMode;
}
}
}
Expand Down Expand Up @@ -5097,6 +5109,7 @@ function createChildObserverDecorator(selectorOrConfig, all) {

if (descriptor) {
descriptor.writable = true;
descriptor.configurable = true;
}

selectorOrConfig.all = all;
Expand Down Expand Up @@ -5351,6 +5364,33 @@ class ChildObserverBinder {
}
}

function remove(viewSlot, previous) {
return Array.isArray(previous)
? viewSlot.removeMany(previous, true)
: viewSlot.remove(previous, true);
}

export const SwapStrategies = {
// animate the next view in before removing the current view;
before(viewSlot, previous, callback) {
return (previous === undefined)
? callback()
: callback().then(() => remove(viewSlot, previous));
},

// animate the next view at the same time the current view is removed
with(viewSlot, previous, callback) {
return (previous === undefined)
? callback()
: Promise.all([remove(viewSlot, previous), callback()]);
},

// animate the next view in after the current view has been removed
after(viewSlot, previous, callback) {
return Promise.resolve(viewSlot.removeAll(true)).then(callback);
}
};

/**
* Instructs the composition engine how to dynamically compose a component.
*/
Expand Down Expand Up @@ -5432,31 +5472,34 @@ export class CompositionEngine {
this.viewLocator = viewLocator;
}

_createControllerAndSwap(context) {
function swap(controller) {
return Promise.resolve(context.viewSlot.removeAll(true)).then(() => {
_swap(context, view) {
let swapStrategy = SwapStrategies[context.swapOrder] || SwapStrategies.after;
let previousViews = context.viewSlot.children.slice();

return swapStrategy(context.viewSlot, previousViews, () => {
return Promise.resolve(context.viewSlot.add(view)).then(() => {
if (context.currentController) {
context.currentController.unbind();
}

context.viewSlot.add(controller.view);

if (context.compositionTransactionNotifier) {
context.compositionTransactionNotifier.done();
}

return controller;
});
}
}).then(() => {
if (context.compositionTransactionNotifier) {
context.compositionTransactionNotifier.done();
}
});
}

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

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(() => swap(controller));
return context.compositionTransactionOwnershipToken.waitForCompositionComplete()
.then(() => this._swap(context, controller.view))
.then(() => controller);
}

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

Expand Down Expand Up @@ -5550,23 +5593,13 @@ export class CompositionEngine {
let result = viewFactory.create(context.childContainer);
result.bind(context.bindingContext, context.overrideContext);

let work = () => {
return Promise.resolve(context.viewSlot.removeAll(true)).then(() => {
context.viewSlot.add(result);

if (context.compositionTransactionNotifier) {
context.compositionTransactionNotifier.done();
}

return result;
});
};

if (context.compositionTransactionOwnershipToken) {
return context.compositionTransactionOwnershipToken.waitForCompositionComplete().then(work);
return context.compositionTransactionOwnershipToken.waitForCompositionComplete()
.then(() => this._swap(context, result))
.then(() => result);
}

return work();
return this._swap(context, result).then(() => result);
});
} else if (context.viewSlot) {
context.viewSlot.removeAll();
Expand Down
Loading

0 comments on commit fae7342

Please sign in to comment.