diff --git a/_globalnav-glyphish.html b/_globalnav-glyphish.html index bc995ae7..4fc225ef 100644 --- a/_globalnav-glyphish.html +++ b/_globalnav-glyphish.html @@ -102,7 +102,8 @@ - diff --git a/_globalnav.html b/_globalnav.html index 77fcb9e4..8c0dab9e 100644 --- a/_globalnav.html +++ b/_globalnav.html @@ -87,16 +87,18 @@ -
+
+
+
diff --git a/css/jQuery.mobile.globalnav.css b/css/jQuery.mobile.globalnav.css index 9da9e0be..b62f15bd 100644 --- a/css/jQuery.mobile.globalnav.css +++ b/css/jQuery.mobile.globalnav.css @@ -3,8 +3,7 @@ * Copyright (c) jQuery Project * Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses. */ -.ui-globalnav { overflow: hidden; width: 100%; overflow: hidden; } -.ui-globalnav-disable { display: none; } +.ui-globalnav { overflow: hidden; } .ui-globalnav ul, .ui-globalnav-expanded ul { list-style:none; padding: 0; margin: 0; position: relative; display: block; border: 0;} .ui-globalnav-collapsed ul { float: left; width: 75%; } .ui-globalnav-collapsed .ui-globalnav-toggle { float: left; width: 25%; } diff --git a/js/jQuery.mobile.globalnav.js b/js/jQuery.mobile.globalnav.js index 5dec288f..7691df6c 100755 --- a/js/jQuery.mobile.globalnav.js +++ b/js/jQuery.mobile.globalnav.js @@ -6,24 +6,14 @@ */ (function($){ $.fn.globalnav = function(settings){ - return $(this).each(function(){ //there should only ever be one of these... is each necessary? - if($(this).find('.ui-globalnav').length){ return; } - - //remove any other globalnav currently present - $('[data-role="globalnav"]:has(.ui-globalnav)').remove(); - + return $(this).each(function(){ + var o = $.extend({ - fixedAs: 'footer', - moreText: 'More...', - thisId: $(this).parents('.ui-page').attr('id') + moreText: 'More...' },settings); - $(this) - .attr('id', o.thisId + '-globalnav') - .wrapInner('
'); - //wrap it with footer classes - var $globalnav = $(this).find('.ui-globalnav'), + var $globalnav = $(this).addClass('ui-globalnav'), numTabs = $globalnav.find('li').length; $globalnav @@ -63,10 +53,7 @@ $.fn.globalnav = function(settings){ $globalnav.find('.ui-btn-active').removeClass('ui-btn-active'); $(this).addClass('ui-btn-active'); }); - - $(this) - .appendTo('body') - .fixHeaderFooter(); + }); }; })(jQuery); \ No newline at end of file