Skip to content

Commit

Permalink
chore(all): prepare release 0.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Jan 23, 2015
1 parent 0c9ef97 commit 4be0b7d
Show file tree
Hide file tree
Showing 15 changed files with 152 additions and 74 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": "0.8.1",
"version": "0.8.2",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down
21 changes: 17 additions & 4 deletions dist/amd/custom-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,28 @@ define(["exports", "aurelia-metadata", "./behavior-instance", "./behaviors", "./
configurable: true
}
}, {
load: {
value: function load(container, target, viewStrategy) {
var _this = this;
var annotation, options;
configure: {
value: function configure(container, target) {
if (this.configured) {
return;
}

configureBehavior(container, this, target, valuePropertyName);

this.configured = true;
this.targetShadowDOM = Metadata.on(target).has(UseShadowDOM);
this.usesShadowDOM = this.targetShadowDOM && hasShadowDOM;
},
writable: true,
enumerable: true,
configurable: true
},
load: {
value: function load(container, target, viewStrategy) {
var _this = this;
var options;

this.configure(container, target);

viewStrategy = viewStrategy || ViewStrategy.getDefault(target);
options = { targetShadowDOM: this.targetShadowDOM };
Expand Down
32 changes: 18 additions & 14 deletions dist/amd/property.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,25 +116,29 @@ define(["exports", "./util", "aurelia-binding"], function (exports, _util, _aure
var selfSubscriber, observer, attribute;

observer = observerLookup[this.name];
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if (behaviorHandlesBind) {
observer.selfSubscriber = null;
}
if (attributes !== undefined) {
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if (typeof attribute === "string") {
executionContext[this.name] = attribute;
observer.call();
} else if (attribute) {
boundProperties.push({ observer: observer, binding: attribute.createBinding(executionContext) });
} else if (this.defaultValue) {
executionContext[this.name] = this.defaultValue;
observer.call();
if (behaviorHandlesBind) {
observer.selfSubscriber = null;
}

if (typeof attribute === "string") {
executionContext[this.name] = attribute;
observer.call();
} else if (attribute) {
boundProperties.push({ observer: observer, binding: attribute.createBinding(executionContext) });
} else if (this.defaultValue) {
executionContext[this.name] = this.defaultValue;
observer.call();
}

observer.selfSubscriber = selfSubscriber;
}

observer.publishing = true;
observer.selfSubscriber = selfSubscriber;
},
writable: true,
enumerable: true,
Expand Down
1 change: 1 addition & 0 deletions dist/amd/resource-coordinator.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ define(["exports", "aurelia-loader", "aurelia-path", "aurelia-dependency-injecti
cache[analysis.id] = analysis;

return Promise.all(loads).then(function () {
analysis.element.type.configure(container, analysis.element.value);
return analysis.element;
});
});
Expand Down
21 changes: 17 additions & 4 deletions dist/commonjs/custom-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,28 @@ var CustomElement = (function (ResourceType) {
configurable: true
}
}, {
load: {
value: function load(container, target, viewStrategy) {
var _this = this;
var annotation, options;
configure: {
value: function configure(container, target) {
if (this.configured) {
return;
}

configureBehavior(container, this, target, valuePropertyName);

this.configured = true;
this.targetShadowDOM = Metadata.on(target).has(UseShadowDOM);
this.usesShadowDOM = this.targetShadowDOM && hasShadowDOM;
},
writable: true,
enumerable: true,
configurable: true
},
load: {
value: function load(container, target, viewStrategy) {
var _this = this;
var options;

this.configure(container, target);

viewStrategy = viewStrategy || ViewStrategy.getDefault(target);
options = { targetShadowDOM: this.targetShadowDOM };
Expand Down
32 changes: 18 additions & 14 deletions dist/commonjs/property.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,25 +115,29 @@ var BehaviorProperty = (function () {
var selfSubscriber, observer, attribute;

observer = observerLookup[this.name];
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if (behaviorHandlesBind) {
observer.selfSubscriber = null;
}
if (attributes !== undefined) {
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if (typeof attribute === "string") {
executionContext[this.name] = attribute;
observer.call();
} else if (attribute) {
boundProperties.push({ observer: observer, binding: attribute.createBinding(executionContext) });
} else if (this.defaultValue) {
executionContext[this.name] = this.defaultValue;
observer.call();
if (behaviorHandlesBind) {
observer.selfSubscriber = null;
}

if (typeof attribute === "string") {
executionContext[this.name] = attribute;
observer.call();
} else if (attribute) {
boundProperties.push({ observer: observer, binding: attribute.createBinding(executionContext) });
} else if (this.defaultValue) {
executionContext[this.name] = this.defaultValue;
observer.call();
}

observer.selfSubscriber = selfSubscriber;
}

observer.publishing = true;
observer.selfSubscriber = selfSubscriber;
},
writable: true,
enumerable: true,
Expand Down
1 change: 1 addition & 0 deletions dist/commonjs/resource-coordinator.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ var ResourceCoordinator = (function () {
cache[analysis.id] = analysis;

return Promise.all(loads).then(function () {
analysis.element.type.configure(container, analysis.element.value);
return analysis.element;
});
});
Expand Down
15 changes: 12 additions & 3 deletions dist/es6/custom-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,22 @@ export class CustomElement extends ResourceType {
}
}

load(container, target, viewStrategy){
var annotation, options;
configure(container, target){
if(this.configured){
return;
}

configureBehavior(container, this, target, valuePropertyName);


this.configured = true;
this.targetShadowDOM = Metadata.on(target).has(UseShadowDOM);
this.usesShadowDOM = this.targetShadowDOM && hasShadowDOM;
}

load(container, target, viewStrategy){
var options;

this.configure(container, target);

viewStrategy = viewStrategy || ViewStrategy.getDefault(target);
options = { targetShadowDOM:this.targetShadowDOM };
Expand Down
32 changes: 18 additions & 14 deletions dist/es6/property.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,29 @@ export class BehaviorProperty {
var selfSubscriber, observer, attribute;

observer = observerLookup[this.name];
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if(behaviorHandlesBind){
observer.selfSubscriber = null;
}
if(attributes !== undefined){
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if(typeof attribute === 'string'){
executionContext[this.name] = attribute;
observer.call();
}else if(attribute){
boundProperties.push({observer:observer, binding:attribute.createBinding(executionContext)});
}else if(this.defaultValue){
executionContext[this.name] = this.defaultValue;
observer.call();
if(behaviorHandlesBind){
observer.selfSubscriber = null;
}

if(typeof attribute === 'string'){
executionContext[this.name] = attribute;
observer.call();
}else if(attribute){
boundProperties.push({observer:observer, binding:attribute.createBinding(executionContext)});
}else if(this.defaultValue){
executionContext[this.name] = this.defaultValue;
observer.call();
}

observer.selfSubscriber = selfSubscriber;
}

observer.publishing = true;
observer.selfSubscriber = selfSubscriber;
}
}

Expand Down
5 changes: 4 additions & 1 deletion dist/es6/resource-coordinator.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ export class ResourceCoordinator {

cache[analysis.id] = analysis;

return Promise.all(loads).then(() => analysis.element);
return Promise.all(loads).then(() => {
analysis.element.type.configure(container, analysis.element.value);
return analysis.element;
});
});
}

Expand Down
21 changes: 17 additions & 4 deletions dist/system/custom-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,28 @@ System.register(["aurelia-metadata", "./behavior-instance", "./behaviors", "./co
configurable: true
}
}, {
load: {
value: function load(container, target, viewStrategy) {
var _this = this;
var annotation, options;
configure: {
value: function configure(container, target) {
if (this.configured) {
return;
}

configureBehavior(container, this, target, valuePropertyName);

this.configured = true;
this.targetShadowDOM = Metadata.on(target).has(UseShadowDOM);
this.usesShadowDOM = this.targetShadowDOM && hasShadowDOM;
},
writable: true,
enumerable: true,
configurable: true
},
load: {
value: function load(container, target, viewStrategy) {
var _this = this;
var options;

this.configure(container, target);

viewStrategy = viewStrategy || ViewStrategy.getDefault(target);
options = { targetShadowDOM: this.targetShadowDOM };
Expand Down
32 changes: 18 additions & 14 deletions dist/system/property.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,25 +122,29 @@ System.register(["./util", "aurelia-binding"], function (_export) {
var selfSubscriber, observer, attribute;

observer = observerLookup[this.name];
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if (behaviorHandlesBind) {
observer.selfSubscriber = null;
}
if (attributes !== undefined) {
selfSubscriber = observer.selfSubscriber;
attribute = attributes[this.attribute];

if (typeof attribute === "string") {
executionContext[this.name] = attribute;
observer.call();
} else if (attribute) {
boundProperties.push({ observer: observer, binding: attribute.createBinding(executionContext) });
} else if (this.defaultValue) {
executionContext[this.name] = this.defaultValue;
observer.call();
if (behaviorHandlesBind) {
observer.selfSubscriber = null;
}

if (typeof attribute === "string") {
executionContext[this.name] = attribute;
observer.call();
} else if (attribute) {
boundProperties.push({ observer: observer, binding: attribute.createBinding(executionContext) });
} else if (this.defaultValue) {
executionContext[this.name] = this.defaultValue;
observer.call();
}

observer.selfSubscriber = selfSubscriber;
}

observer.publishing = true;
observer.selfSubscriber = selfSubscriber;
},
writable: true,
enumerable: true,
Expand Down
1 change: 1 addition & 0 deletions dist/system/resource-coordinator.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ System.register(["aurelia-loader", "aurelia-path", "aurelia-dependency-injection
cache[analysis.id] = analysis;

return Promise.all(loads).then(function () {
analysis.element.type.configure(container, analysis.element.value);
return analysis.element;
});
});
Expand Down
8 changes: 8 additions & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### 0.8.2 (2015-01-23)


#### Bug Fixes

* **property:** prevent errors with property meta on composed view models ([0c9ef978](http://github.com/aurelia/templating/commit/0c9ef97870d4174346c55bcf04b7726a286749b6))


### 0.8.1 (2015-01-23)


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": "0.8.1",
"version": "0.8.2",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down

0 comments on commit 4be0b7d

Please sign in to comment.