Skip to content

Commit

Permalink
feat(aurelia): enable splash screen swaps on load
Browse files Browse the repository at this point in the history
  • Loading branch information
EisenbergEffect committed Jan 21, 2015
1 parent 790c9da commit c2135d4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/aurelia.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ export class Aurelia {

compositionEngine = this.container.get(CompositionEngine);
instruction.viewModel = root;
instruction.viewSlot = new ViewSlot(this.host, true);
instruction.container = instruction.childContainer = this.container;
instruction.viewSlot = new ViewSlot(this.host, true);
instruction.viewSlot.transformChildNodesIntoView();

return compositionEngine.compose(instruction).then(root => {
this.root = root;
Expand Down
4 changes: 2 additions & 2 deletions src/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ export class Plugins {
return;
}

var next = function(){
var next = () => {
if(current = info.shift()){
return loadPlugin(aurelia, loader, current).then(next);
}

this.processed = true;
return Promise.resolve();
}
};

return next();
}
Expand Down

0 comments on commit c2135d4

Please sign in to comment.