locomotivecms_wagon 1.3.0 → 1.3.1

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

@@ -6,10 +6,12 @@
   Foundation.libs.interchange = {
     name : 'interchange',
 
-    version : '4.2.1',
+    version : '4.2.4',
 
     cache : {},
 
+    images_loaded : false,
+
     settings : {
       load_attr : 'interchange',
 
@@ -20,22 +22,20 @@
         large : 'only screen and (min-width: 1440px)',
         landscape : 'only screen and (orientation: landscape)',
         portrait : 'only screen and (orientation: portrait)',
-        retina : 'only screen and (-webkit-min-device-pixel-ratio: 2),'
-          + 'only screen and (min--moz-device-pixel-ratio: 2),'
-          + 'only screen and (-o-min-device-pixel-ratio: 2/1),'
-          + 'only screen and (min-device-pixel-ratio: 2),'
-          + 'only screen and (min-resolution: 192dpi),'
-          + 'only screen and (min-resolution: 2dppx)'
+        retina : 'only screen and (-webkit-min-device-pixel-ratio: 2),' + 
+          'only screen and (min--moz-device-pixel-ratio: 2),' + 
+          'only screen and (-o-min-device-pixel-ratio: 2/1),' + 
+          'only screen and (min-device-pixel-ratio: 2),' + 
+          'only screen and (min-resolution: 192dpi),' + 
+          'only screen and (min-resolution: 2dppx)'
       },
 
       directives : {
-        replace : function (el, path) {
+        replace: function (el, path) {
           if (/IMG/.test(el[0].nodeName)) {
-            var path_parts = path.split('/'),
-                path_file = path_parts[path_parts.length - 1],
-                orig_path = el[0].src;
+            var orig_path = el[0].src;
 
-            if (new RegExp(path_file, 'i').test(el[0].src)) return;
+            if (new RegExp(path, 'i').test(orig_path)) return;
 
             el[0].src = path;
 
@@ -55,7 +55,7 @@
       this.events();
       this.images();
 
-      if (typeof method != 'string') {
+      if (typeof method !== 'string') {
         return this.settings.init;
       } else {
         return this[method].call(this, options);
@@ -73,6 +73,11 @@
     resize : function () {
       var cache = this.cache;
 
+      if(!this.images_loaded) {
+        setTimeout($.proxy(this.resize, this), 50);
+        return;
+      }
+
       for (var uuid in cache) {
         if (cache.hasOwnProperty(uuid)) {
           var passed = this.results(uuid, cache[uuid]);
@@ -87,18 +92,17 @@
     },
 
     results : function (uuid, scenarios) {
-      var count = scenarios.length,
-          results_arr = [];
+      var count = scenarios.length;
 
       if (count > 0) {
         var el = $('[data-uuid="' + uuid + '"]');
 
         for (var i = count - 1; i >= 0; i--) {
-          var rule = scenarios[i][2];
+          var mq, rule = scenarios[i][2];
           if (this.settings.named_queries.hasOwnProperty(rule)) {
-            var mq = matchMedia(this.settings.named_queries[rule]);
+            mq = matchMedia(this.settings.named_queries[rule]);
           } else {
-            var mq = matchMedia(scenarios[i][2]);
+            mq = matchMedia(rule);
           }
           if (mq.matches) {
             return {el: el, scenario: scenarios[i]};
@@ -120,12 +124,15 @@
     update_images : function () {
       var images = document.getElementsByTagName('img'),
           count = images.length,
+          loaded_count = 0,
           data_attr = 'data-' + this.settings.load_attr;
 
       this.cached_images = [];
+      this.images_loaded = false;
 
       for (var i = count - 1; i >= 0; i--) {
-        this.loaded($(images[i]), (i === 0), function (image, last) {
+        this.loaded($(images[i]), function (image) {
+          loaded_count++;
           if (image) {
             var str = image.getAttribute(data_attr) || '';
 
@@ -134,8 +141,10 @@
             }
           }
 
-          if (last) this.enhance();
-
+          if(loaded_count === count) {
+            this.images_loaded = true;
+            this.enhance();
+          }
         }.bind(this));
       }
 
@@ -145,9 +154,9 @@
     // based on jquery.imageready.js
     // @weblinc, @jsantell, (c) 2012
 
-    loaded : function (image, last, callback) {
+    loaded : function (image, callback) {
       function loaded () {
-        callback(image[0], last);
+        callback(image[0]);
       }
 
       function bindLoad () {
@@ -268,4 +277,4 @@
 
   };
 
-}(Foundation.zj, this, this.document));
+}(Foundation.zj, this, this.document));

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

@@ -3,10 +3,12 @@
 (function ($, window, document, undefined) {
   'use strict';
 
+  var Modernizr = Modernizr || false;
+
   Foundation.libs.joyride = {
-    name: 'joyride',
+    name : 'joyride',
 
-    version : '4.2.0',
+    version : '4.3.2',
 
     defaults : {
       expose               : false,      // turn on or off the expose feature
@@ -42,7 +44,7 @@
         expose  : '<div class="joyride-expose-wrapper"></div>',
         exposeCover: '<div class="joyride-expose-cover"></div>'
       },
-      exposeAddClass  	: ''		// One or more space-separated class names to be added to exposed element
+      exposeAddClass : '' // One or more space-separated class names to be added to exposed element
     },
 
     settings : {},
@@ -57,7 +59,7 @@
         $.extend(true, this.settings, this.defaults, options);
       }
 
-      if (typeof method != 'string') {
+      if (typeof method !== 'string') {
         if (!this.settings.init) this.events();
 
         return this.settings.init;
@@ -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 () {
@@ -350,7 +352,13 @@
       if (!this.settings.modal) {
         $('.joyride-modal-bg').hide();
       }
-      this.settings.$current_tip.hide();
+
+      // Prevent scroll bouncing...wait to remove from layout
+      this.settings.$current_tip.css('visibility', 'hidden');
+      setTimeout($.proxy(function() {
+        this.hide();
+        this.css('visibility', 'visible');
+      }, this.settings.$current_tip), 0);
       this.settings.postStepCallback(this.settings.$li.index(),
         this.settings.$current_tip);
     },
@@ -599,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);
@@ -678,7 +686,7 @@
           el.css('position', origCSS.position);
         }
       }
-      
+
       origClasses = el.data('orig-class');
       el.attr('class', origClasses);
       el.removeData('orig-classes');

data/generators/foundation/public/javascripts/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";
@@ -82,7 +86,7 @@ if (typeof jQuery === "undefined" &&
 
       var t = Object(this),
           len = t.length >>> 0;
-      if (typeof fun != "function") {
+      if (typeof fun !== "function") {
           return;
       }
 
@@ -166,10 +170,18 @@ if (typeof jQuery === "undefined" &&
   window.Foundation = {
     name : 'Foundation',
 
-    version : '4.2.0',
+    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],
@@ -231,8 +243,7 @@ if (typeof jQuery === "undefined" &&
         if (this.libs.hasOwnProperty(lib)) {
           this.patch(this.libs[lib]);
           return this.libs[lib].init.apply(this.libs[lib], args);
-        }
-        else {
+        } else {
           return function () {};
         }
       }.bind(this), lib);
@@ -267,7 +278,7 @@ if (typeof jQuery === "undefined" &&
     },
 
     random_str : function (length) {
-      var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz'.split('');
+      var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
 
       if (!length) {
         length = Math.floor(Math.random() * chars.length);
@@ -386,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 + ' }');
+          }
+        }
       }
     },
 
@@ -402,7 +425,7 @@ if (typeof jQuery === "undefined" &&
         return el.outerHeight();
       };
 
-      lib.outerWidth = function (el) {
+      lib.outerWidth = function (el, bool) {
         if (typeof Zepto === 'function') {
           return el.width();
         }
@@ -426,13 +449,7 @@ if (typeof jQuery === "undefined" &&
       return true;
     },
 
-    zj : function () {
-      if (typeof Zepto !== 'undefined') {
-        return Zepto;
-      } else {
-        return jQuery;
-      }
-    }()
+    zj : $
   };
 
   $.fn.foundation = function () {

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

@@ -6,10 +6,11 @@
   Foundation.libs.magellan = {
     name : 'magellan',
 
-    version : '4.2.0',
+    version : '4.3.2',
 
     settings : {
-      activeClass: 'active'
+      activeClass: 'active',
+      threshold: 0
     },
 
     init : function (scope, method, options) {
@@ -20,7 +21,7 @@
         $.extend(true, this.settings, method);
       }
 
-      if (typeof method != 'string') {
+      if (typeof method !== 'string') {
         if (!this.settings.init) {
           this.fixed_magellan = $("[data-magellan-expedition]");
           this.set_threshold();
@@ -79,8 +80,10 @@
             if ($expedition.data("magellan-fixed-position") != fixed_position) {
               $expedition.data("magellan-fixed-position", fixed_position);
               if (fixed_position) {
+                $expedition.addClass('fixed');
                 $expedition.css({position:"fixed", top:0});
               } else {
+                $expedition.removeClass('fixed');
                 $expedition.css({position:"", top:""});
               }
               if (fixed_position && typeof attr != 'undefined' && attr != false) {
@@ -117,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;
       }
@@ -125,8 +128,9 @@
 
     off : function () {
       $(this.scope).off('.fndtn.magellan');
+      $(window).off('.fndtn.magellan');
     },
 
     reflow : function () {}
   };
-}(Foundation.zj, this, this.document));
+}(Foundation.zj, this, this.document));