Skip to content

Commit

Permalink
chore(all): prepare release 1.0.0-beta.1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Dec 16, 2015
1 parent 2e24867 commit 848375d
Show file tree
Hide file tree
Showing 15 changed files with 1,322 additions and 1,148 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.0.0-beta.1.0.1",
"version": "1.0.0-beta.1.0.2",
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
"keywords": [
"aurelia",
Expand Down
33 changes: 18 additions & 15 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ System.config({
},

map: {
"aurelia-binding": "npm:[email protected]",
"aurelia-binding": "npm:[email protected].0.3",
"aurelia-dependency-injection": "npm:[email protected]",
"aurelia-loader": "npm:[email protected]",
"aurelia-logging": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]",
"aurelia-pal-browser": "npm:[email protected]",
"aurelia-pal": "npm:[email protected].0.1",
"aurelia-pal-browser": "npm:[email protected].0.1",
"aurelia-path": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]",
"babel": "npm:babel-core@5.2.2",
"babel-runtime": "npm:babel-runtime@5.2.2",
"aurelia-task-queue": "npm:[email protected].0.1",
"babel": "npm:babel-core@5.8.34",
"babel-runtime": "npm:babel-runtime@5.8.34",
"core-js": "npm:[email protected]",
"github:jspm/[email protected]": {
"assert": "npm:[email protected]"
Expand All @@ -41,31 +41,34 @@ System.config({
"npm:[email protected]": {
"util": "npm:[email protected]"
},
"npm:[email protected]": {
"npm:[email protected].0.3": {
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]",
"aurelia-task-queue": "npm:[email protected]",
"aurelia-pal": "npm:[email protected].0.1",
"aurelia-task-queue": "npm:[email protected].0.1",
"core-js": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-logging": "npm:[email protected]",
"aurelia-metadata": "npm:[email protected]",
"aurelia-pal": "npm:[email protected]",
"aurelia-pal": "npm:[email protected].0.1",
"core-js": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-metadata": "npm:[email protected]",
"aurelia-path": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]",
"aurelia-pal": "npm:[email protected].0.1",
"core-js": "npm:[email protected]"
},
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]"
"npm:[email protected].0.1": {
"aurelia-pal": "npm:[email protected].0.1"
},
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]"
"npm:[email protected]": {
"aurelia-pal": "npm:[email protected]"
},
"npm:[email protected]": {
"process": "github:jspm/[email protected]"
},
"npm:[email protected]": {
"fs": "github:jspm/[email protected]",
Expand Down
19 changes: 17 additions & 2 deletions dist/amd/aurelia-templating.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,24 @@ declare module 'aurelia-templating' {
childContainer?: Container;

/**
* The view model for the component.
* The context in which the view model is executed in.
*/
viewModel?: string | Object;
bindingContext: any;

/**
* A secondary binding context that can override the standard context.
*/
overrideContext?: any;

/**
* The view model url or instance for the component.
*/
viewModel?: any;

/**
* Data to be passed to the "activate" hook on the view model.
*/
model?: any;

/**
* The HtmlBehaviorResource for the component.
Expand Down
6 changes: 5 additions & 1 deletion dist/amd/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
instruction.behaviorInstructions = [liftingInstruction];
instruction.viewFactory = liftingInstruction.viewFactory;
instruction.providers = [liftingInstruction.type.target];
instruction.lifting = true;
return instruction;
};

Expand Down Expand Up @@ -290,6 +291,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa

this.anchorIsContainer = false;
this.elementInstruction = null;
this.lifting = false;

this.values = null;
}
Expand Down Expand Up @@ -999,7 +1001,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
while (currentChild) {
nextSibling = currentChild.nextSibling;

if (currentChild.viewSlot) {
if (currentChild.isContentProjectionSource) {
var viewSlotSelectors = contentSelectors.map(function (x) {
return x.copyForViewSlot();
});
Expand Down Expand Up @@ -1120,6 +1122,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
this.isAttached = false;
this.contentSelectors = null;
anchor.viewSlot = this;
anchor.isContentProjectionSource = false;
}

ViewSlot.prototype.transformChildNodesIntoView = function transformChildNodesIntoView() {
Expand Down Expand Up @@ -1486,6 +1489,7 @@ define(['exports', 'core-js', 'aurelia-logging', 'aurelia-metadata', 'aurelia-pa
if (key === ViewSlot) {
if (this.viewSlot === undefined) {
this.viewSlot = new ViewSlot(this.element, this.instruction.anchorIsContainer);
this.element.isContentProjectionSource = this.instruction.lifting;
this.children.push(this.viewSlot);
}

Expand Down
19 changes: 17 additions & 2 deletions dist/aurelia-templating.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,24 @@ declare module 'aurelia-templating' {
childContainer?: Container;

/**
* The view model for the component.
* The context in which the view model is executed in.
*/
viewModel?: string | Object;
bindingContext: any;

/**
* A secondary binding context that can override the standard context.
*/
overrideContext?: any;

/**
* The view model url or instance for the component.
*/
viewModel?: any;

/**
* Data to be passed to the "activate" hook on the view model.
*/
model?: any;

/**
* The HtmlBehaviorResource for the component.
Expand Down
22 changes: 19 additions & 3 deletions dist/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ export class TargetInstruction {
instruction.behaviorInstructions = [liftingInstruction];
instruction.viewFactory = liftingInstruction.viewFactory;
instruction.providers = [liftingInstruction.type.target];
instruction.lifting = true;
return instruction;
}

Expand Down Expand Up @@ -398,6 +399,7 @@ export class TargetInstruction {

this.anchorIsContainer = false;
this.elementInstruction = null;
this.lifting = false;

this.values = null;
}
Expand Down Expand Up @@ -1348,7 +1350,7 @@ export class _ContentSelector {
while (currentChild) {
nextSibling = currentChild.nextSibling;

if (currentChild.viewSlot) {
if (currentChild.isContentProjectionSource) {
let viewSlotSelectors = contentSelectors.map(x => x.copyForViewSlot());
currentChild.viewSlot._installContentSelectors(viewSlotSelectors);
} else {
Expand Down Expand Up @@ -1469,6 +1471,7 @@ export class ViewSlot {
this.isAttached = false;
this.contentSelectors = null;
anchor.viewSlot = this;
anchor.isContentProjectionSource = false;
}

/**
Expand Down Expand Up @@ -1871,6 +1874,7 @@ function elementContainerGet(key) {
if (key === ViewSlot) {
if (this.viewSlot === undefined) {
this.viewSlot = new ViewSlot(this.element, this.instruction.anchorIsContainer);
this.element.isContentProjectionSource = this.instruction.lifting;
this.children.push(this.viewSlot);
}

Expand Down Expand Up @@ -4350,9 +4354,21 @@ interface CompositionContext {
*/
childContainer?: Container;
/**
* The view model for the component.
* The context in which the view model is executed in.
*/
viewModel?: string | Object;
bindingContext: any;
/**
* A secondary binding context that can override the standard context.
*/
overrideContext?: any;
/**
* The view model url or instance for the component.
*/
viewModel?: any;
/**
* Data to be passed to the "activate" hook on the view model.
*/
model?: any;
/**
* The HtmlBehaviorResource for the component.
*/
Expand Down
19 changes: 17 additions & 2 deletions dist/commonjs/aurelia-templating.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,24 @@ declare module 'aurelia-templating' {
childContainer?: Container;

/**
* The view model for the component.
* The context in which the view model is executed in.
*/
viewModel?: string | Object;
bindingContext: any;

/**
* A secondary binding context that can override the standard context.
*/
overrideContext?: any;

/**
* The view model url or instance for the component.
*/
viewModel?: any;

/**
* Data to be passed to the "activate" hook on the view model.
*/
model?: any;

/**
* The HtmlBehaviorResource for the component.
Expand Down
6 changes: 5 additions & 1 deletion dist/commonjs/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ var TargetInstruction = (function () {
instruction.behaviorInstructions = [liftingInstruction];
instruction.viewFactory = liftingInstruction.viewFactory;
instruction.providers = [liftingInstruction.type.target];
instruction.lifting = true;
return instruction;
};

Expand Down Expand Up @@ -311,6 +312,7 @@ var TargetInstruction = (function () {

this.anchorIsContainer = false;
this.elementInstruction = null;
this.lifting = false;

this.values = null;
}
Expand Down Expand Up @@ -1020,7 +1022,7 @@ var _ContentSelector = (function () {
while (currentChild) {
nextSibling = currentChild.nextSibling;

if (currentChild.viewSlot) {
if (currentChild.isContentProjectionSource) {
var viewSlotSelectors = contentSelectors.map(function (x) {
return x.copyForViewSlot();
});
Expand Down Expand Up @@ -1141,6 +1143,7 @@ var ViewSlot = (function () {
this.isAttached = false;
this.contentSelectors = null;
anchor.viewSlot = this;
anchor.isContentProjectionSource = false;
}

ViewSlot.prototype.transformChildNodesIntoView = function transformChildNodesIntoView() {
Expand Down Expand Up @@ -1507,6 +1510,7 @@ function elementContainerGet(key) {
if (key === ViewSlot) {
if (this.viewSlot === undefined) {
this.viewSlot = new ViewSlot(this.element, this.instruction.anchorIsContainer);
this.element.isContentProjectionSource = this.instruction.lifting;
this.children.push(this.viewSlot);
}

Expand Down
19 changes: 17 additions & 2 deletions dist/es6/aurelia-templating.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,24 @@ declare module 'aurelia-templating' {
childContainer?: Container;

/**
* The view model for the component.
* The context in which the view model is executed in.
*/
viewModel?: string | Object;
bindingContext: any;

/**
* A secondary binding context that can override the standard context.
*/
overrideContext?: any;

/**
* The view model url or instance for the component.
*/
viewModel?: any;

/**
* Data to be passed to the "activate" hook on the view model.
*/
model?: any;

/**
* The HtmlBehaviorResource for the component.
Expand Down
22 changes: 19 additions & 3 deletions dist/es6/aurelia-templating.js
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ export class TargetInstruction {
instruction.behaviorInstructions = [liftingInstruction];
instruction.viewFactory = liftingInstruction.viewFactory;
instruction.providers = [liftingInstruction.type.target];
instruction.lifting = true;
return instruction;
}

Expand Down Expand Up @@ -398,6 +399,7 @@ export class TargetInstruction {

this.anchorIsContainer = false;
this.elementInstruction = null;
this.lifting = false;

this.values = null;
}
Expand Down Expand Up @@ -1348,7 +1350,7 @@ export class _ContentSelector {
while (currentChild) {
nextSibling = currentChild.nextSibling;

if (currentChild.viewSlot) {
if (currentChild.isContentProjectionSource) {
let viewSlotSelectors = contentSelectors.map(x => x.copyForViewSlot());
currentChild.viewSlot._installContentSelectors(viewSlotSelectors);
} else {
Expand Down Expand Up @@ -1469,6 +1471,7 @@ export class ViewSlot {
this.isAttached = false;
this.contentSelectors = null;
anchor.viewSlot = this;
anchor.isContentProjectionSource = false;
}

/**
Expand Down Expand Up @@ -1871,6 +1874,7 @@ function elementContainerGet(key) {
if (key === ViewSlot) {
if (this.viewSlot === undefined) {
this.viewSlot = new ViewSlot(this.element, this.instruction.anchorIsContainer);
this.element.isContentProjectionSource = this.instruction.lifting;
this.children.push(this.viewSlot);
}

Expand Down Expand Up @@ -4350,9 +4354,21 @@ interface CompositionContext {
*/
childContainer?: Container;
/**
* The view model for the component.
* The context in which the view model is executed in.
*/
viewModel?: string | Object;
bindingContext: any;
/**
* A secondary binding context that can override the standard context.
*/
overrideContext?: any;
/**
* The view model url or instance for the component.
*/
viewModel?: any;
/**
* Data to be passed to the "activate" hook on the view model.
*/
model?: any;
/**
* The HtmlBehaviorResource for the component.
*/
Expand Down
Loading

0 comments on commit 848375d

Please sign in to comment.