Skip to content

Fix sticky topbar position #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 13, 2015
Merged

Fix sticky topbar position #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c752bf
chore(topbar): use topbarContainer instead selecting again
jbrowning Apr 13, 2015
fd2cceb
fix(topbar): Fix stickyoffset on scrolled refresh
jbrowning Apr 13, 2015
ac79541
chore(topbar): Refactor topbar specs
jbrowning Apr 13, 2015
2095299
chore(topbar): Add basic sticky topbar spec
jbrowning Apr 13, 2015
a0dd5f8
fix(topbar): Remove unnecessary padding div in spec
jbrowning Apr 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 139 additions & 109 deletions src/topbar/test/topbar.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,131 +1,161 @@
describe('topbar directive', function () {
var $rootScope, element, $document;
describe('topbar directive', function() {
var $rootScope, $document, $compile, $window, element, containerElement;

var setMobile = function(windowMock){
windowMock.matchMedia.andReturn({matches: false});
};

var setDesktop = function(windowMock){
windowMock.matchMedia.andReturn({matches: true});
};
beforeEach(function() {
$window = angular.extend(window, {
pageYOffset: 0,
scrollTo: jasmine.createSpy('scrollTo'),
matchMedia: jasmine.createSpy('matchMedia').andReturn({matches: false}),
});

beforeEach(module('template/topbar/top-bar.html'));
beforeEach(module('template/topbar/has-dropdown.html'));
beforeEach(module('template/topbar/toggle-top-bar.html'));
beforeEach(module('template/topbar/top-bar-section.html'));
beforeEach(module('template/topbar/top-bar-dropdown.html'));
module(
'mm.foundation.topbar',
'template/topbar/top-bar.html',
'template/topbar/has-dropdown.html',
'template/topbar/toggle-top-bar.html',
'template/topbar/top-bar-section.html',
'template/topbar/top-bar-dropdown.html',
{$window: $window});

beforeEach(module('mm.foundation.topbar', function($provide){
window.matchMedia = jasmine.createSpy('matchMedia').andReturn({matches: false});
$provide.value('$window', window);
}));

beforeEach(inject(function(_$compile_, _$rootScope_, _$document_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
$document = _$document_;

element = $compile(
'<body>' +
'<div class="fixed" id="container">' +
'<top-bar scrolltop="false">' +
'<ul class="title-area">' +
'<li class="name">' +
'<h1><a href="#">My Site</a></h1>' +
'</li>' +
'<li toggle-top-bar id="menu-toggle" class="menu-icon">' +
'<a href="#">Menu</a>' +
'</li>' +
'</ul>' +
'<top-bar-section id="top-section">' +
'<ul class="right">' +
'<li class="active">' +
'<a href="#">Active</a>' +
'</li>' +
'<li has-dropdown>' +
'<a id="dropdown" href="#">Dropdown</a>' +
'<ul top-bar-dropdown>' +
'<li><a id="alink" href="#">First link in dropdown</a></li>' +
'</ul>' +
'</li>' +
'</ul>' +
'<ul class="left">' +
'<li><a href="#">Left</a></li>' +
'</ul>' +
'</top-bar-section>' +
'</top-bar>' +
'<div>Content</div>' +
'</div>' +
'</body>')($rootScope);
$('body', $document).append(element);
$rootScope.$digest();
}));
inject(function(_$compile_, _$rootScope_, _$document_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
$document = _$document_;
});
});

beforeEach(inject(function ($rootScope) {
this.addMatchers({
toHaveDropDownsOpen: function(noOfLevels) {
var dropDownDomEls = this.actual.find('li.has-dropdown.not-click');
var dropDownDomEls = element.find('li.has-dropdown.not-click');
return dropDownDomEls.length === noOfLevels;
},
toHaveMobileMenuOpen: function() {
var els = this.actual.find('nav.top-bar.expanded');
return !!els.length;
return element.hasClass("expanded");
}
});
}));

it('has a "top-bar" css class', function() {
expect(element.children('nav')).toHaveClass('top-bar');
});
var setMobile = function() {
$window.matchMedia.andReturn({matches: false});
};

it('has a drop down open on large screen', inject(function($window) {
setDesktop($window);
$('#dropdown', element).trigger('mouseenter');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).toHaveDropDownsOpen(1);
}));
var setDesktop = function() {
$window.matchMedia.andReturn({matches: true});
};

it('has no drop downs open on small screen', inject(function($window) {
setMobile($window);
$('#dropdown', element).trigger('mouseenter');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).toHaveDropDownsOpen(0);
}));
var compileDirective = function(markup) {
if (angular.isUndefined(markup)) {
markup =
'<div class="fixed" id="container">' +
'<top-bar scrolltop="false">' +
'<ul class="title-area">' +
'<li class="name">' +
'<h1><a href="#">My Site</a></h1>' +
'</li>' +
'<li toggle-top-bar id="menu-toggle" class="menu-icon">' +
'<a href="#">Menu</a>' +
'</li>' +
'</ul>' +
'<top-bar-section id="top-section">' +
'<ul class="right">' +
'<li class="active">' +
'<a href="#">Active</a>' +
'</li>' +
'<li has-dropdown>' +
'<a id="dropdown" href="#">Dropdown</a>' +
'<ul top-bar-dropdown>' +
'<li><a id="alink" href="#">First link in dropdown</a></li>' +
'</ul>' +
'</li>' +
'</ul>' +
'<ul class="left">' +
'<li><a href="#">Left</a></li>' +
'</ul>' +
'</top-bar-section>' +
'</top-bar>' +
'<div>Content</div>' +
'</div>';
}

it('has no mobile menu opening on large screen', inject(function($window) {
setDesktop($window);
$('#menu-toggle', element).trigger('click');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).not.toHaveMobileMenuOpen();
}));
containerElement = $compile(markup)($rootScope);
$('body', $document).append(element);
$rootScope.$digest();
element = containerElement.find("nav");
};

it('opens and closes mobile menu on small screen', inject(function($window) {
setMobile($window);
$('#menu-toggle', element).trigger('click');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).toHaveMobileMenuOpen();
$('#menu-toggle', element).trigger('click');
expect(element).not.toHaveMobileMenuOpen();
}));
describe("basic behavior", function() {
beforeEach(function() {
compileDirective();
});

it('opens the submenu when a dropdown is clicked on mobile', inject(function($window) {
setMobile($window);
$('#menu-toggle', element).trigger('click');
expect($window.matchMedia).toHaveBeenCalled();
var beforeHeight = $('.top-bar', element)[0].style.height;
$('#dropdown', element).trigger('click');
var afterHeight = $('.top-bar', element)[0].style.height;
expect(afterHeight).toNotEqual(beforeHeight);
expect($('#top-section', element)[0].style.left).toEqual('-100%');
}));
it('has a "top-bar" css class', function() {
expect(element).toHaveClass('top-bar');
});

it('has a drop down open on large screen', inject(function($window) {
setDesktop();
$('#dropdown', element).trigger('mouseenter');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).toHaveDropDownsOpen(1);
}));

it('has no drop downs open on small screen', inject(function($window) {
setMobile();
$('#dropdown', element).trigger('mouseenter');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).toHaveDropDownsOpen(0);
}));

