Skip to content

Commit 4808e80

Browse files
author
Adam Bradley
committed
fix(navBar): Remove duplicate back button arrows, closes #547
1 parent 2eab747 commit 4808e80

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

js/ext/angular/src/directive/ionicViewState.js

+13-11
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ angular.module('ionic.ui.viewState', ['ionic.service.view', 'ionic.service.gestu
6969
},
7070
template: '<header class="bar bar-header nav-bar invisible">' +
7171
'<div class="buttons"> ' +
72-
'<button view-back class="button" ng-if="enableBackButton"></button>' +
72+
'<button view-back class="back-button button" ng-if="enableBackButton"></button>' +
7373
'<button ng-click="button.tap($event)" ng-repeat="button in leftButtons" class="button no-animation {{button.type}}" bind-html-unsafe="button.content"></button>' +
7474
'</div>' +
7575
'<h1 class="title" bind-html-unsafe="currentTitle"></h1>' +
@@ -79,16 +79,18 @@ angular.module('ionic.ui.viewState', ['ionic.service.view', 'ionic.service.gestu
7979
'</header>',
8080

8181
compile: function(tElement, tAttrs) {
82-
var backBtnEle = tElement.find('div').find('button');
83-
if(tAttrs.backButtonType) backBtnEle.addClass(tAttrs.backButtonType);
84-
85-
if(tAttrs.backButtonIcon && tAttrs.backButtonLabel) {
86-
backBtnEle.html('<i class="icon ' + tAttrs.backButtonIcon + '"></i> ' + tAttrs.backButtonLabel);
87-
} else if(tAttrs.backButtonLabel) {
88-
backBtnEle.html(tAttrs.backButtonLabel);
89-
} else if(tAttrs.backButtonIcon) {
90-
backBtnEle.addClass('icon');
91-
backBtnEle.addClass(tAttrs.backButtonIcon);
82+
var backBtnEle = tElement[0].querySelector('.back-button');
83+
if(backBtnEle) {
84+
if(tAttrs.backButtonType) backBtnEle.classList.add(tAttrs.backButtonType);
85+
86+
if(tAttrs.backButtonIcon && tAttrs.backButtonLabel) {
87+
backBtnEle.innerHTML = '<i class="icon ' + tAttrs.backButtonIcon + '"></i> ' + tAttrs.backButtonLabel;
88+
} else if(tAttrs.backButtonLabel) {
89+
backBtnEle.innerHTML = tAttrs.backButtonLabel;
90+
} else if(tAttrs.backButtonIcon) {
91+
backBtnEle.classList.add('icon');
92+
backBtnEle.classList.add(tAttrs.backButtonIcon);
93+
}
9294
}
9395

9496
if(tAttrs.type) tElement.addClass(tAttrs.type);

0 commit comments

Comments
 (0)