Skip to content

Commit 0f6ad8c

Browse files
EisenbergEffectEisenbergEffect
committed
chore(all): prepare release 1.0.0-beta.1.0.1
1 parent d73a198 commit 0f6ad8c

File tree

8 files changed

+116
-57
lines changed

8 files changed

+116
-57
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-templating",
3-
"version": "1.0.0-beta.1",
3+
"version": "1.0.0-beta.1.0.1",
44
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
55
"keywords": [
66
"aurelia",

‎dist/amd/aurelia-templating.js

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
19951995
}
19961996
}
19971997

1998-
instruction = bindingLanguage.createAttributeInstruction(resources, node, info);
1998+
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, undefined, type);
19991999

20002000
if (instruction) {
20012001
if (instruction.alteredAttr) {
@@ -2128,7 +2128,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
21282128
if (elementProperty) {
21292129
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, elementInstruction);
21302130
} else {
2131-
instruction = bindingLanguage.createAttributeInstruction(resources, node, info);
2131+
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, undefined, type);
21322132
}
21332133

21342134
if (instruction) {
@@ -2875,6 +2875,10 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
28752875
var lookup = instance.__observers__;
28762876

28772877
if (lookup === undefined) {
2878+
if (!behavior.isInitialized) {
2879+
behavior.initialize(_aureliaDependencyInjection.Container.instance || new _aureliaDependencyInjection.Container(), instance.constructor);
2880+
}
2881+
28782882
lookup = behavior.observerLocator.getOrCreateObserversLookup(instance);
28792883
behavior._ensurePropertiesDefined(instance, lookup);
28802884
}
@@ -3113,6 +3117,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
31133117
this.containerless = false;
31143118
this.properties = [];
31153119
this.attributes = {};
3120+
this.isInitialized = false;
31163121
}
31173122

31183123
HtmlBehaviorResource.convention = function convention(name, existing) {
@@ -3148,6 +3153,11 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
31483153
var ii = undefined;
31493154
var current = undefined;
31503155

3156+
if (this.isInitialized) {
3157+
return;
3158+
}
3159+
3160+
this.isInitialized = true;
31513161
target.__providerId__ = nextProviderId();
31523162

31533163
this.observerLocator = container.get(_aureliaBinding.ObserverLocator);
@@ -3441,7 +3451,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
34413451

34423452
function createChildObserverDecorator(selectorOrConfig, all) {
34433453
return function (target, key, descriptor) {
3444-
var actualTarget = descriptor ? target.constructor : target;
3454+
var actualTarget = typeof key === 'string' ? target.constructor : target;
34453455
var r = _aureliaMetadata.metadata.getOrCreateOwn(_aureliaMetadata.metadata.resource, HtmlBehaviorResource, actualTarget);
34463456

34473457
if (typeof selectorOrConfig === 'string') {
@@ -3712,23 +3722,23 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
37123722
var childContainer = undefined;
37133723
var viewModel = undefined;
37143724
var viewModelResource = undefined;
3715-
var metadata = undefined;
3725+
var m = undefined;
37163726

37173727
return this.ensureViewModel(context).then(tryActivateViewModel).then(function () {
37183728
childContainer = context.childContainer;
37193729
viewModel = context.viewModel;
37203730
viewModelResource = context.viewModelResource;
3721-
metadata = viewModelResource.metadata;
3731+
m = viewModelResource.metadata;
37223732

37233733
var viewStrategy = _this9.viewLocator.getViewStrategy(context.view || viewModel);
37243734

37253735
if (context.viewResources) {
37263736
viewStrategy.makeRelativeTo(context.viewResources.viewUrl);
37273737
}
37283738

3729-
return metadata.load(childContainer, viewModelResource.value, null, viewStrategy, true);
3739+
return m.load(childContainer, viewModelResource.value, null, viewStrategy, true);
37303740
}).then(function (viewFactory) {
3731-
return metadata.create(childContainer, BehaviorInstruction.dynamic(context.host, viewModel, viewFactory));
3741+
return m.create(childContainer, BehaviorInstruction.dynamic(context.host, viewModel, viewFactory));
37323742
});
37333743
};
37343744

@@ -3751,10 +3761,10 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
37513761
});
37523762
}
37533763

3754-
var metadata = new HtmlBehaviorResource();
3755-
metadata.elementName = 'dynamic-element';
3756-
metadata.initialize(context.container || childContainer, context.viewModel.constructor);
3757-
context.viewModelResource = { metadata: metadata, value: context.viewModel.constructor };
3764+
var m = _aureliaMetadata.metadata.getOrCreateOwn(_aureliaMetadata.metadata.resource, HtmlBehaviorResource, context.viewModel.constructor);
3765+
m.elementName = m.elementName || 'dynamic-element';
3766+
m.initialize(context.container || childContainer, context.viewModel.constructor);
3767+
context.viewModelResource = { metadata: m, value: context.viewModel.constructor };
37583768
childContainer.viewModel = context.viewModel;
37593769
return Promise.resolve(context);
37603770
};

