locomotivecms_wagon 1.0.2 → 1.1.0

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

@@ -156,4 +156,4 @@
 		}
 	}
 
-}(this, document, Foundation.zj));
+}(this, document, Foundation.zj));

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

@@ -6,7 +6,7 @@
   Foundation.libs.reveal = {
     name: 'reveal',
 
-    version : '4.0.9',
+    version : '4.2.0',
 
     locked : false,
 
@@ -14,6 +14,7 @@
       animation: 'fadeAndPop',
       animationSpeed: 250,
       closeOnBackgroundClick: true,
+      closeOnEsc: true,
       dismissModalClass: 'close-reveal-modal',
       bgClass: 'reveal-modal-bg',
       open: function(){},
@@ -36,11 +37,12 @@
     },
 
     init : function (scope, method, options) {
-      this.scope = scope || this.scope;
       Foundation.inherit(this, 'data_options delay');
 
       if (typeof method === 'object') {
         $.extend(true, this.settings, method);
+      } else if (typeof options !== 'undefined') {
+        $.extend(true, this.settings, options);
       }
 
       if (typeof method != 'string') {
@@ -59,14 +61,30 @@
         .off('.fndtn.reveal')
         .on('click.fndtn.reveal', '[data-reveal-id]', function (e) {
           e.preventDefault();
+
           if (!self.locked) {
+            var element = $(this),
+                ajax = element.data('reveal-ajax');
+
             self.locked = true;
-            self.open.call(self, $(this));
+
+            if (typeof ajax === 'undefined') {
+              self.open.call(self, element);
+            } else {
+              var url = ajax === true ? element.attr('href') : ajax;
+
+              self.open.call(self, element, {url: url});
+            }
           }
         })
         .on('click.fndtn.reveal touchend.click.fndtn.reveal', this.close_targets(), function (e) {
           e.preventDefault();
           if (!self.locked) {
+            var settings = $.extend({}, self.settings, self.data_options($('.reveal-modal.open')));
+            if ($(e.target)[0] === $('.' + settings.bgClass)[0] && !settings.closeOnBackgroundClick) {
+              return;
+            }
+
             self.locked = true;
             self.close.call(self, $(this).closest('.reveal-modal'));
           }
@@ -78,12 +96,26 @@
         .on('closed.fndtn.reveal', '.reveal-modal', this.settings.closed)
         .on('closed.fndtn.reveal', '.reveal-modal', this.close_video);
 
+      $( 'body' ).bind( 'keyup.reveal', function ( event ) {
+        var open_modal = $('.reveal-modal.open'),
+            settings = $.extend({}, self.settings, self.data_options(open_modal));
+        if ( event.which === 27  && settings.closeOnEsc) { // 27 is the keycode for the Escape key
+          open_modal.foundation('reveal', 'close');
+        }
+      });
+
       return true;
     },
 
-    open : function (target) {
+    open : function (target, ajax_settings) {
       if (target) {
-        var modal = $('#' + target.data('reveal-id'));
+        if (typeof target.selector !== 'undefined') {
+          var modal = $('#' + target.data('reveal-id'));
+        } else {
+          var modal = $(this.scope);
+
+          ajax_settings = target;
+        }
       } else {
         var modal = $(this.scope);
       }
@@ -101,14 +133,36 @@
         if (open_modal.length < 1) {
           this.toggle_bg(modal);
         }
-        this.hide(open_modal, this.settings.css.open);
-        this.show(modal, this.settings.css.open);
+
+        if (typeof ajax_settings === 'undefined' || !ajax_settings.url) {
+          this.hide(open_modal, this.settings.css.close);
+          this.show(modal, this.settings.css.open);
+        } else {
+          var self = this,
+              old_success = typeof ajax_settings.success !== 'undefined' ? ajax_settings.success : null;
+
+          $.extend(ajax_settings, {
+            success: function (data, textStatus, jqXHR) {
+              if ( $.isFunction(old_success) ) {
+                old_success(data, textStatus, jqXHR);
+              }
+
+              modal.html(data);
+              $(modal).foundation('section', 'reflow');
+
+              self.hide(open_modal, self.settings.css.close);
+              self.show(modal, self.settings.css.open);
+            }
+          });
+
+          $.ajax(ajax_settings);
+        }
       }
     },
 
     close : function (modal) {
 
-      var modal = modal || $(this.scope),
+      var modal = modal && modal.length ? modal : $(this.scope),
           open_modals = $('.reveal-modal.open');
 
       if (open_modals.length > 0) {
@@ -132,7 +186,7 @@
     toggle_bg : function (modal) {
       if ($('.reveal-modal-bg').length === 0) {
         this.settings.bg = $('<div />', {'class': this.settings.bgClass})
-          .insertAfter(modal);
+          .appendTo('body');
       }
 
       if (this.settings.bg.filter(':visible').length > 0) {
@@ -150,7 +204,7 @@
           var end_css = {
             top: $(window).scrollTop() + el.data('css-top') + 'px',
             opacity: 1
-          }
+          };
 
           return this.delay(function () {
             return el
@@ -238,7 +292,7 @@
       if (iframe.length > 0) {
         iframe.attr('data-src', iframe[0].src);
         iframe.attr('src', 'about:blank');
-        video.fadeOut(100).hide();
+        video.hide();
       }
     },
 
@@ -250,8 +304,12 @@
         var data_src = iframe.attr('data-src');
         if (typeof data_src === 'string') {
           iframe[0].src = iframe.attr('data-src');
+        } else {
+          var src = iframe[0].src;
+          iframe[0].src = undefined;
+          iframe[0].src = src;
         }
-        video.show().fadeIn(100);
+        video.show();
       }
     },
 
@@ -265,6 +323,8 @@
 
     off : function () {
       $(this.scope).off('.fndtn.reveal');
-    }
+    },
+
+    reflow : function () {}
   };
-}(Foundation.zj, this, this.document));
+}(Foundation.zj, this, this.document));

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

