locomotivecms_wagon 1.3.0 → 1.3.1

data/generators/foundation/public/javascripts/foundation/foundation.tooltips.js

@@ -4,14 +4,15 @@
   'use strict';
 
   Foundation.libs.tooltips = {
-    name: 'tooltips',
+    name : 'tooltips',
 
-    version : '4.2.0',
+    version : '4.3.2',
 
     settings : {
       selector : '.has-tip',
       additionalInheritableClasses : [],
       tooltipClass : '.tooltip',
+      touchCloseText: 'tap to close',
       appendTo: 'body',
       'disable-for-touch': false,
       tipTemplate : function (selector, content) {
@@ -33,7 +34,7 @@
         $.extend(true, this.settings, options);
       }
 
-      if (typeof method != 'string') {
+      if (typeof method !== 'string') {
         if (Modernizr.touch) {
           $(this.scope)
             .on('click.fndtn.tooltip touchstart.fndtn.tooltip touchend.fndtn.tooltip', 
@@ -110,7 +111,7 @@
 
       $tip.addClass(classes).appendTo(this.settings.appendTo);
       if (Modernizr.touch) {
-        $tip.append('<span class="tap-to-close">tap to close </span>');
+        $tip.append('<span class="tap-to-close">'+this.settings.touchCloseText+'</span>');
       }
       $target.removeAttr('title').attr('title','');
       this.show($target);

data/generators/foundation/public/javascripts/foundation/foundation.topbar.js

@@ -6,7 +6,7 @@
   Foundation.libs.topbar = {
     name : 'topbar',
 
-    version : '4.2.0',
+    version: '4.3.2',
 
     settings : {
       index : 0,
@@ -14,12 +14,13 @@
       custom_back_text: true,
       back_text: 'Back',
       is_hover: true,
+      mobile_show_parent_link: false,
       scrolltop : true, // jump to top when sticky nav menu toggle is clicked
       init : false
     },
 
     init : function (section, method, options) {
-      Foundation.inherit(this, 'data_options');
+      Foundation.inherit(this, 'data_options addCustomRule');
       var self = this;
 
       if (typeof method === 'object') {
@@ -28,7 +29,7 @@
         $.extend(true, this.settings, options);
       }
 
-      if (typeof method != 'string') {
+      if (typeof method !== 'string') {
 
         $('.top-bar, [data-topbar]').each(function () {
           $.extend(true, self.settings, self.data_options($(this)));
@@ -38,14 +39,29 @@
           self.settings.$titlebar = self.settings.$topbar.children('ul').first();
           self.settings.$topbar.data('index', 0);
 
+          var topbarContainer = self.settings.$topbar.parent();
+          if(topbarContainer.hasClass('fixed') || topbarContainer.hasClass(self.settings.stickyClass)) {
+            self.settings.$topbar.data('height', self.outerHeight(topbarContainer));
+            self.settings.$topbar.data('stickyoffset', topbarContainer.offset().top);
+          } else {
+            self.settings.$topbar.data('height', self.outerHeight(self.settings.$topbar));
+          }
+
           var breakpoint = $("<div class='top-bar-js-breakpoint'/>").insertAfter(self.settings.$topbar);
           self.settings.breakPoint = breakpoint.width();
           breakpoint.remove();
 
           self.assemble();
 
+          if (self.settings.is_hover) {
+            self.settings.$topbar.find('.has-dropdown').addClass('not-click');
+          }
+
+          // Pad body when sticky (scrolled) or fixed.
+          self.addCustomRule('.f-topbar-fixed { padding-top: ' + self.settings.$topbar.data('height') + 'px }');
+
           if (self.settings.$topbar.parent().hasClass('fixed')) {
-            $('body').css('padding-top', self.outerHeight(self.settings.$topbar));
+            $('body').addClass('f-topbar-fixed');
           }
         });
 
@@ -60,70 +76,88 @@
       }
     },
 
-    events : function () {
+    toggle: function() {
       var self = this;
-      var offst = this.outerHeight($('.top-bar, [data-topbar]'));
-      $(this.scope)
-        .off('.fndtn.topbar')
-        .on('click.fndtn.topbar', '.top-bar .toggle-topbar, [data-topbar] .toggle-topbar', function (e) {
-          var topbar = $(this).closest('.top-bar, [data-topbar]'),
-              section = topbar.find('section, .section'),
-              titlebar = topbar.children('ul').first();
+      var topbar = $('.top-bar, [data-topbar]'),
+          section = topbar.find('section, .section');
 
-          e.preventDefault();
+      if (self.breakpoint()) {
+        if (!self.rtl) {
+          section.css({left: '0%'});
+          section.find('>.name').css({left: '100%'});
+        } else {
+          section.css({right: '0%'});
+          section.find('>.name').css({right: '100%'});
+        }
 
-          if (self.breakpoint()) {
-            if (!self.rtl) {
-              section.css({left: '0%'});
-              section.find('>.name').css({left: '100%'});
-            } else {
-              section.css({right: '0%'});
-              section.find('>.name').css({right: '100%'});
-            }
+        section.find('li.moved').removeClass('moved');
+        topbar.data('index', 0);
 
-            section.find('li.moved').removeClass('moved');
-            topbar.data('index', 0);
+        topbar
+          .toggleClass('expanded')
+          .css('height', '');
+      }
 
-            topbar
-              .toggleClass('expanded')
-              .css('min-height', '');
+      if(self.settings.scrolltop)
+      {
+        if (!topbar.hasClass('expanded')) {
+          if (topbar.hasClass('fixed')) {
+            topbar.parent().addClass('fixed');
+            topbar.removeClass('fixed');
+            $('body').addClass('f-topbar-fixed');
           }
-
-          if (!topbar.hasClass('expanded')) {
-            if (topbar.hasClass('fixed')) {
-              topbar.parent().addClass('fixed');
-              topbar.removeClass('fixed');
-              $('body').css('padding-top',offst);
-            }
-          } else if (topbar.parent().hasClass('fixed')) {
+        } else if (topbar.parent().hasClass('fixed')) {
+          if (self.settings.scrolltop) {
             topbar.parent().removeClass('fixed');
             topbar.addClass('fixed');
-            $('body').css('padding-top','0');
+            $('body').removeClass('f-topbar-fixed');
 
-            if (self.settings.scrolltop) {
-              window.scrollTo(0,0);
-            }
+            window.scrollTo(0,0);
+          } else {
+              topbar.parent().removeClass('expanded');
           }
-        })
-
-        .on('mouseenter mouseleave', '.top-bar li', function (e) {
-          if (!self.settings.is_hover) return;
+        }
+      } else {
+        if(topbar.parent().hasClass(self.settings.stickyClass)) {
+          topbar.parent().addClass('fixed');
+        }
 
-          if (/enter|over/i.test(e.type)) {
-            $(this).addClass('hover');
+        if(topbar.parent().hasClass('fixed')) {
+          if (!topbar.hasClass('expanded')) {
+            topbar.removeClass('fixed');
+            topbar.parent().removeClass('expanded');
+            self.updateStickyPositioning();
           } else {
-            $(this).removeClass('hover');
+            topbar.addClass('fixed');
+            topbar.parent().addClass('expanded');
           }
+        }
+      }
+    },
+
+    timer : null,
+
+    events : function () {
+      var self = this;
+      $(this.scope)
+        .off('.fndtn.topbar')
+        .on('click.fndtn.topbar', '.top-bar .toggle-topbar, [data-topbar] .toggle-topbar', function (e) {
+          e.preventDefault();
+          self.toggle();
         })
 
         .on('click.fndtn.topbar', '.top-bar li.has-dropdown', function (e) {
-          if (self.breakpoint()) return;
-
           var li = $(this),
               target = $(e.target),
               topbar = li.closest('[data-topbar], .top-bar'),
               is_hover = topbar.data('topbar');
 
+          if(target.data('revealId')) {
+            self.toggle();
+            return;
+          }
+
+          if (self.breakpoint()) return;
           if (self.settings.is_hover && !Modernizr.touch) return;
 
           e.stopImmediatePropagation();
@@ -137,19 +171,22 @@
               .removeClass('hover')
               .find('li')
               .removeClass('hover');
+
+            li.parents('li.hover')
+              .removeClass('hover');
           } else {
             li.addClass('hover');
           }
         })
 
         .on('click.fndtn.topbar', '.top-bar .has-dropdown>a, [data-topbar] .has-dropdown>a', function (e) {
-          if (self.breakpoint()) {
+          if (self.breakpoint() && $(window).width() != self.settings.breakPoint) {
+
             e.preventDefault();
 
             var $this = $(this),
                 topbar = $this.closest('.top-bar, [data-topbar]'),
                 section = topbar.find('section, .section'),
-                titlebar = topbar.children('ul').first(),
                 dropdownHeight = $this.next('.dropdown').outerHeight(),
                 $selectedLi = $this.closest('li');
 
@@ -164,22 +201,49 @@
               section.find('>.name').css({right: 100 * topbar.data('index') + '%'});
             }
 
-            topbar.css('min-height', self.height($this.siblings('ul')) + self.outerHeight(titlebar, true));
+            topbar.css('height', self.outerHeight($this.siblings('ul'), true) + self.settings.$topbar.data('height'));
           }
         });
 
       $(window).on('resize.fndtn.topbar', function () {
+        if (typeof self.settings.$topbar === 'undefined') { return; }
+        var stickyContainer = self.settings.$topbar.parent('.' + this.settings.stickyClass);
+        var stickyOffset;
+
         if (!self.breakpoint()) {
+          var doToggle = self.settings.$topbar.hasClass('expanded');
           $('.top-bar, [data-topbar]')
-            .css('min-height', '')
+            .css('height', '')
             .removeClass('expanded')
             .find('li')
             .removeClass('hover');
+
+            if(doToggle) {
+              self.toggle();
+            }
+        }
+
+        if(stickyContainer.length > 0) {
+          if(stickyContainer.hasClass('fixed')) {
+            // Remove the fixed to allow for correct calculation of the offset.
+            stickyContainer.removeClass('fixed');
+
+            stickyOffset = stickyContainer.offset().top;
+            if($(document.body).hasClass('f-topbar-fixed')) {
+              stickyOffset -= self.settings.$topbar.data('height');
+            }
+
+            self.settings.$topbar.data('stickyoffset', stickyOffset);
+            stickyContainer.addClass('fixed');
+          } else {
+            stickyOffset = stickyContainer.offset().top;
+            self.settings.$topbar.data('stickyoffset', stickyOffset);
+          }
         }
       }.bind(this));
 
       $('body').on('click.fndtn.topbar', function (e) {
-        var parent = $(e.target).closest('[data-topbar], .top-bar');
+        var parent = $(e.target).closest('li').closest('li.hover');
 
         if (parent.length > 0) {
           return;
@@ -194,7 +258,6 @@
 
         var $this = $(this),
             topbar = $this.closest('.top-bar, [data-topbar]'),
-            titlebar = topbar.children('ul').first(),
             section = topbar.find('section, .section'),
             $movedLi = $this.closest('li.moved'),
             $previousLevelUl = $movedLi.parent();
@@ -210,9 +273,9 @@
         }
 
         if (topbar.data('index') === 0) {
-          topbar.css('min-height', 0);
+          topbar.css('height', '');
         } else {
-          topbar.css('min-height', self.height($previousLevelUl) + self.outerHeight(titlebar, true));
+          topbar.css('height', self.outerHeight($previousLevelUl, true) + self.settings.$topbar.data('height'));
         }
 
         setTimeout(function () {
@@ -222,7 +285,7 @@
     },
 
     breakpoint : function () {
-      return $(window).width() <= this.settings.breakPoint || $('html').hasClass('lt-ie9');
+      return $(document).width() <= this.settings.breakPoint || $('html').hasClass('lt-ie9');
     },
 
     assemble : function () {
@@ -235,7 +298,7 @@
             $dropdown = $link.siblings('.dropdown'),
             url = $link.attr('href');
 
-        if (url && url.length > 1) {
+        if (self.settings.mobile_show_parent_link && url && url.length > 1) {
           var $titleLi = $('<li class="title back js-generated"><h5><a href="#"></a></h5></li><li><a class="parent-link js-generated" href="' + url + '">' + $link.text() +'</a></li>');
         } else {
           var $titleLi = $('<li class="title back js-generated"><h5><a href="#"></a></h5></li>');
@@ -243,7 +306,7 @@
 
         // Copy link to subnav
         if (self.settings.custom_back_text == true) {
-          $titleLi.find('h5>a').html('&laquo; ' + self.settings.back_text);
+          $titleLi.find('h5>a').html(self.settings.back_text);
         } else {
           $titleLi.find('h5>a').html('&laquo; ' + $link.html());
         }
@@ -267,23 +330,33 @@
     },
 
     sticky : function () {
+      var $window = $(window),
+          self = this;
+
+      $window.scroll(function() {
+        self.updateStickyPositioning();
+      });
+    },
+
+    updateStickyPositioning: function() {
       var klass = '.' + this.settings.stickyClass;
+      var $window = $(window);
+
       if ($(klass).length > 0) {
-        var distance = $(klass).length ? $(klass).offset().top: 0,
-            $window = $(window);
-            var offst = this.outerHeight($('.top-bar'));
-
-          $window.scroll(function() {
-            if ($window.scrollTop() >= (distance)) {
-              $(klass).addClass("fixed");
-              $('body').css('padding-top',offst);
+        var distance = this.settings.$topbar.data('stickyoffset');
+        if (!$(klass).hasClass('expanded')) {
+          if ($window.scrollTop() > (distance)) {
+            if (!$(klass).hasClass('fixed')) {
+              $(klass).addClass('fixed');
+              $('body').addClass('f-topbar-fixed');
             }
-
-            else if ($window.scrollTop() < distance) {
-              $(klass).removeClass("fixed");
-              $('body').css('padding-top','0');
+          } else if ($window.scrollTop() <= distance) {
+            if ($(klass).hasClass('fixed')) {
+              $(klass).removeClass('fixed');
+              $('body').removeClass('f-topbar-fixed');
             }
-        });
+          }
+        }
       }
     },