// it('has f-topbar-fixed class on body after link is clicked on a fixed mobile topbar', inject(function($window) {
// setMobile($window);
// $('#menu-toggle', element).trigger('click');
// expect($window.matchMedia).toHaveBeenCalled();
// $('#dropdown', element).trigger('click');
// $('#alink', element).trigger('click');
// expect($('body', $document)).toHaveClass('f-topbar-fixed');
// }));
it('has no mobile menu opening on large screen', inject(function($window) {
setDesktop($window);
$('#menu-toggle', element).trigger('click');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).not.toHaveMobileMenuOpen();
}));

it('opens and closes mobile menu on small screen', inject(function($window) {
setMobile();
$('#menu-toggle', element).trigger('click');
expect($window.matchMedia).toHaveBeenCalled();
expect(element).toHaveMobileMenuOpen();
$('#menu-toggle', element).trigger('click');
expect(element).not.toHaveMobileMenuOpen();
}));

it('opens the submenu when a dropdown is clicked on mobile', inject(function($window) {
var topSection = element.find('#top-section');
var menuToggle = element.find('#menu-toggle');
setMobile();
expect(element.hasClass("expanded")).toBe(false);
menuToggle.trigger('click');
expect($window.matchMedia).toHaveBeenCalled();
expect(element.hasClass("expanded")).toBe(true);
}));
});

describe("sticky", function() {
var markup;

beforeEach(function() {
markup =
'<div class="sticky">' +
'<top-bar>' +
'<ul class="title-area">' +
'<li class="name">' +
'<h1><a href="#">My Site</a></h1>' +
'</li>' +
'<li toggle-top-bar id="menu-toggle" class="menu-icon">' +
'<a href="#">Menu</a>' +
'</li>' +
'</ul>' +
'</top-bar>' +
'</div>';
});

it('does not apply the fixed class on initial load', function() {
compileDirective(markup);
expect(containerElement.hasClass('fixed')).toBe(false);
});
});
});
20 changes: 9 additions & 11 deletions src/topbar/topbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,13 @@ angular.module("mm.foundation.topbar", ['mm.foundation.mediaQueries'])
return;
}

var $class = angular.element($document[0].querySelector('.' + scope.settings.stickyClass));
var distance = stickyoffset;

if ($window.pageYOffset > distance && !$class.hasClass('fixed')) {
$class.addClass('fixed');
if ($window.pageYOffset > distance && !topbarContainer.hasClass('fixed')) {
topbarContainer.addClass('fixed');
body.css('padding-top', scope.originalHeight + 'px');
} else if ($window.pageYOffset <= distance && $class.hasClass('fixed')) {
$class.removeClass('fixed');
} else if ($window.pageYOffset <= distance && topbarContainer.hasClass('fixed')) {
topbarContainer.removeClass('fixed');
body.css('padding-top', '');
}
};
Expand Down Expand Up @@ -193,7 +192,7 @@ angular.module("mm.foundation.topbar", ['mm.foundation.mediaQueries'])

var expand = (on === undefined) ? !topbar.hasClass('expanded') : on;

if (expand){
if (expand) {
topbar.addClass('expanded');
}
else {
Expand Down Expand Up @@ -233,7 +232,7 @@ angular.module("mm.foundation.topbar", ['mm.foundation.mediaQueries'])
if(topbarContainer.hasClass('fixed') || isSticky() ) {
scope.stickyTopbar = true;
scope.height = topbarContainer[0].offsetHeight;
var stickyoffset = topbarContainer[0].getBoundingClientRect().top;
var stickyoffset = topbarContainer[0].getBoundingClientRect().top + $window.pageYOffset;
} else {
scope.height = topbar[0].offsetHeight;
}
Expand All @@ -248,13 +247,12 @@ angular.module("mm.foundation.topbar", ['mm.foundation.mediaQueries'])
}
});


angular.element($window).bind('resize', onResize);
angular.element($window).bind("scroll", onScroll);
angular.element($window).bind('scroll', onScroll);

scope.$on('$destroy', function() {
angular.element($window).unbind("scroll", onResize);
angular.element($window).unbind("resize", onScroll);
angular.element($window).unbind('scroll', onResize);
angular.element($window).unbind('resize', onScroll);
});

if (topbarContainer.hasClass('fixed')) {
Expand Down