zurb-foundation 4.3.1 → 4.3.2

data/docs/support.html.erb

@@ -68,8 +68,8 @@
 		<div class="row support">
 		  <div class="small-3 columns">IE7</div>
 		  <div class="small-3 columns"><span class="fail">&#x2717;</span></div>
-		  <div class="small-3 columns"><span data-tooltip title="While we don't officially support IE7, but our UI styles should work for the most part" class="meh has-tip tip-top" data-width="200">&#9679;</span></div>
-		  <div class="small-3 columns"><span data-tooltip title="While we don't officially IE7, but our JS works for the most part. Clearing and tooltips have some issues with style and position." class="meh has-tip tip-top" data-width="200">&#9679;</span></div>
+		  <div class="small-3 columns"><span data-tooltip title="While we don't officially support IE7, our UI styles should work for the most part" class="meh has-tip tip-top" data-width="200">&#9679;</span></div>
+		  <div class="small-3 columns"><span data-tooltip title="While we don't officially support IE7, our JS works for the most part. Clearing and tooltips have some issues with style and position." class="meh has-tip tip-top" data-width="200">&#9679;</span></div>
 		</div>
 
 		<div class="row support">

data/foundation.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "sass", [">= 3.2.0"]
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "jasmine"
 end

data/js/foundation/foundation.abide.js

