javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ion-header-bar): when hidden, correctly offset the ion-content

Browse Source 
Fixes #1351
This commit is contained in:
Andrew Joslin
2014-05-14 10:14:02 -06:00
parent 67ea34ae1d
commit efa6184486
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/angular/directive/headerFooterBar.js vendored
View File

@@ -125,9 +125,10 @@ function headerFooterBarDirective(isHeader) {
if (isHeader) {
$scope.$watch(function() { return el.className; }, function(value) {
var isShown = value.indexOf('ng-hide') === -1;
var isSubheader = value.indexOf('bar-subheader') !== -1;
$scope.$hasHeader = !isSubheader;
$scope.$hasSubheader = isSubheader;
$scope.$hasHeader = isShown && !isSubheader;
$scope.$hasSubheader = isShown && isSubheader;
});
$scope.$on('$destroy', function() {
delete $scope.$hasHeader;
@@ -135,9 +136,10 @@ function headerFooterBarDirective(isHeader) {
});
} else {
$scope.$watch(function() { return el.className; }, function(value) {
var isShown = value.indexOf('ng-hide') === -1;
var isSubfooter = value.indexOf('bar-subfooter') !== -1;
$scope.$hasFooter = !isSubfooter;
$scope.$hasSubfooter = isSubfooter;
$scope.$hasFooter = isShown && !isSubfooter;
$scope.$hasSubfooter = isShown && isSubfooter;
});
$scope.$on('$destroy', function() {
delete $scope.$hasFooter;

16
test/unit/angular/directive/headerFooterBar.unit.js
View File

@@ -109,6 +109,14 @@ describe('bar directives', function() {
scope.$apply();
expect(scope.$hasHeader).toEqual(true);
expect(scope.$hasSubheader).toEqual(false);
el.addClass('ng-hide');
scope.$apply();
expect(scope.$hasHeader).toEqual(false);
expect(scope.$hasSubheader).toEqual(false);
el.removeClass('ng-hide');
scope.$apply();
expect(scope.$hasHeader).toEqual(true);
expect(scope.$hasSubheader).toEqual(false);
});
} else {
it('$hasFooter $hasSubheader', function() {
@@ -124,6 +132,14 @@ describe('bar directives', function() {
scope.$apply();
expect(scope.$hasFooter).toEqual(true);
expect(scope.$hasSubfooter).toEqual(false);
el.addClass('ng-hide');
scope.$apply();
expect(scope.$hasFooter).toEqual(false);
expect(scope.$hasSubfooter).toEqual(false);
el.removeClass('ng-hide');
scope.$apply();
expect(scope.$hasFooter).toEqual(true);
expect(scope.$hasSubfooter).toEqual(false);
});
it('.has-tabs', function() {
var el = setup();