Skip to content

Commit

Permalink
Merge pull request #14520 from tildeio/bump-glimmer
Browse files Browse the repository at this point in the history
[BUGFIX beta] Bump Glimmer
  • Loading branch information
chancancode authored Oct 26, 2016
2 parents 9d35d9c + 8c87e50 commit 267fb27
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"git-repo-info": "^1.1.4",
"git-repo-version": "^0.3.1",
"github": "^0.2.3",
"glimmer-engine": "^0.17.5",
"glimmer-engine": "^0.17.6",
"glob": "^5.0.13",
"html-differ": "^1.3.4",
"mocha": "^2.4.5",
Expand Down
3 changes: 1 addition & 2 deletions packages/ember-glimmer/lib/syntax/outlet.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ class OutletComponentReference {
value() {
let { outletNameRef, parentOutletStateRef, definition, lastState } = this;


let outletName = outletNameRef.value();
let outletStateRef = parentOutletStateRef.get('outlets').get(outletName);
let newState = this.lastState = outletStateRef.value();
Expand All @@ -130,7 +129,7 @@ class OutletComponentReference {
} else if (hasTemplate) {
return this.definition = new OutletComponentDefinition(outletName, newState.render.template);
} else {
return null;
return this.definition = null;
}
}
}
Expand Down

0 comments on commit 267fb27

Please sign in to comment.