‎dist/aurelia-templating.js

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,7 +2453,7 @@ export class ViewCompiler {
24532453
}
24542454
}
24552455

2456-
instruction = bindingLanguage.createAttributeInstruction(resources, node, info);
2456+
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, undefined, type);
24572457

24582458
if (instruction) { //HAS BINDINGS
24592459
if (instruction.alteredAttr) {
@@ -2586,7 +2586,7 @@ export class ViewCompiler {
25862586
if (elementProperty) {
25872587
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, elementInstruction);
25882588
} else {
2589-
instruction = bindingLanguage.createAttributeInstruction(resources, node, info);
2589+
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, undefined, type);
25902590
}
25912591

25922592
if (instruction) { //HAS BINDINGS
@@ -3469,6 +3469,10 @@ function getObserver(behavior, instance, name) {
34693469
let lookup = instance.__observers__;
34703470

34713471
if (lookup === undefined) {
3472+
if (!behavior.isInitialized) {
3473+
behavior.initialize(Container.instance || new Container(), instance.constructor);
3474+
}
3475+
34723476
lookup = behavior.observerLocator.getOrCreateObserversLookup(instance);
34733477
behavior._ensurePropertiesDefined(instance, lookup);
34743478
}
@@ -3726,6 +3730,7 @@ export class HtmlBehaviorResource {
37263730
this.containerless = false;
37273731
this.properties = [];
37283732
this.attributes = {};
3733+
this.isInitialized = false;
37293734
}
37303735

37313736
/**
@@ -3776,6 +3781,11 @@ export class HtmlBehaviorResource {
37763781
let ii;
37773782
let current;
37783783

3784+
if (this.isInitialized) {
3785+
return;
3786+
}
3787+
3788+
this.isInitialized = true;
37793789
target.__providerId__ = nextProviderId();
37803790

37813791
this.observerLocator = container.get(ObserverLocator);
@@ -4104,7 +4114,7 @@ export class HtmlBehaviorResource {
41044114

41054115
function createChildObserverDecorator(selectorOrConfig, all) {
41064116
return function(target, key, descriptor) {
4107-
let actualTarget = descriptor ? target.constructor : target; //is it on a property or a class?
4117+
let actualTarget = typeof key === 'string' ? target.constructor : target; //is it on a property or a class?
41084118
let r = metadata.getOrCreateOwn(metadata.resource, HtmlBehaviorResource, actualTarget);
41094119

41104120
if (typeof selectorOrConfig === 'string') {
@@ -4418,22 +4428,22 @@ export class CompositionEngine {
44184428
let childContainer;
44194429
let viewModel;
44204430
let viewModelResource;
4421-
let metadata;
4431+
let m;
44224432

44234433
return this.ensureViewModel(context).then(tryActivateViewModel).then(() => {
44244434
childContainer = context.childContainer;
44254435
viewModel = context.viewModel;
44264436
viewModelResource = context.viewModelResource;
4427-
metadata = viewModelResource.metadata;
4437+
m = viewModelResource.metadata;
44284438

44294439
let viewStrategy = this.viewLocator.getViewStrategy(context.view || viewModel);
44304440

44314441
if (context.viewResources) {
44324442
viewStrategy.makeRelativeTo(context.viewResources.viewUrl);
44334443
}
44344444

4435-
return metadata.load(childContainer, viewModelResource.value, null, viewStrategy, true);
4436-
}).then(viewFactory => metadata.create(childContainer, BehaviorInstruction.dynamic(context.host, viewModel, viewFactory)));
4445+
return m.load(childContainer, viewModelResource.value, null, viewStrategy, true);
4446+
}).then(viewFactory => m.create(childContainer, BehaviorInstruction.dynamic(context.host, viewModel, viewFactory)));
44374447
}
44384448

44394449
/**
@@ -4462,10 +4472,10 @@ export class CompositionEngine {
44624472
});
44634473
}
44644474

4465-
let metadata = new HtmlBehaviorResource();
4466-
metadata.elementName = 'dynamic-element';
4467-
metadata.initialize(context.container || childContainer, context.viewModel.constructor);
4468-
context.viewModelResource = { metadata: metadata, value: context.viewModel.constructor };
4475+
let m = metadata.getOrCreateOwn(metadata.resource, HtmlBehaviorResource, context.viewModel.constructor);
4476+
m.elementName = m.elementName || 'dynamic-element';
4477+
m.initialize(context.container || childContainer, context.viewModel.constructor);
4478+
context.viewModelResource = { metadata: m, value: context.viewModel.constructor };
44694479
childContainer.viewModel = context.viewModel;
44704480
return Promise.resolve(context);
44714481
}

‎dist/commonjs/aurelia-templating.js

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2016,7 +2016,7 @@ var ViewCompiler = (function () {
20162016
}
20172017
}
20182018

2019-
instruction = bindingLanguage.createAttributeInstruction(resources, node, info);
2019+
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, undefined, type);
20202020

20212021
if (instruction) {
20222022
if (instruction.alteredAttr) {
@@ -2149,7 +2149,7 @@ var ViewCompiler = (function () {
21492149
if (elementProperty) {
21502150
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, elementInstruction);
21512151
} else {
2152-
instruction = bindingLanguage.createAttributeInstruction(resources, node, info);
2152+
instruction = bindingLanguage.createAttributeInstruction(resources, node, info, undefined, type);
21532153
}
21542154

21552155
if (instruction) {
@@ -2896,6 +2896,10 @@ function getObserver(behavior, instance, name) {
28962896
var lookup = instance.__observers__;
28972897

28982898
if (lookup === undefined) {
2899+
if (!behavior.isInitialized) {
2900+
behavior.initialize(_aureliaDependencyInjection.Container.instance || new _aureliaDependencyInjection.Container(), instance.constructor);
2901+
}
2902+
28992903
lookup = behavior.observerLocator.getOrCreateObserversLookup(instance);
29002904
behavior._ensurePropertiesDefined(instance, lookup);
29012905
}
@@ -3134,6 +3138,7 @@ var HtmlBehaviorResource = (function () {
31343138
this.containerless = false;
31353139
this.properties = [];
31363140
this.attributes = {};
3141+
this.isInitialized = false;
31373142
}
31383143

31393144
HtmlBehaviorResource.convention = function convention(name, existing) {
@@ -3169,6 +3174,11 @@ var HtmlBehaviorResource = (function () {
31693174
var ii = undefined;
31703175
var current = undefined;
31713176

3177+
if (this.isInitialized) {
3178+
return;
3179+
}
3180+
3181+
this.isInitialized = true;
31723182
target.__providerId__ = nextProviderId();
31733183

31743184
this.observerLocator = container.get(_aureliaBinding.ObserverLocator);
@@ -3462,7 +3472,7 @@ exports.HtmlBehaviorResource = HtmlBehaviorResource;
34623472

34633473
function createChildObserverDecorator(selectorOrConfig, all) {
34643474
return function (target, key, descriptor) {
3465-
var actualTarget = descriptor ? target.constructor : target;
3475+
var actualTarget = typeof key === 'string' ? target.constructor : target;
34663476
var r = _aureliaMetadata.metadata.getOrCreateOwn(_aureliaMetadata.metadata.resource, HtmlBehaviorResource, actualTarget);
34673477

34683478
if (typeof selectorOrConfig === 'string') {
@@ -3733,23 +3743,23 @@ var CompositionEngine = (function () {
37333743
var childContainer = undefined;
37343744
var viewModel = undefined;
37353745
var viewModelResource = undefined;
3736-
var metadata = undefined;
3746+
var m = undefined;
37373747

37383748
return this.ensureViewModel(context).then(tryActivateViewModel).then(function () {
37393749
childContainer = context.childContainer;
37403750
viewModel = context.viewModel;
37413751
viewModelResource = context.viewModelResource;
3742-
metadata = viewModelResource.metadata;
3752+
m = viewModelResource.metadata;
37433753

37443754
var viewStrategy = _this9.viewLocator.getViewStrategy(context.view || viewModel);
37453755

37463756
if (context.viewResources) {
37473757
viewStrategy.makeRelativeTo(context.viewResources.viewUrl);
37483758
}
37493759

3750-
return metadata.load(childContainer, viewModelResource.value, null, viewStrategy, true);
3760+
return m.load(childContainer, viewModelResource.value, null, viewStrategy, true);
37513761
}).then(function (viewFactory) {
3752-
return metadata.create(childContainer, BehaviorInstruction.dynamic(context.host, viewModel, viewFactory));
3762+
return m.create(childContainer, BehaviorInstruction.dynamic(context.host, viewModel, viewFactory));
37533763
});
37543764
};
37553765

@@ -3772,10 +3782,10 @@ var CompositionEngine = (function () {
37723782
});
37733783
}
37743784

3775-
var metadata = new HtmlBehaviorResource();
3776-
metadata.elementName = 'dynamic-element';
3777-
metadata.initialize(context.container || childContainer, context.viewModel.constructor);
3778-
context.viewModelResource = { metadata: metadata, value: context.viewModel.constructor };
3785+
var m = _aureliaMetadata.metadata.getOrCreateOwn(_aureliaMetadata.metadata.resource, HtmlBehaviorResource, context.viewModel.constructor);
3786+
m.elementName = m.elementName || 'dynamic-element';
3787+
m.initialize(context.container || childContainer, context.viewModel.constructor);
3788+
context.viewModelResource = { metadata: m, value: context.viewModel.constructor };
37793789
childContainer.viewModel = context.viewModel;
37803790
return Promise.resolve(context);
37813791
};

0 commit comments

Comments
 (0)