diff --git a/js/ext/angular/src/directive/ionicBar.js b/js/ext/angular/src/directive/ionicBar.js index f954e09f08..3b277e832d 100644 --- a/js/ext/angular/src/directive/ionicBar.js +++ b/js/ext/angular/src/directive/ionicBar.js @@ -25,7 +25,6 @@ angular.module('ionic.ui.header', ['ngAnimate', 'ngSanitize']) * Is able to have left or right buttons, and additionally its title can be * aligned through the {@link ionic.controller:ionicBar ionicBar controller}. * - * @param {string=} type The type of the bar. For example 'bar-positive'. * @param {string=} model The model to assign this headerBar's * {@link ionic.controller:ionicBar ionicBar controller} to. * Defaults to assigning to $scope.headerBarController. @@ -34,7 +33,7 @@ angular.module('ionic.ui.header', ['ngAnimate', 'ngSanitize']) * * @usage * ```html - * + * *
* *
@@ -63,7 +62,6 @@ angular.module('ionic.ui.header', ['ngAnimate', 'ngSanitize']) * Is able to have left or right buttons, and additionally its title can be * aligned through the {@link ionic.controller:ionicBar ionicBar controller}. * - * @param {string=} type The type of the bar. For example 'bar-positive'. * @param {string=} model The model to assign this footerBar's * {@link ionic.controller:ionicBar ionicBar controller} to. * Defaults to assigning to $scope.footerBarController. @@ -75,7 +73,7 @@ angular.module('ionic.ui.header', ['ngAnimate', 'ngSanitize']) * * Some content! * - * + * *
* *
@@ -108,11 +106,6 @@ function barDirective(isHeader) { }); $parse($attr.model || BAR_MODEL_DEFAULT).assign($scope.$parent || $scope, hb); - - $attr.$observe('type', function(val, oldVal) { - oldVal && $element.removeClass(oldVal); - $element.addClass(val); - }); } }; }]; diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js index 334967de08..151aecf982 100644 --- a/js/ext/angular/src/directive/ionicContent.js +++ b/js/ext/angular/src/directive/ionicContent.js @@ -68,7 +68,7 @@ function($parse, $timeout, $controller, $ionicBind) { require: '^?ionNavView', scope: true, template: - '
' + + '
' + '
' + '
', compile: function(element, attr, transclude) { diff --git a/js/ext/angular/src/directive/ionicNavBar.js b/js/ext/angular/src/directive/ionicNavBar.js index cf908fcf45..fe8206ea91 100644 --- a/js/ext/angular/src/directive/ionicNavBar.js +++ b/js/ext/angular/src/directive/ionicNavBar.js @@ -193,7 +193,7 @@ function($scope, $element, $ionicViewService, $animate, $compile) { * * + * class="bar-positive"> * * * @@ -204,7 +204,6 @@ function($scope, $element, $ionicViewService, $animate, $compile) { * {@link ionic.controller:ionicNavBar ionicNavBar controller} to. * Default: assigns it to $scope.navBarController. * @param animation {string=} The animation used to transition between titles. - * @param type {string=} The className for the navbar. For example, 'bar-positive'. * @param align {string=} Where to align the title of the navbar. * Available: 'left', 'right', 'center'. Defaults to 'center'. */ @@ -218,7 +217,6 @@ function($ionicViewService, $rootScope, $animate, $compile, $parse) { controller: '$ionicNavBar', scope: { animation: '@', - type: '@', alignTitle: '@' }, template: @@ -246,8 +244,7 @@ function($ionicViewService, $rootScope, $animate, $compile, $parse) { $scope.isInvisible = true; $scope.navBarClass = function() { - return ($scope.type ? ' ' + $scope.type : '') + - ($scope.isReverse ? ' reverse' : '') + + return ($scope.isReverse ? ' reverse' : '') + ($scope.isInvisible ? ' invisible' : '') + ($scope.shouldAnimate && $scope.animation ? ' ' + $scope.animation : ''); }; diff --git a/js/ext/angular/test/directive/ionicNavBar.unit.js b/js/ext/angular/test/directive/ionicNavBar.unit.js index 2c110fa8fd..13f91b5317 100644 --- a/js/ext/angular/test/directive/ionicNavBar.unit.js +++ b/js/ext/angular/test/directive/ionicNavBar.unit.js @@ -267,12 +267,5 @@ describe('ionNavBar', function() { el.isolateScope().$apply('isReverse = false'); expect(el.hasClass('reverse')).toBe(false); }); - - it('should have type class', function() { - var el = setup(); - expect(el.hasClass('superbar')).toBe(false); - el.isolateScope().$apply('type = "superbar"'); - expect(el.hasClass('superbar')).toBe(true); - }); }); });