Merge branch 'alpha50' into css-refactor

This commit is contained in:
Adam Bradley
2015-12-09 07:47:30 -06:00
27 changed files with 71 additions and 49 deletions

View File

@@ -114,8 +114,8 @@ export class Navbar extends ToolbarBase {
/**
* @private
*/
onInit() {
super.onInit();
ngOnInit() {
super.ngOnInit();
let hideBackButton = this.hideBackButton;
if (typeof hideBackButton === 'string') {
this.hideBackButton = (hideBackButton === '' || hideBackButton === 'true');