Move topbar breakpoint config to nav element data-breakpoint attribute.

stanxii · Sep 18, 2012 · 7137183 · 7137183
1 parent d3b9b4a
commit 7137183
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/test/topbar.html b/test/topbar.html
@@ -28,7 +28,7 @@
 
   <!-- <div class="row">
     <div class="six columns"> -->
-      <nav class="top-bar contain-to-grid"> <!-- Could do .fixed to fix to top or .contain-to-grid for grid width -->
+      <nav class="top-bar contain-to-grid" data-breakpoint="940"> <!-- Could do .fixed to fix to top or .contain-to-grid for grid width -->
         <ul>
           <!-- Title Area -->
           <li class="name">

diff --git a/vendor/assets/javascripts/foundation/jquery.foundation.topbar.js b/vendor/assets/javascripts/foundation/jquery.foundation.topbar.js
@@ -13,7 +13,7 @@
 
   var settings = {
       index : 0,
-      breakPoint : 940, // Set to to 9999 to force it into responsive always
+      breakPoint : 767,
       initialized : false
     },
     methods = {
@@ -23,6 +23,7 @@
           settings.$w = $(window),
           settings.$topbar = $('nav.top-bar');
           settings.$titlebar = settings.$topbar.children('ul:first');
+          settings.breakPoint = settings.$topbar.data('breakpoint') || settings.breakPoint;
 
           if (!settings.initialized) {
             methods.assemble();
@@ -36,9 +37,10 @@
           $('.top-bar .toggle-topbar').live('click.fndtn', function (e) {
             e.preventDefault();
 
-            settings.$topbar.toggleClass('expanded');
-            settings.$topbar.css('min-height', '');
-
+            if (methods.breakpoint()) {
+              settings.$topbar.toggleClass('expanded');
+              settings.$topbar.css('min-height', '');
+            }
           });
 
           // Show the Dropdown Levels on Click