From 6985ddbb7f520a36ce2cb2f45d169b8352545624 Mon Sep 17 00:00:00 2001 From: Nick Wientge Date: Sat, 17 Jan 2015 17:12:56 -0800 Subject: [PATCH] fix title align issues on android --- components/ionHeaderBar/ionHeaderBar.js | 10 ++++++++-- components/ionNavBar/ionNavBar.js | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/components/ionHeaderBar/ionHeaderBar.js b/components/ionHeaderBar/ionHeaderBar.js index 5a6b1b7..f16e3cd 100644 --- a/components/ionHeaderBar/ionHeaderBar.js +++ b/components/ionHeaderBar/ionHeaderBar.js @@ -3,7 +3,7 @@ IonHeaderBar = { var align = this.alignTitle || 'center'; var $title = this.$('.title'); - if (align === 'center' && Platform.isAndroid()) { + if (Platform.isAndroid() && !this.alignTitle) { $title.addClass('title-left'); return; } @@ -33,7 +33,13 @@ IonHeaderBar = { rightButtonWidth = $rightButton.outerWidth(); } - var margin = Math.max(leftButtonWidth, rightButtonWidth); + // If we're on Android, we only care about the left button + var margin; + if (Platform.isAndroid()) { + margin = leftButtonWidth; + } else { + margin = Math.max(leftButtonWidth, rightButtonWidth); + } $title.css('left', margin); $title.css('right', margin); } diff --git a/components/ionNavBar/ionNavBar.js b/components/ionNavBar/ionNavBar.js index c0d6563..55825b7 100644 --- a/components/ionNavBar/ionNavBar.js +++ b/components/ionNavBar/ionNavBar.js @@ -30,6 +30,9 @@ Template.ionNavBar.rendered = function () { if (!$node.hasClass('title') && !$node.hasClass('button') || IonNavigation.skipTransitions) { $node.insertBefore(next); + // Changing tabs skips transition animations, but we still want to update the position of the title + IonHeaderBar.alignTitle.call(template); + IonHeaderBar.positionTitle.call(template); return; }