Skip to content

Commit 41b4f16

Browse files
committed
chore(): hotfix for v0.9.26
1 parent d9f2c9f commit 41b4f16

File tree

5 files changed

+21
-15
lines changed

5 files changed

+21
-15
lines changed

release/js/ionic-angular.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2716,8 +2716,8 @@ function($scope, $ionicViewService, $rootScope, $element) {
27162716
'<a ng-class="{active: isTabActive(), \'has-badge\':badge}" ' +
27172717
'ng-click="selectTab($event)" class="tab-item">' +
27182718
'<span class="badge {{badgeStyle}}" ng-if="badge">{{badge}}</span>' +
2719-
'<i class="icon {{iconOn}}" ng-if="iconOn && isTabActive()"></i>' +
2720-
'<i class="icon {{iconOff}}" ng-if="iconOff && !isTabActive()"></i>' +
2719+
'<i class="icon {{getIconOn()}}" ng-if="getIconOn() && isTabActive()"></i>' +
2720+
'<i class="icon {{getIconOff()}}" ng-if="getIconOff() && !isTabActive()"></i>' +
27212721
'<span class="tab-title" ng-bind-html="title"></span>' +
27222722
'</a>',
27232723
scope: {
@@ -2729,14 +2729,17 @@ function($scope, $ionicViewService, $rootScope, $element) {
27292729
badgeStyle: '@'
27302730
},
27312731
compile: function(element, attr, transclude) {
2732-
if (attr.icon) {
2733-
attr.$set('iconOn', attr.icon);
2734-
attr.$set('iconOff', attr.icon);
2735-
}
27362732
return function link($scope, $element, $attrs, ctrls) {
27372733
var tabsCtrl = ctrls[0],
27382734
tabCtrl = ctrls[1];
27392735

2736+
$scope.getIconOn = function() {
2737+
return $scope.iconOn || $scope.icon;
2738+
};
2739+
$scope.getIconOff = function() {
2740+
return $scope.iconOff || $scope.icon;
2741+
};
2742+
27402743
$scope.isTabActive = function() {
27412744
return tabsCtrl.selectedTab === tabCtrl.$scope;
27422745
};

release/js/ionic-angular.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/js/ionic.bundle.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34381,8 +34381,8 @@ function($scope, $ionicViewService, $rootScope, $element) {
3438134381
'<a ng-class="{active: isTabActive(), \'has-badge\':badge}" ' +
3438234382
'ng-click="selectTab($event)" class="tab-item">' +
3438334383
'<span class="badge {{badgeStyle}}" ng-if="badge">{{badge}}</span>' +
34384-
'<i class="icon {{iconOn}}" ng-if="iconOn && isTabActive()"></i>' +
34385-
'<i class="icon {{iconOff}}" ng-if="iconOff && !isTabActive()"></i>' +
34384+
'<i class="icon {{getIconOn()}}" ng-if="getIconOn() && isTabActive()"></i>' +
34385+
'<i class="icon {{getIconOff()}}" ng-if="getIconOff() && !isTabActive()"></i>' +
3438634386
'<span class="tab-title" ng-bind-html="title"></span>' +
3438734387
'</a>',
3438834388
scope: {
@@ -34394,14 +34394,17 @@ function($scope, $ionicViewService, $rootScope, $element) {
3439434394
badgeStyle: '@'
3439534395
},
3439634396
compile: function(element, attr, transclude) {
34397-
if (attr.icon) {
34398-
attr.$set('iconOn', attr.icon);
34399-
attr.$set('iconOff', attr.icon);
34400-
}
3440134397
return function link($scope, $element, $attrs, ctrls) {
3440234398
var tabsCtrl = ctrls[0],
3440334399
tabCtrl = ctrls[1];
3440434400

34401+
$scope.getIconOn = function() {
34402+
return $scope.iconOn || $scope.icon;
34403+
};
34404+
$scope.getIconOff = function() {
34405+
return $scope.iconOff || $scope.icon;
34406+
};
34407+
3440534408
$scope.isTabActive = function() {
3440634409
return tabsCtrl.selectedTab === tabCtrl.$scope;
3440734410
};

release/js/ionic.bundle.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"version": "0.9.26",
33
"codename": "rabbit",
44
"date": "2014-02-26",
5-
"time": "19:59:3"
5+
"time": "21:16:43"
66
}

0 commit comments

Comments
 (0)