zurb-foundation 4.0.5 → 4.0.7

data/js/foundation/foundation.clearing.js

@@ -101,6 +101,7 @@
 
       $(this.scope)
         .on('touchstart.fndtn.clearing', '.visible-img', function(e) {
+          if (!e.touches) { e = e.originalEvent; }
           var data = {
                 start_page_x: e.touches[0].pageX,
                 start_page_y: e.touches[0].pageY,
@@ -113,6 +114,7 @@
           e.stopPropagation();
         })
         .on('touchmove.fndtn.clearing', '.visible-img', function(e) {
+          if (!e.touches) { e = e.originalEvent; }
           // Ignore pinch/zoom events
           if(e.touches.length > 1 || e.scale && e.scale !== 1) return;
 

data/js/foundation/foundation.dropdown.js

@@ -6,7 +6,7 @@
   Foundation.libs.dropdown = {
     name : 'dropdown',
 
-    version : '4.0.0',
+    version : '4.0.6',
 
     settings : {
       activeClass: 'open'
@@ -49,10 +49,6 @@
         }
       });
 
-      $('[data-dropdown-content]').on('click.fndtn.dropdown', function (e) {
-        e.stopPropagation();
-      });
-
       $(window).on('resize.fndtn.dropdown', self.throttle(function () {
         self.resize.call(self);
       }, 50)).trigger('resize');
@@ -63,7 +59,7 @@
     toggle : function (target, resize) {
       var dropdown = $('#' + target.data('dropdown'));
 
-      $('[data-dropdown-content]').not(dropdown).css('left', '-99999px');
+      $('[data-dropdown-content]').not(dropdown).css('left', '-99999px').removeClass(this.settings.activeClass);
 
       if (dropdown.hasClass(this.settings.activeClass)) {
         dropdown
@@ -86,7 +82,11 @@
     },
 
     css : function (dropdown, target) {
-      var offset = target.offset();
+      if (dropdown.parent()[0] === $('body')[0]) {
+        var position = target.offset();
+      } else {
+        var position = target.position();
+      }
 
       if (this.small()) {
         dropdown.css({
@@ -94,13 +94,13 @@
           width: '95%',
           left: '2.5%',
           'max-width': 'none',
-          top: offset.top + this.outerHeight(target)
+          top: position.top + this.outerHeight(target)
         });
       } else {
         dropdown.attr('style', '').css({
           position : 'absolute',
-          top: offset.top + this.outerHeight(target),
-          left: offset.left
+          top: position.top + this.outerHeight(target),
+          left: position.left
         });
       }
 

data/js/foundation/foundation.joyride.js

@@ -102,8 +102,7 @@
           int_settings_count = integer_settings.length;
 
       if (!this.settings.init) this.init();
-      $.extend(true, this.settings, this.data_options($this));
-
+      
       // non configureable settings
       this.settings.$content_el = $this;
       this.settings.body_offset = $(this.settings.tipContainer).position();
@@ -111,11 +110,6 @@
       this.settings.paused = false;
       this.settings.attempts = 0;
 
-      // Make sure that settings parsed from data_options are integers where necessary
-      for (var i = int_settings_count - 1; i >= 0; i--) {
-        this.settings[integer_settings[i]] = parseInt(this.settings[integer_settings[i]], 10);
-      }
-
       this.settings.tipLocationPatterns = {
         top: ['bottom'],
         bottom: [], // bottom should not need to be repositioned
@@ -130,9 +124,14 @@
 
       // generate the tips and insert into dom.
       if (!this.settings.cookieMonster || this.settings.cookieMonster && $.cookie(this.settings.cookieName) === null) {
-
         this.settings.$tip_content.each(function (index) {
-          self.create({$li : $(this), index : index});
+          var $this = $(this);
+          $.extend(true, self.settings, self.data_options($this));
+          // Make sure that settings parsed from data_options are integers where necessary
+          for (var i = int_settings_count - 1; i >= 0; i--) {
+            self.settings[integer_settings[i]] = parseInt(self.settings[integer_settings[i]], 10);
+          }
+          self.create({$li : $this, index : index});
         });
 
         // show first tip
@@ -191,7 +190,6 @@
     },
 
     create : function (opts) {
-      // backwards compatability with data-text attribute
       var buttonText = opts.$li.attr('data-button') || opts.$li.attr('data-text'),
         tipClass = opts.$li.attr('class'),
         $tip_content = $(this.tip_template({
@@ -222,8 +220,7 @@
 
         if (this.settings.$li.length && this.settings.$target.length > 0) {
 
-          this.settings.tipSettings = $.extend(true,
-            this.settings, this.data_options(this.settings.$li));
+          this.settings.tipSettings = $.extend(this.settings, this.data_options(this.settings.$li));
 
           this.settings.timer = parseInt(this.settings.timer, 10);
 

data/js/foundation/foundation.js

@@ -8,6 +8,25 @@
 
 /*jslint unparam: true, browser: true, indent: 2 */
 
+// Accommodate running jQuery or Zepto in noConflict() mode by
+// using an anonymous function to redefine the $ shorthand name.
+// See http://docs.jquery.com/Using_jQuery_with_Other_Libraries
+// and http://zeptojs.com/
+var libFuncName = null;
+if (typeof jQuery === "undefined" &&
+    typeof Zepto === "undefined" &&
+    typeof $ === "function") {
+    libFuncName = $;
+} else if (typeof jQuery === "function") {
+    libFuncName = jQuery;
+} else if (typeof Zepto === "function") {
+    libFuncName = Zepto;
+} else {
+    throw new TypeError();
+}
+
+(function ($) {
+
 (function () {
   // add dusty browser stuff
   if (!Array.prototype.filter) {
@@ -209,13 +228,17 @@
         };
       },
 
-      // parses dat-options attribute on page nodes and turns
+      // parses data-options attribute on page nodes and turns
       // them into an object
       data_options : function (el) {
         var opts = {}, ii, p,
             opts_arr = (el.attr('data-options') || ':').split(';'),
             opts_len = opts_arr.length;
 
+        function isNumber (o) {
+          return ! isNaN (o-0) && o !== null && o !== "" && o !== false;
+        }
+
         function trim(str) {
           if (typeof str === 'string') return $.trim(str);
           return str;
@@ -227,6 +250,7 @@
 
           if (/true/i.test(p[1])) p[1] = true;
           if (/false/i.test(p[1])) p[1] = false;
+          if (isNumber(p[1])) p[1] = parseInt(p[1], 10);
 
           if (p.length === 2) {
             opts[trim(p[0])] = trim(p[1]);
@@ -328,4 +352,6 @@
     });
   };
 
-}(this, this.document));
+}(this, this.document));
+
+})(libFuncName);

data/js/foundation/foundation.orbit.js

@@ -4,6 +4,8 @@
   Foundation.libs = Foundation.libs || {};
 
   Foundation.libs.orbit = {
+    name: 'orbit',
+
     version: '4.0.0',
 
     settings: {
@@ -29,12 +31,16 @@
 
     init: function (scope, method, options) {
       var self = this;
+      Foundation.inherit(self, 'data_options');
 
       if (typeof method === 'object') {
         $.extend(true, self.settings, method);
       }
 
-      $('[data-orbit]', scope).each($.proxy(self._init, self));
+      $('[data-orbit]', scope).each(function(idx, el) {
+        var scoped_self = $.extend(true, {}, self);
+        scoped_self._init(idx, el);
+      });
     },
 
     _container_html: function() {
@@ -88,6 +94,8 @@
           $slides_container = $(slider),
           $container = $slides_container.wrap(self._container_html()).parent(),
           $slides = $slides_container.children();
+      
+      $.extend(true, self.settings, self.data_options($slides_container));
 
       $container.append(self._prev_html());
       $container.append(self._next_html());
@@ -135,7 +143,7 @@
 
         if ($slide.length === 1) {
           self._reset_timer($slides_container, true);
-          self.goto($slides_container, $slide.index(), function() {});
+          self._goto($slides_container, $slide.index(), function() {});
         }
       });
 
@@ -143,7 +151,7 @@
         .on('click.fndtn.orbit', '[data-orbit-slide-number]', function(e) {
           e.preventDefault();
           self._reset_timer($slides_container, true);
-          self.goto($slides_container, $(e.currentTarget).data('orbit-slide-number'),function() {});
+          self._goto($slides_container, $(e.currentTarget).data('orbit-slide-number'),function() {});
         });
 
       $container
@@ -157,12 +165,12 @@
         .on('orbit:next-slide.fndtn.orbit click.fndtn.orbit', '.' + self.settings.next_class, function(e) {
           e.preventDefault();
           self._reset_timer($slides_container, true);
-          self.goto($slides_container, 'next', function() {});
+          self._goto($slides_container, 'next', function() {});
         })
         .on('orbit:prev-slide.fndtn.orbit click.fndtn.orbit', '.' + self.settings.prev_class, function(e) {
           e.preventDefault();
           self._reset_timer($slides_container, true);
-          self.goto($slides_container, 'prev', function() {});
+          self._goto($slides_container, 'prev', function() {});
         })
         .on('orbit:toggle-play-pause.fndtn.orbit click.fndtn.orbit touchstart.fndtn.orbit', '.' + self.settings.timer_container_class, function(e) {
           e.preventDefault();
@@ -209,7 +217,7 @@
             self._stop_timer($slides_container);
             var direction = (data.delta_x < 0) ? 'next' : 'prev';
             data.active = true;
-            self.goto($slides_container, direction, function() {});
+            self._goto($slides_container, direction, function() {});
           }
         })
         .on('touchend.fndtn.orbit', function(e) {
@@ -234,7 +242,7 @@
 
       var callback = function() {
         self._reset_timer($slides_container, false);
-        self.goto($slides_container, 'next', function() {
+        self._goto($slides_container, 'next', function() {
           self._start_timer($slides_container);
         });
       };
@@ -244,7 +252,7 @@
           progress_pct = ($progress.width() / $timer.width()),
           delay = self.settings.timer_speed - (progress_pct * self.settings.timer_speed);
 
-      $progress.animate({'width': '100%'}, delay, 'linear', callback).data('is-original', 'beans?');
+      $progress.animate({'width': '100%'}, delay, 'linear', callback);
       $slides_container.trigger('orbit:timer-started');
     },
 
@@ -292,7 +300,7 @@
       }
     },
 
-    goto: function($slides_container, index_or_direction, callback) {
+    _goto: function($slides_container, index_or_direction, callback) {
       var self = this,
           $container = $slides_container.parent(),
           $slides = $slides_container.children(),

data/js/foundation/foundation.reveal.js

@@ -6,7 +6,7 @@
   Foundation.libs.reveal = {
     name: 'reveal',
 
-    version : '4.0.4',
+    version : '4.0.6',
 
     locked : false,
 
@@ -44,7 +44,7 @@
       }
 
       if (typeof method != 'string') {
-        if (!this.settings.init) this.events();
+        this.events();
 
         return this.settings.init;
       } else {
@@ -56,6 +56,7 @@
       var self = this;
 
       $(this.scope)
+        .off('.fndtn.reveal')
         .on('click.fndtn.reveal', '[data-reveal-id]', function (e) {
           e.preventDefault();
           if (!self.locked) {
@@ -64,6 +65,7 @@
           }
         })
         .on('click.fndtn.reveal touchend.click.fndtn.reveal', this.close_targets(), function (e) {
+          e.preventDefault();
           if (!self.locked) {
             self.locked = true;
             self.close.call(self, $(this).closest('.reveal-modal'));
@@ -75,6 +77,8 @@
         .on('close.fndtn.reveal', '.reveal-modal', this.settings.close)
         .on('closed.fndtn.reveal', '.reveal-modal', this.settings.closed)
         .on('closed.fndtn.reveal', '.reveal-modal', this.close_video);
+
+      return true;
     },
 
     open : function (target) {

data/js/foundation/foundation.section.js

@@ -41,13 +41,15 @@
 
       $(window).on('resize.fndtn.section', self.throttle(function () {
         self.resize.call(this);
-      }, 30)).trigger('resize');
-
-      $('[data-section] .content').on('click.fndtn.section', function (e) {
-        e.stopPropagation();
-      });
+      }, 30))
+      .on('hashchange', function () {
+        if (!self.settings.toggled){
+          self.set_active_from_hash();
+          $(this).trigger('resize');
+        }
+      }).trigger('resize');
 
-      $('*, html, body').on('click.fndtn.section', function (e) {
+      $(document).on('click.fndtn.section', function (e) {
         if ($(e.target).closest('.title').length < 1) {
           $('[data-section].vertical-nav, [data-section].horizontal-nav')
             .find('section, .section')
@@ -65,6 +67,7 @@
           content = section.find('.content'),
           parent = section.closest('[data-section]'),
           self = Foundation.libs.section;
+      self.settings.toggled = true;
 
       if (!self.settings.deep_linking && content.length > 0) {
         e.preventDefault();
@@ -80,28 +83,33 @@
             .attr('style', '');
         }
       } else {
+        var prev_active_section = null,
+            title_height = self.outerHeight(section.find('.title'));
+
         if (self.small(parent) || self.settings.one_up) {
-          $this
-            .closest('[data-section]')
-            .find('section, .section')
-            .removeClass('active')
-            .attr('style', '');
+          prev_active_section = $this.closest('[data-section]').find('section.active, .section.active');
 
-          section.css('padding-top', self.outerHeight(section.find('.title')));
+          if (self.small(parent)) {
+            prev_active_section.attr('style', '');
+          } else {
+            prev_active_section.attr('style', 'visibility: hidden; padding-top: '+title_height+'px;');
+          }
         }
 
-        $('[data-section].vertical-nav, [data-section].horizontal-nav')
-            .find('section, .section')
-            .removeClass('active')
-            .attr('style', '');
-
         if (self.small(parent)) {
           section.attr('style', '');
+        } else {
+          section.css('padding-top', title_height);
         }
 
         section.addClass('active');
+        if (prev_active_section !== null) {
+          prev_active_section.removeClass('active').attr('style', '');
+        }
       }
-
+      setTimeout(function () {
+        self.settings.toggled = false;
+      }, 300);
       self.settings.callback();
     },
 
@@ -168,6 +176,10 @@
         $.extend(true, self.settings, self.data_options(section));
 
         if (hash.length > 0 && self.settings.deep_linking) {
+          section
+            .find('section, .section')
+            .attr('style', '')
+            .removeClass('active');
           section
             .find('.content[data-slug="' + hash + '"]')
             .closest('section, .section')

data/js/foundation/foundation.topbar.js

@@ -26,7 +26,7 @@
 
       if (typeof method != 'string') {
 
-        $('nav.top-bar').each(function () {
+        $('.top-bar').each(function () {
           self.settings.$w = $(window);
           self.settings.$topbar = $(this);
           self.settings.$section = self.settings.$topbar.find('section');
@@ -59,14 +59,14 @@
 
     events : function () {
       var self = this;
-
+      var offst = this.outerHeight($('.top-bar'));
       $(this.scope)
         .on('click.fndtn.topbar', '.top-bar .toggle-topbar', function (e) {
           var topbar = $(this).closest('.top-bar'),
               section = topbar.find('section, .section'),
               titlebar = topbar.children('ul').first();
 
-          if (!self.settings.$topbar.data('height')) self.largestUL();
+          if (!topbar.data('height')) self.largestUL();
 
           e.preventDefault();
 
@@ -82,6 +82,16 @@
             section.find('li.moved').removeClass('moved');
             topbar.data('index', 0);
           }
+
+          if (topbar.parent().hasClass('fixed')) {
+            topbar.parent().removeClass('fixed');
+            $('body').css('padding-top','0');
+            window.scrollTo(0);
+          } else {
+            topbar.parent().addClass('fixed');
+            $('body').css('padding-top',offst);
+          }
+
         })
 
         .on('click.fndtn.topbar', '.top-bar .has-dropdown>a', function (e) {
@@ -191,18 +201,18 @@
       if ($(klass).length > 0) {
         var distance = $(klass).length ? $(klass).offset().top: 0,
             $window = $(window);
-            var offst = this.outerHeight($('nav.top-bar'))+20;
+            var offst = this.outerHeight($('.top-bar'));
 
           $window.scroll(function() {
             if ($window.scrollTop() >= (distance)) {
-               $(klass).addClass("fixed");
-                 $('body').css('padding-top',offst);
+              $(klass).addClass("fixed");
+              $('body').css('padding-top',offst);
             }
 
-           else if ($window.scrollTop() < distance) {
+            else if ($window.scrollTop() < distance) {
               $(klass).removeClass("fixed");
               $('body').css('padding-top','0');
-           }
+            }
         });
       }
     },