@@ -6,19 +6,27 @@
   Foundation.libs.section = {
     name: 'section',
 
-    version : '4.0.9',
+    version : '4.2.0',
 
     settings : {
       deep_linking: false,
       one_up: true,
+      section_selector : '[data-section]',
+      region_selector : 'section, .section, [data-section-region]',
+      title_selector : '.title, [data-section-title]',
+      active_region_selector : 'section.active, .section.active, .active[data-section-region]',
+      content_selector : '.content, [data-section-content]',
+      nav_selector : '[data-section="vertical-nav"], [data-section="horizontal-nav"]',
       callback: function (){}
     },
 
     init : function (scope, method, options) {
       var self = this;
+      Foundation.inherit(this, 'throttle data_options position_right offset_right');
 
-      this.scope = scope || this.scope;
-      Foundation.inherit(this, 'throttle data_options');
+      if (typeof method === 'object') {
+        $.extend(true, self.settings, method);
+      }
 
       if (typeof method != 'string') {
         this.set_active_from_hash();
@@ -34,11 +42,14 @@
       var self = this;
 
       $(this.scope)
-        .on('click.fndtn.section', '[data-section] .title', function (e) {
+        .on('click.fndtn.section', '[data-section] .title, [data-section] [data-section-title]', function (e) {
           var $this = $(this),
-              section = $this.closest('[data-section]');
+              section = $this.closest(self.settings.region_selector);
 
-          self.toggle_active.call(this, e, self);
+          if (section.children(self.settings.content_selector).length > 0) {
+            self.toggle_active.call(this, e, self);
+            self.reflow();
+          }
         });
 
       $(window)
@@ -54,9 +65,9 @@
 
       $(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')
+          if ($(e.target).closest(self.settings.title_selector).length < 1) {
+            $(self.settings.nav_selector)
+              .children(self.settings.region_selector)
               .removeClass('active')
               .attr('style', '');
           }
@@ -66,11 +77,13 @@
 
     toggle_active : function (e, self) {
       var $this = $(this),
-          section = $this.closest('section, .section'),
-          content = section.find('.content'),
-          parent = section.closest('[data-section]'),
           self = Foundation.libs.section,
-          settings = $.extend({}, self.settings, self.data_options(parent));
+          region = $this.closest(self.settings.region_selector),
+          content = $this.siblings(self.settings.content_selector),
+          parent = region.parent(),
+          settings = $.extend({}, self.settings, self.data_options(parent)),
+          prev_active_section = parent
+            .children(self.settings.active_region_selector);
 
       self.settings.toggled = true;
 
@@ -78,39 +91,60 @@
         e.preventDefault();
       }
 
-      if (section.hasClass('active')) {
+      if (region.hasClass('active')) {
+        // this is causing the style flash.
         if (self.small(parent)
-          || self.is_vertical(parent)
-          || self.is_horizontal(parent)
+          || self.is_vertical_nav(parent)
+          || self.is_horizontal_nav(parent)
           || self.is_accordion(parent)) {
-          section
-            .removeClass('active')
-            .attr('style', '');
+            if (prev_active_section[0] !== region[0]
+              || (prev_active_section[0] === region[0] && !settings.one_up)) {
+              region
+                .removeClass('active')
+                .attr('style', '');
+            }
         }
       } else {
-        var prev_active_section = null,
-            title_height = self.outerHeight(section.find('.title'));
+        var prev_active_section = parent
+              .children(self.settings.active_region_selector),
+            title_height = self.outerHeight(region
+              .children(self.settings.title_selector));
 
         if (self.small(parent) || settings.one_up) {
-          prev_active_section = $this.closest('[data-section]').find('section.active, .section.active');
 
           if (self.small(parent)) {
             prev_active_section.attr('style', '');
           } else {
-            prev_active_section.attr('style', 'visibility: hidden; padding-top: '+title_height+'px;');
+            prev_active_section.attr('style',
+              'visibility: hidden; padding-top: '+title_height+'px;');
           }
         }
 
         if (self.small(parent)) {
-          section.attr('style', '');
+          region.attr('style', '');
         } else {
-          section.css('padding-top', title_height);
+          region.css('padding-top', title_height);
+        }
+
+        region.addClass('active');
+
+        if (prev_active_section.length > 0) {
+          prev_active_section
+            .removeClass('active')
+            .attr('style', '');
         }
 
-        section.addClass('active');
+        // Toggle the content display attribute. This is done to
+        // ensure accurate outerWidth measurements that account for
+        // the scrollbar.
+        if (self.is_vertical_tabs(parent)) {
+          content.css('display', 'block');
 
-        if (prev_active_section !== null) {
-          prev_active_section.removeClass('active').attr('style', '');
+          if (prev_active_section !== null) {
+            prev_active_section
+              .children(self.settings.content_selector)
+              .css('display', 'none');
+          }
         }
       }
 
@@ -122,12 +156,13 @@
     },
 
     resize : function () {
-      var sections = $('[data-section]'),
-          self = Foundation.libs.section;
+      var self = Foundation.libs.section,
+          sections = $(self.settings.section_selector);
 
       sections.each(function() {
         var $this = $(this),
-            active_section = $this.find('section.active, .section.active'),
+            active_section = $this
+              .children(self.settings.active_region_selector),
             settings = $.extend({}, self.settings, self.data_options($this));
 
         if (active_section.length > 1) {
@@ -136,29 +171,35 @@
             .removeClass('active')
             .attr('style', '');
         } else if (active_section.length < 1
-          && !self.is_vertical($this)
-          && !self.is_horizontal($this)
+          && !self.is_vertical_nav($this)
+          && !self.is_horizontal_nav($this)
           && !self.is_accordion($this)) {
 
-          var first = $this.find('section, .section').first();
-          first.addClass('active');
+          var first = $this.children(self.settings.region_selector).first();
+
+          if (settings.one_up || !self.small($this)) {
+            first.addClass('active');
+          }
 
           if (self.small($this)) {
             first.attr('style', '');
           } else {
-            first.css('padding-top', self.outerHeight(first.find('.title')));
+            first.css('padding-top', self.outerHeight(first
+              .children(self.settings.title_selector)));
           }
         }
 
         if (self.small($this)) {
           active_section.attr('style', '');
         } else {
-          active_section.css('padding-top', self.outerHeight(active_section.find('.title')));
+          active_section.css('padding-top', self.outerHeight(active_section
+            .children(self.settings.title_selector)));
         }
 
         self.position_titles($this);
 
-        if (self.is_horizontal($this) && !self.small($this)) {
+        if ( (self.is_horizontal_nav($this) && !self.small($this))
+          || self.is_vertical_tabs($this) && !self.small($this)) {
           self.position_content($this);
         } else {
           self.position_content($this, false);
@@ -166,11 +207,11 @@
       });
     },
 
-    is_vertical : function (el) {
+    is_vertical_nav : function (el) {
       return /vertical-nav/i.test(el.data('section'));
     },
 
-    is_horizontal : function (el) {
+    is_horizontal_nav : function (el) {
       return /horizontal-nav/i.test(el.data('section'));
     },
 
@@ -178,35 +219,55 @@
       return /accordion/i.test(el.data('section'));
     },
 
-    is_tabs : function (el) {
-      return /tabs/i.test(el.data('section'));
+    is_horizontal_tabs : function (el) {
+      return /^tabs$/i.test(el.data('section'));
+    },
+
+    is_vertical_tabs : function (el) {
+      return /vertical-tabs/i.test(el.data('section'));
     },
 
     set_active_from_hash : function () {
       var hash = window.location.hash.substring(1),
           sections = $('[data-section]'),
           self = this;
-
       sections.each(function () {
         var section = $(this),
             settings = $.extend({}, self.settings, self.data_options(section));
 
         if (hash.length > 0 && settings.deep_linking) {
-          section
-            .find('section, .section')
+          var regions = section
+            .children(self.settings.region_selector)
             .attr('style', '')
             .removeClass('active');
-          section
-            .find('.content[data-slug="' + hash + '"]')
-            .closest('section, .section')
-            .addClass('active');
+
+          var hash_regions = regions.map(function () {
+              var content = $(self.settings.content_selector, this),
+                  content_slug = content.data('slug');
+
+              if (new RegExp(content_slug, 'i').test(hash)) 
+                return content;
+            });
+
+
+          var count = hash_regions.length;
+
+          for (var i = count - 1; i >= 0; i--) {
+            $(hash_regions[i]).parent().addClass('active');
+          }
         }
       });
     },
 
     position_titles : function (section, off) {
-      var titles = section.find('.title'),
+      var self = this,
+          titles = section
+            .children(this.settings.region_selector)
+            .map(function () {
+              return $(this).children(self.settings.title_selector);
+            }),
           previous_width = 0,
+          previous_height = 0,
           self = this;
 
       if (typeof off === 'boolean') {
@@ -214,41 +275,124 @@
 
       } else {
         titles.each(function () {
-          $(this).css('left', previous_width);
-          previous_width += self.outerWidth($(this));
+          if (self.is_vertical_tabs(section)) {
+            $(this).css('top', previous_height);
+            previous_height += self.outerHeight($(this));
+          } else {
+            if (!self.rtl) {
+              $(this).css('left', previous_width);
+            } else {
+              $(this).css('right', previous_width);
+            }
+            previous_width += self.outerWidth($(this));
+          }
         });
       }
     },
 
     position_content : function (section, off) {
-      var titles = section.find('.title'),
-          content = section.find('.content'),
-          self = this;
+      var self = this,
+          regions = section.children(self.settings.region_selector),
+          titles = regions
+            .map(function () {
+              return $(this).children(self.settings.title_selector);
+            }),
+          content = regions
+            .map(function () {
+              return $(this).children(self.settings.content_selector);
+            });
 
       if (typeof off === 'boolean') {
         content.attr('style', '');
         section.attr('style', '');
       } else {
-        section.find('section, .section').each(function () {
-          var title = $(this).find('.title'),
-              content = $(this).find('.content');
+        if (self.is_vertical_tabs(section)
+            && !self.small(section)) {
+          var content_min_height = 0,
+              content_min_width = Number.MAX_VALUE,
+              title_width = null;
+
+          regions.each(function () {
+            var region = $(this),
+                title = region.children(self.settings.title_selector),
+                content = region.children(self.settings.content_selector),
+                content_width = 0;
+
+            title_width = self.outerWidth(title);
+            content_width = self.outerWidth(section) - title_width;
+
+            if (content_width < content_min_width) {
+              content_min_width = content_width;
+            }
+
+            // Increment the minimum height of the content region
+            // to align with the height of the titles.
+            content_min_height += self.outerHeight(title);
+
+            // Set all of the inactive tabs to 'display: none'
+            // The CSS sets all of the tabs as 'display: block'
+            // in order to account for scrollbars when measuring the width
+            // of the content regions.
+            if (!$(this).hasClass('active')) {
+              content.css('display', 'none');
+            }
+          });
+
+          regions.each(function () {
+            var content = $(this).children(self.settings.content_selector);
+            content.css('minHeight', content_min_height);
+
+            // Remove 2 pixels to account for the right-shift in the CSS
+            content.css('maxWidth', content_min_width - 2);
+          });
 
-          content.css({left: title.position().left - 1, top: self.outerHeight(title) - 2});
-        });
-
-        // temporary work around for Zepto outerheight calculation issues.
-        if (typeof Zepto === 'function') {
-          section.height(this.outerHeight(titles.first()));
         } else {
-          section.height(this.outerHeight(titles.first()) - 2);
+          regions.each(function () {
+            var region = $(this),
+                title = region.children(self.settings.title_selector),
+                content = region.children(self.settings.content_selector);
+            if (!self.rtl) {
+              content
+                .css({left: title.position().left - 1,
+                  top: self.outerHeight(title) - 2});
+            } else {
+              content
+                .css({right: self.position_right(title) + 1,
+                  top: self.outerHeight(title) - 2});
+            }
+          });
+
+          // temporary work around for Zepto outerheight calculation issues.
+          if (typeof Zepto === 'function') {
+            section.height(this.outerHeight($(titles[0])));
+          } else {
+            section.height(this.outerHeight($(titles[0])) - 2);
+          }
         }
       }
+    },
+
+    position_right : function (el) {
+      var self = this,
+          section = el.closest(this.settings.section_selector),
+          regions = section.children(this.settings.region_selector),
+          section_width = el.closest(this.settings.section_selector).width(),
+          offset = regions
+            .map(function () {
+              return $(this).children(self.settings.title_selector);
+            }).length;
+      return (section_width - el.position().left - el.width() * (el.index() + 1) - offset);
+    },
 
+    reflow : function (scope) {
+      var scope = scope || document;
+      $(this.settings.section_selector, scope).trigger('resize');
     },
 
     small : function (el) {
       var settings = $.extend({}, this.settings, this.data_options(el));
-      if (this.is_tabs(el)) {
+
+      if (this.is_horizontal_tabs(el)) {
         return false;
       }
       if (el && this.is_accordion(el)) {