Skip to content

Commit

Permalink
chore(all): prepare release 0.8.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@EisenbergEffect
EisenbergEffect committed Feb 13, 2015
1 parent a29f2bc commit e0e3703
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 27 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": "0.8.9",
"version": "0.8.10",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down
11 changes: 6 additions & 5 deletions dist/amd/resource-coordinator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ define(["exports", "aurelia-loader", "aurelia-path", "aurelia-dependency-injecti
this.container = container;
this.viewEngine = viewEngine;
this.importedModules = {};
this.importedAnonymous = {};
this.appResources = appResources;
viewEngine.resourceCoordinator = this;
}
Expand All @@ -46,14 +45,14 @@ define(["exports", "aurelia-loader", "aurelia-path", "aurelia-dependency-injecti
}, {
getExistingModuleAnalysis: {
value: function getExistingModuleAnalysis(id) {
return this.importedModules[id] || this.importedAnonymous[id];
return this.importedModules[id];
},
writable: true,
configurable: true
},
loadViewModelInfo: {
value: function loadViewModelInfo(moduleImport, moduleMember) {
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember, this.importedAnonymous);
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember);
},
writable: true,
configurable: true
Expand All @@ -79,7 +78,7 @@ define(["exports", "aurelia-loader", "aurelia-path", "aurelia-dependency-injecti
_loadAndAnalyzeModuleForElement: {
value: function _loadAndAnalyzeModuleForElement(moduleImport, moduleMember, cache) {
var _this = this;
var existing = cache[moduleImport];
var existing = cache && cache[moduleImport];

if (existing) {
return Promise.resolve(existing.element);
Expand Down Expand Up @@ -111,7 +110,9 @@ define(["exports", "aurelia-loader", "aurelia-path", "aurelia-dependency-injecti
}
}

cache[analysis.id] = analysis;
if (cache) {
cache[analysis.id] = analysis;
}

return Promise.all(loads).then(function () {
return analysis.element;
Expand Down
11 changes: 6 additions & 5 deletions dist/commonjs/resource-coordinator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ var ResourceCoordinator = exports.ResourceCoordinator = (function () {
this.container = container;
this.viewEngine = viewEngine;
this.importedModules = {};
this.importedAnonymous = {};
this.appResources = appResources;
viewEngine.resourceCoordinator = this;
}
Expand All @@ -49,14 +48,14 @@ var ResourceCoordinator = exports.ResourceCoordinator = (function () {
}, {
getExistingModuleAnalysis: {
value: function getExistingModuleAnalysis(id) {
return this.importedModules[id] || this.importedAnonymous[id];
return this.importedModules[id];
},
writable: true,
configurable: true
},
loadViewModelInfo: {
value: function loadViewModelInfo(moduleImport, moduleMember) {
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember, this.importedAnonymous);
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember);
},
writable: true,
configurable: true
Expand All @@ -82,7 +81,7 @@ var ResourceCoordinator = exports.ResourceCoordinator = (function () {
_loadAndAnalyzeModuleForElement: {
value: function _loadAndAnalyzeModuleForElement(moduleImport, moduleMember, cache) {
var _this = this;
var existing = cache[moduleImport];
var existing = cache && cache[moduleImport];

if (existing) {
return Promise.resolve(existing.element);
Expand Down Expand Up @@ -114,7 +113,9 @@ var ResourceCoordinator = exports.ResourceCoordinator = (function () {
}
}

cache[analysis.id] = analysis;
if (cache) {
cache[analysis.id] = analysis;
}

return Promise.all(loads).then(function () {
return analysis.element;
Expand Down
21 changes: 11 additions & 10 deletions dist/es6/resource-coordinator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,16 @@ export class ResourceCoordinator {
this.container = container;
this.viewEngine = viewEngine;
this.importedModules = {};
this.importedAnonymous = {};
this.appResources = appResources;
viewEngine.resourceCoordinator = this;
}

getExistingModuleAnalysis(id){
return this.importedModules[id] || this.importedAnonymous[id];
return this.importedModules[id];
}

loadViewModelInfo(moduleImport, moduleMember){
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember, this.importedAnonymous);
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember);
}

loadElement(moduleImport, moduleMember, viewStategy){
Expand All @@ -50,7 +49,7 @@ export class ResourceCoordinator {
}

_loadAndAnalyzeModuleForElement(moduleImport, moduleMember, cache){
var existing = cache[moduleImport];
var existing = cache && cache[moduleImport];

if(existing){
return Promise.resolve(existing.element);
Expand Down Expand Up @@ -78,14 +77,16 @@ export class ResourceCoordinator {
}
}

cache[analysis.id] = analysis;
if(cache){
cache[analysis.id] = analysis;
}

return Promise.all(loads).then(() => analysis.element);
});
}

importResources(imports, resourceManifestUrl){
var i, ii, current, annotation, existing,
var i, ii, current, annotation, existing,
lookup = {},
finalModules = [],
importIds = [], analysis, type;
Expand All @@ -96,7 +97,7 @@ export class ResourceCoordinator {
current = imports[i];
annotation = Origin.get(current);

if(!annotation){
if(!annotation){
analysis = analyzeModule({'default':current});
analysis.analyze(container);
type = (analysis.element || analysis.resources[0]).type;
Expand All @@ -106,7 +107,7 @@ export class ResourceCoordinator {
}else{
annotation = new Origin(join(this.appResources.baseResourceUrl, type.name));
}

Origin.set(current, annotation);
}

Expand Down Expand Up @@ -215,7 +216,7 @@ class ResourceModule {
}

analyze(container){
var current = this.element,
var current = this.element,
resources = this.resources,
i, ii;

Expand Down Expand Up @@ -258,7 +259,7 @@ function analyzeModule(moduleInstance, viewModelMember){
if(typeof moduleInstance === 'function'){
moduleInstance = {'default': moduleInstance};
}

if(viewModelMember){
viewModelType = moduleInstance[viewModelMember];
}
Expand Down
11 changes: 6 additions & 5 deletions dist/system/resource-coordinator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ System.register(["aurelia-loader", "aurelia-path", "aurelia-dependency-injection
this.container = container;
this.viewEngine = viewEngine;
this.importedModules = {};
this.importedAnonymous = {};
this.appResources = appResources;
viewEngine.resourceCoordinator = this;
}
Expand All @@ -123,14 +122,14 @@ System.register(["aurelia-loader", "aurelia-path", "aurelia-dependency-injection
}, {
getExistingModuleAnalysis: {
value: function getExistingModuleAnalysis(id) {
return this.importedModules[id] || this.importedAnonymous[id];
return this.importedModules[id];
},
writable: true,
configurable: true
},
loadViewModelInfo: {
value: function loadViewModelInfo(moduleImport, moduleMember) {
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember, this.importedAnonymous);
return this._loadAndAnalyzeModuleForElement(moduleImport, moduleMember);
},
writable: true,
configurable: true
Expand All @@ -156,7 +155,7 @@ System.register(["aurelia-loader", "aurelia-path", "aurelia-dependency-injection
_loadAndAnalyzeModuleForElement: {
value: function _loadAndAnalyzeModuleForElement(moduleImport, moduleMember, cache) {
var _this = this;
var existing = cache[moduleImport];
var existing = cache && cache[moduleImport];

if (existing) {
return Promise.resolve(existing.element);
Expand Down Expand Up @@ -188,7 +187,9 @@ System.register(["aurelia-loader", "aurelia-path", "aurelia-dependency-injection
}
}

cache[analysis.id] = analysis;
if (cache) {
cache[analysis.id] = analysis;
}

return Promise.all(loads).then(function () {
return analysis.element;
Expand Down
9 changes: 9 additions & 0 deletions doc/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
### 0.8.10 (2015-02-13)


#### Bug Fixes

* **build:** add missing bower bump ([4484ea7f](http://github.com/aurelia/templating/commit/4484ea7f302d0faca3a0f48b218b9a0b8a00bd46))
* **resource-coordinator:** do not cache dynamic view models ([a29f2bc2](http://github.com/aurelia/templating/commit/a29f2bc2a8a8c3fc40265b310646587ee0601d55))


### 0.8.9 (2015-02-06)


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

0 comments on commit e0e3703

Please sign in to comment.