@@ -6,7 +6,7 @@
   Foundation.libs.abide = {
     name : 'abide',
 
-    version : '4.3.0',
+    version : '4.3.2',
 
     settings : {
       live_validate : true,
@@ -92,11 +92,11 @@
           validation_count = validations.length,
           form = $(els[0]).closest('form');
 
-      while (validation_count--) {
-        if (!validations[validation_count] && /submit/.test(e.type)) {
-          if (this.settings.focus_on_invalid) els[validation_count].focus();
+      for (var i=0; i < validation_count; i++) {
+        if (!validations[i] && /submit/.test(e.type)) {
+          if (this.settings.focus_on_invalid) els[i].focus();
           form.trigger('invalid');
-          $(els[validation_count]).closest('form').attr('data-invalid', '');
+          $(els[i]).closest('form').attr('data-invalid', '');
           return false;
         }
       }

data/js/foundation/foundation.alerts.js

@@ -6,15 +6,17 @@
   Foundation.libs.alerts = {
     name : 'alerts',
 
-    version : '4.2.2',
+    version : '4.3.2',
 
     settings : {
+      animation: 'fadeOut',
       speed: 300, // fade out speed
       callback: function (){}
     },
 
     init : function (scope, method, options) {
       this.scope = scope || this.scope;
+      Foundation.inherit(this, 'data_options');
 
       if (typeof method === 'object') {
         $.extend(true, this.settings, method);
@@ -33,10 +35,13 @@
       var self = this;
 
       $(this.scope).on('click.fndtn.alerts', '[data-alert] a.close', function (e) {
+          var alertBox = $(this).closest("[data-alert]"),
+              settings = $.extend({}, self.settings, self.data_options(alertBox));
+
         e.preventDefault();
-        $(this).closest("[data-alert]").fadeOut(self.speed, function () {
+        alertBox[settings.animation](settings.speed, function () {
           $(this).remove();
-          self.settings.callback();
+          settings.callback();
         });
       });
 
@@ -49,4 +54,4 @@
 
     reflow : function () {}
   };
-}(Foundation.zj, this, this.document));
+}(Foundation.zj, this, this.document));

data/js/foundation/foundation.clearing.js

@@ -6,7 +6,7 @@
   Foundation.libs.clearing = {
     name : 'clearing',
 
-    version: '4.3.1',
+    version: '4.3.2',
 
     settings : {
       templates : {
@@ -228,7 +228,7 @@
     },
 
     is_open : function (current) {
-      return current.parent().attr('style').length > 0;
+      return current.parent().prop('style').length > 0;
     },
 
     keydown : function (e) {

data/js/foundation/foundation.dropdown.js

@@ -6,7 +6,7 @@
   Foundation.libs.dropdown = {
     name : 'dropdown',
 
-    version : '4.3.0',
+    version : '4.3.2',
 
     settings : {
       activeClass: 'open',
@@ -60,10 +60,12 @@
       $(document).on('click.fndtn.dropdown', function (e) {
         var parent = $(e.target).closest('[data-dropdown-content]');
 
-        if ($(e.target).data('dropdown')) {
+        if ($(e.target).data('dropdown') || $(e.target).parent().data('dropdown')) {
           return;
         }
-        if (parent.length > 0 && ($(e.target).is('[data-dropdown-content]') || $.contains(parent.first()[0], e.target))) {
+        if (!($(e.target).data('revealId')) && 
+          (parent.length > 0 && ($(e.target).is('[data-dropdown-content]') || 
+            $.contains(parent.first()[0], e.target)))) {
           e.stopPropagation();
           return;
         }
@@ -99,6 +101,10 @@
 
     toggle : function (target) {
       var dropdown = $('#' + target.data('dropdown'));
+      if (dropdown.length === 0) {
+        // No dropdown found, not continuing
+        return;
+      }
 
       this.close.call(this, $('[data-dropdown-content]').not(dropdown));
 
@@ -133,12 +139,12 @@
         dropdown.css({
           position : 'absolute',
           width: '95%',
-          left: '2.5%',
           'max-width': 'none',
           top: position.top + this.outerHeight(target)
         });
+        dropdown.css(Foundation.rtl ? 'right':'left', '2.5%');
       } else {
-        if (!Foundation.rtl && $(window).width() > this.outerWidth(dropdown) + target.offset().left) {
+        if (!Foundation.rtl && $(window).width() > this.outerWidth(dropdown) + target.offset().left && !this.data_options(target).align_right) {
           var left = position.left;
           if (dropdown.hasClass('right')) {
             dropdown.removeClass('right');

data/js/foundation/foundation.forms.js

@@ -4,7 +4,7 @@
   Foundation.libs.forms = {
     name : 'forms',
 
-    version: '4.3.1',
+    version: '4.3.2',
 
     cache: {},
 
@@ -33,14 +33,19 @@
     },
 
     assemble: function () {
-      $('form.custom input[type="radio"]', $(this.scope))
-        .not('[data-customforms="disabled"]')
-        .not('.' + this.settings.disable_class)
-        .each(this.append_custom_markup);
-      $('form.custom input[type="checkbox"]', $(this.scope))
+
+      var forms = this;
+
+      $('form.custom input[type="radio"],[type="checkbox"]', $(this.scope))
         .not('[data-customforms="disabled"]')
         .not('.' + this.settings.disable_class)
-        .each(this.append_custom_markup);
+        .each(function(idx, sel){
+          forms.set_custom_markup(sel);
+        })
+        .change(function(){
+          forms.set_custom_markup(this);
+        });
+
       $('form.custom select', $(this.scope))
         .not('[data-customforms="disabled"]')
         .not('.' + this.settings.disable_class)
@@ -165,11 +170,18 @@
       $(window).on('keydown', function (e) {
         var focus = document.activeElement,
             self = Foundation.libs.forms,
-            dropdown = $('.custom.dropdown.open');
+            dropdown = $('.custom.dropdown'),
+      select = getFirstPrevSibling(dropdown, 'select'),
+      inputs = $('input,select,textarea,button'); // Zepto-compatible jQuery(":input")
 
-        if (dropdown.length > 0) {
+        if (dropdown.length > 0 && dropdown.hasClass('open')) {
           e.preventDefault();
 
+      if (e.which === 9) {
+          $(inputs[$(inputs).index(select) + 1]).focus();
+        dropdown.removeClass('open');
+      }
+
           if (e.which === 13) {
             dropdown.find('li.selected').trigger('click');
           }
@@ -210,6 +222,15 @@
         }
       });
 
+    $(window).on('keyup', function (e) {
+          var focus = document.activeElement,
+              dropdown = $('.custom.dropdown');
+
+      if (focus === dropdown.find('.current')[0]) {
+        dropdown.find('.selector').focus().click();
+      }
+    });
+
       this.settings.init = true;
     },
 
@@ -240,7 +261,7 @@
       }.bind(this), 10);
     },
 
-    append_custom_markup: function (idx, sel) {
+    set_custom_markup: function (sel) {
       var $this = $(sel),
           type = $this.attr('type'),
           $span = $this.next('span.custom.' + type);
@@ -291,7 +312,7 @@
           $customList.append(liHtml);
 
           $currentSelect = $customSelect
-            .prepend('<a href="#" class="current">' + $selectedOption.html() + '</a>')
+            .prepend('<a href="#" class="current">' + ($selectedOption.html() || '') + '</a>')
             .find(".current");
 
           $this.after($customSelect)
@@ -369,30 +390,27 @@
       var maxWidth = 0,
           $customSelect = $select.next(),
           $options = $select.find('option'),
+          $customList = $customSelect.find('ul'),
           $listItems = $customSelect.find('li');
 
-      if ($listItems.length !== this.cache[$customSelect.data('id')] || force_refresh) {
-        $customSelect.find('ul').html('');
+      if ($options.length !== this.cache[$customSelect.data('id')] || force_refresh) {
+        $customList.html('');
 
+        // rebuild and re-populate all at once
+        var customSelectHtml = '';
         $options.each(function () {
-          var $li = $('<li>' + $(this).html() + '</li>');
-          $customSelect.find('ul').append($li);
-        });
-
-        // re-populate
-        $options.each(function (index) {
-          if (this.selected) {
-            $customSelect.find('li').eq(index).addClass('selected');
-            $customSelect.find('.current').html($(this).html());
-          }
-          if ($(this).is(':disabled')) {
-            $customSelect.find('li').eq(index).addClass('disabled');
+          var $this = $(this), thisHtml = $this.html(), thisSelected = this.selected;
+          customSelectHtml += '<li class="' + (thisSelected ? ' selected ' : '') + ($this.is(':disabled') ? ' disabled ' : '') + '">' + thisHtml + '</li>';
+          if (thisSelected) {
+            $customSelect.find('.current').html(thisHtml);
           }
         });
 
+        $customList.html(customSelectHtml);
+
         // fix width
-        $customSelect.removeAttr('style')
-          .find('ul').removeAttr('style');
+        $customSelect.removeAttr('style');
+        $customList.removeAttr('style');
         $customSelect.find('li').each(function () {
           $customSelect.addClass('open');
           if (self.outerWidth($(this)) > maxWidth) {
@@ -406,6 +424,11 @@
         this.cache[$customSelect.data('id')] = $listItems.length;
       }
     },
+    
+    refresh_custom_selection: function ($select) {
+      var selectedValue = $('option:selected', $select).text();
+      $('a.current', $select.next()).text(selectedValue);
+    },
 
     toggle_checkbox: function ($element) {
       var $input = $element.prev(),
@@ -530,4 +553,4 @@
     }
     return $();
   };
-}(Foundation.zj, this, this.document));
+}(Foundation.zj, this, this.document));

data/js/foundation/foundation.joyride.js

@@ -3,10 +3,12 @@
 (function ($, window, document, undefined) {
   'use strict';
 
+  var Modernizr = Modernizr || false;
+
   Foundation.libs.joyride = {
     name : 'joyride',
 
-    version : '4.2.2',
+    version : '4.3.2',
 
     defaults : {
       expose               : false,      // turn on or off the expose feature
@@ -121,7 +123,7 @@
           integer_settings = ['timer', 'scrollSpeed', 'startOffset', 'tipAnimationFadeSpeed', 'cookieExpires'],
           int_settings_count = integer_settings.length;
 
-      if (!this.settings.init) this.init();
+      if (!this.settings.init) this.events();
 
       // non configureable settings
       this.settings.$content_el = $this;
@@ -339,7 +341,7 @@
         return Modernizr.mq('only screen and (max-width: 767px)') || $('.lt-ie9').length > 0;
       }
 
-      return (this.settings.$window.width() < 767);
+      return ($(window).width() < 767);
     },
 
     hide : function () {
@@ -605,7 +607,7 @@
         zIndex: el.css('z-index'),
         position: el.css('position')
       };
-      
+
       origClasses = el.attr('class') == null ? '' : el.attr('class');
 
       el.css('z-index',parseInt(expose.css('z-index'))+1);
@@ -684,7 +686,7 @@
           el.css('position', origCSS.position);
         }
       }
-      
+
       origClasses = el.data('orig-class');
       el.attr('class', origClasses);
       el.removeData('orig-classes');

data/js/foundation/foundation.js

@@ -38,6 +38,10 @@ if (typeof jQuery === "undefined" &&
     https://github.com/paulirish/matchMedia.js
   */
 
+   $('head').append('<meta class="foundation-mq-small">');
+   $('head').append('<meta class="foundation-mq-medium">');
+   $('head').append('<meta class="foundation-mq-large">');
+
   window.matchMedia = window.matchMedia || (function( doc, undefined ) {
 
     "use strict";
@@ -166,10 +170,18 @@ if (typeof jQuery === "undefined" &&
   window.Foundation = {
     name : 'Foundation',
 
-    version : '4.3.1',
+    version : '4.3.2',
 
     cache : {},
 
+    media_queries : {
+      small : $('.foundation-mq-small').css('font-family').replace(/\'/g, ''),
+      medium : $('.foundation-mq-medium').css('font-family').replace(/\'/g, ''),
+      large : $('.foundation-mq-large').css('font-family').replace(/\'/g, '')
+    },
+
+    stylesheet : $('<style></style>').appendTo('head')[0].sheet,
+
     init : function (scope, libraries, method, options, response, /* internal */ nc) {
       var library_arr,
           args = [scope, method, options, response],
@@ -385,6 +397,18 @@ if (typeof jQuery === "undefined" &&
         }
 
         return true;
+      },
+
+      addCustomRule : function(rule, media) {
+        if(media === undefined) {
+          Foundation.stylesheet.insertRule(rule, Foundation.stylesheet.cssRules.length);
+        } else {
+          var query = Foundation.media_queries[media];
+          if(query !== undefined) {
+            Foundation.stylesheet.insertRule('@media ' + 
+              Foundation.media_queries[media] + '{ ' + rule + ' }');
+          }
+        }
       }
     },
 

data/js/foundation/foundation.magellan.js

@@ -6,7 +6,7 @@
   Foundation.libs.magellan = {
     name : 'magellan',
 
-    version : '4.2.2',
+    version : '4.3.2',
 
     settings : {
       activeClass: 'active',
@@ -120,7 +120,7 @@
     },
 
     set_threshold : function () {
-      if (!this.settings.threshold) {
+      if (typeof this.settings.threshold !== 'number') {
         this.settings.threshold = (this.fixed_magellan.length > 0) ? 
           this.outerHeight(this.fixed_magellan, true) : 0;
       }
@@ -128,6 +128,7 @@
 
     off : function () {
       $(this.scope).off('.fndtn.magellan');
+      $(window).off('.fndtn.magellan');
     },
 
     reflow : function () {}

data/js/foundation/foundation.orbit.js

@@ -34,14 +34,20 @@
       }
     };
 
+    self.update_active_link = function(index) {
+      var link = $('a[data-orbit-link="'+slides_container.children().eq(index).attr('data-orbit-slide')+'"]');
+      link.parents('ul').find('[data-orbit-link]').removeClass(settings.bullets_active_class);
+      link.addClass(settings.bullets_active_class);
+    };
+
     self.build_markup = function() {
       slides_container.wrap('<div class="'+settings.container_class+'"></div>');
       container = slides_container.parent();
       slides_container.addClass(settings.slides_container_class);
       
       if (settings.navigation_arrows) {
-        container.append($('<a>').addClass(settings.prev_class).append('<span>'));
-        container.append($('<a>').addClass(settings.next_class).append('<span>'));
+        container.append($('<a href="#"><span></span></a>').addClass(settings.prev_class));
+        container.append($('<a href="#"><span></span></a>').addClass(settings.next_class));
       }
 
       if (settings.timer) {
@@ -54,7 +60,7 @@
 
       if (settings.slide_number) {
         number_container = $('<div>').addClass(settings.slide_number_class);
-        number_container.append('<span></span> of <span></span>');
+        number_container.append('<span></span> ' + settings.slide_number_text + ' <span></span>');
         container.append(number_container);
       }
 
@@ -72,6 +78,7 @@
       }
 
       self.update_slide_number(0);
+      self.update_active_link(0);
     };
 
     self._goto = function(next_idx, start_timer) {
@@ -90,10 +97,12 @@
       var next = $(slides.get(next_idx));
 
       current.css('zIndex', 2);
-      next.css('zIndex', 4).addClass('active');
+      current.removeClass(settings.active_slide_class);
+      next.css('zIndex', 4).addClass(settings.active_slide_class);
 
       slides_container.trigger('orbit:before-slide-change');
       settings.before_slide_change();
+      self.update_active_link(next_idx);
       
       var callback = function() {
         var unlock = function() {
@@ -104,7 +113,7 @@
           slides_container.trigger('orbit:after-slide-change',[{slide_number: idx, total_slides: slides.length}]);
           settings.after_slide_change(idx, slides.length);
         };
-        if (slides_container.height() != next.height()) {
+        if (slides_container.height() != next.height() && settings.variable_height) {
           slides_container.animate({'height': next.height()}, 250, 'linear', unlock);
         } else {
           unlock();
@@ -118,7 +127,7 @@
         if (dir === 'prev') {animate.prev(current, next, callback);}        
       };
 
-      if (next.height() > slides_container.height()) {
+      if (next.height() > slides_container.height() && settings.variable_height) {
         slides_container.animate({'height': next.height()}, 250, 'linear', start_animation);
       } else {
         start_animation();
@@ -149,7 +158,7 @@
     self.link_bullet = function(e) {
       var index = $(this).attr('data-orbit-slide');
       if ((typeof index === 'string') && (index = $.trim(index)) != "") {
-        self._goto(index);
+        self._goto(parseInt(index));
       }
     }
 
@@ -195,51 +204,53 @@
     self.init = function() {
       self.build_markup();
       if (settings.timer) {timer = self.create_timer(); timer.start();}
-      animate = new FadeAnimation(slides_container);
+      animate = new FadeAnimation(settings, slides_container);
       if (settings.animation === 'slide') 
-        animate = new SlideAnimation(slides_container);        
+        animate = new SlideAnimation(settings, slides_container);        
       container.on('click', '.'+settings.next_class, self.next);
       container.on('click', '.'+settings.prev_class, self.prev);
       container.on('click', '[data-orbit-slide]', self.link_bullet);
       container.on('click', self.toggle_timer);
-      container.on('touchstart.fndtn.orbit', function(e) {
-        if (!e.touches) {e = e.originalEvent;}
-        var data = {
-          start_page_x: e.touches[0].pageX,
-          start_page_y: e.touches[0].pageY,
-          start_time: (new Date()).getTime(),
-          delta_x: 0,
-          is_scrolling: undefined
-        };
-        container.data('swipe-transition', data);
-        e.stopPropagation();
-      })
-      .on('touchmove.fndtn.orbit', function(e) {
-        if (!e.touches) { e = e.originalEvent; }
-        // Ignore pinch/zoom events
-        if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
-
-        var data = container.data('swipe-transition');
-        if (typeof data === 'undefined') {data = {};}
-
-        data.delta_x = e.touches[0].pageX - data.start_page_x;
-
-        if ( typeof data.is_scrolling === 'undefined') {
-          data.is_scrolling = !!( data.is_scrolling || Math.abs(data.delta_x) < Math.abs(e.touches[0].pageY - data.start_page_y) );
-        }
-
-        if (!data.is_scrolling && !data.active) {
-          e.preventDefault();
-          var direction = (data.delta_x < 0) ? (idx+1) : (idx-1);
-          data.active = true;
-          self._goto(direction);
-        }
-      })
-      .on('touchend.fndtn.orbit', function(e) {
-        container.data('swipe-transition', {});
-        e.stopPropagation();
-      })
-      .on('mouseenter.fndtn.orbit', function(e) {
+      if (settings.swipe) {
+        container.on('touchstart.fndtn.orbit', function(e) {
+          if (!e.touches) {e = e.originalEvent;}
+          var data = {
+            start_page_x: e.touches[0].pageX,
+            start_page_y: e.touches[0].pageY,
+            start_time: (new Date()).getTime(),
+            delta_x: 0,
+            is_scrolling: undefined
+          };
+          container.data('swipe-transition', data);
+          e.stopPropagation();
+        })
+        .on('touchmove.fndtn.orbit', function(e) {
+          if (!e.touches) { e = e.originalEvent; }
+          // Ignore pinch/zoom events
+          if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
+
+          var data = container.data('swipe-transition');
+          if (typeof data === 'undefined') {data = {};}
+
+          data.delta_x = e.touches[0].pageX - data.start_page_x;
+
+          if ( typeof data.is_scrolling === 'undefined') {
+            data.is_scrolling = !!( data.is_scrolling || Math.abs(data.delta_x) < Math.abs(e.touches[0].pageY - data.start_page_y) );
+          }
+
+          if (!data.is_scrolling && !data.active) {
+            e.preventDefault();
+            var direction = (data.delta_x < 0) ? (idx+1) : (idx-1);
+            data.active = true;
+            self._goto(direction);
+          }
+        })
+        .on('touchend.fndtn.orbit', function(e) {
+          container.data('swipe-transition', {});
+          e.stopPropagation();
+        })
+      }
+      container.on('mouseenter.fndtn.orbit', function(e) {
         if (settings.timer && settings.pause_on_hover) {
           self.stop_timer();
         }
@@ -253,6 +264,9 @@
       $(document).on('click', '[data-orbit-link]', self.link_custom);
       $(window).on('resize', self.compute_dimensions);
       $(window).on('load', self.compute_dimensions);
+      $(window).on('load', function(){
+        container.prev('.preloader').css('display', 'none');
+      });
       slides_container.trigger('orbit:ready');
     };
 
@@ -307,13 +321,15 @@
     };
   };
   
-  var SlideAnimation = function(container) {
-    var duration = 400;
+  var SlideAnimation = function(settings, container) {
+    var duration = settings.animation_speed;
     var is_rtl = ($('html[dir=rtl]').length === 1);
     var margin = is_rtl ? 'marginRight' : 'marginLeft';
+    var animMargin = {};
+    animMargin[margin] = '0%';
 
     this.next = function(current, next, callback) {
-      next.animate({margin: '0%'}, duration, 'linear', function() {
+      next.animate(animMargin, duration, 'linear', function() {
         current.css(margin, '100%');
         callback();
       });
@@ -321,28 +337,30 @@
 
     this.prev = function(current, prev, callback) {
       prev.css(margin, '-100%');
-      prev.animate({margin:'0%'}, duration, 'linear', function() {
+      prev.animate(animMargin, duration, 'linear', function() {
         current.css(margin, '100%');
         callback();
       });
     };
   };
 
-  var FadeAnimation = function(container) {
-    var duration = 250;
+  var FadeAnimation = function(settings, container) {
+    var duration = settings.animation_speed;
+    var is_rtl = ($('html[dir=rtl]').length === 1);
+    var margin = is_rtl ? 'marginRight' : 'marginLeft';
 
     this.next = function(current, next, callback) {
-      next.css({'marginLeft':'0%', 'opacity':'0.01'});
+      next.css({'margin':'0%', 'opacity':'0.01'});
       next.animate({'opacity':'1'}, duration, 'linear', function() {
-        current.css('marginLeft', '100%');
+        current.css('margin', '100%');
         callback();
       });
     };
 
     this.prev = function(current, prev, callback) {
-      prev.css({'marginLeft':'0%', 'opacity':'0.01'});
+      prev.css({'margin':'0%', 'opacity':'0.01'});
       prev.animate({'opacity':'1'}, duration, 'linear', function() {
-        current.css('marginLeft', '100%');
+        current.css('margin', '100%');
         callback();
       });
     };
@@ -354,7 +372,7 @@
   Foundation.libs.orbit = {
     name: 'orbit',
 
-    version: '4.3.1',
+    version: '4.3.2',
 
     settings: {
       animation: 'slide',
@@ -365,6 +383,7 @@
       stack_on_small: false,
       navigation_arrows: true,
       slide_number: true,
+      slide_number_text: 'of',
       container_class: 'orbit-container',
       stack_on_small_class: 'orbit-stack-on-small',
       next_class: 'orbit-next',
@@ -382,6 +401,7 @@
       bullets: true,
       timer: true,
       variable_height: false,
+      swipe: true,
       before_slide_change: noop,
       after_slide_change: noop
     },