zurb-foundation 2.1.5.1 → 2.2.0.1

data/lib/foundation/generators/install_generator.rb

@@ -5,9 +5,20 @@ module Foundation
     class InstallGenerator < Rails::Generators::Base
       source_root File.join(File.dirname(__FILE__), 'templates')
       
-      def add_assets
-        insert_into_file "app/assets/javascripts/application.js", "//= require foundation\n", :after => "jquery_ujs\n"
-        insert_into_file "app/assets/stylesheets/application.css", " *= require foundation\n", :after => "require_self\n"
+      def add_assets                  
+        insert_into_file "app/assets/javascripts/application#{detect_js_format[0]}", "#{detect_js_format[1]} require foundation\n", :after => "jquery_ujs\n"
+        insert_into_file "app/assets/stylesheets/application#{detect_css_format[0]}", "#{detect_css_format[1]} require foundation\n", :after => "require_self\n"              
+      end
+      
+      def detect_js_format
+        return ['.js.coffee', '#='] if File.exist?('app/assets/javascripts/application.js.coffee')
+        return ['.js', '//='] if File.exist?('app/assets/javascripts/application.js')
+      end
+      
+      def detect_css_format
+        return ['.css', ' *='] if File.exist?('app/assets/stylesheets/application.css')
+        return ['.css.sass', ' //='] if File.exist?('app/assets/stylesheets/application.css.sass')
+        return ['.css.scss', ' //='] if File.exist?('app/assets/stylesheets/application.css.scss')
       end
     end
   end

data/lib/foundation/version.rb

@@ -1,4 +1,4 @@
 module Foundation
-  COMMIT = "bdd2174067a083abc2ab5937c1ad9c92d136a2f0"
-  VERSION = "2.1.5.1"
+  COMMIT = "897984db68d9d4093e9b6e82f1ccb3e5d6c97cd6"
+  VERSION = "2.2.0.1"
 end

data/vendor/assets/javascripts/foundation/app.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+jQuery(document).ready(function ($) {
 
 	/* Use this js doc for all application specific JS */
 
@@ -15,7 +15,7 @@ $(document).ready(function () {
 
     	//Show Tab Content
 		$(contentLocation).closest('.tabs-content').children('li').hide();
-		$(contentLocation).show();
+		$(contentLocation).css('display', 'block');
 	}
 
 	$('dl.tabs').each(function () {
@@ -44,6 +44,9 @@ $(document).ready(function () {
 
 	$('input, textarea').placeholder();
 
+	/* TOOLTIPS ------------ */
+	$(this).tooltips();
+
 
 
 	/* UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE6/7/8 SUPPORT AND ARE USING .block-grids */
@@ -70,7 +73,7 @@ $(document).ready(function () {
 	});
   if (Modernizr.touch) {
     $('.nav-bar>li.has-flyout>a.main').css({
-      'padding-right' : '75px',
+      'padding-right' : '75px'
     });
     $('.nav-bar>li.has-flyout>a.flyout-toggle').css({
       'border-left' : '1px dashed #eee'

data/vendor/assets/javascripts/foundation/jquery.customforms.js

@@ -33,7 +33,17 @@ jQuery(document).ready(function ($) {
         $li;
 
     if ($customSelect.length === 0) {
-      $customSelect = $('<div class="custom dropdown"><a href="#" class="selector"></a><ul></ul></div>"');
+      $customSelectSize = '';
+      if ($(sel).hasClass('small')) {
+      	$customSelectSize = 'small';
+      } else if ($(sel).hasClass('medium')) {
+      	$customSelectSize = 'medium';
+      } else if ($(sel).hasClass('large')) {
+      	$customSelectSize = 'large';
+      } else if ($(sel).hasClass('expand')) {
+      	$customSelectSize = 'expand';
+      }
+      $customSelect = $('<div class="custom dropdown ' + $customSelectSize + '"><a href="#" class="selector"></a><ul></ul></div>"');
       $options.each(function () {
         $li = $('<li>' + $(this).html() + '</li>');
         $customSelect.find('ul').append($li);
@@ -68,8 +78,11 @@ jQuery(document).ready(function ($) {
       }
       $customSelect.removeClass('open');
     });
-    $customSelect.css('width', maxWidth + 18 + 'px');
-    $customSelect.find('ul').css('width', maxWidth + 16 + 'px');
+    
+    if (!$customSelect.is('.small, .medium, .large, .expand')) {
+      $customSelect.css('width', maxWidth + 18 + 'px');
+      $customSelect.find('ul').css('width', maxWidth + 16 + 'px');
+    }
 
   }
 

data/vendor/assets/javascripts/foundation/jquery.orbit-1.4.0.js

@@ -27,6 +27,8 @@
       startClockOnMouseOut: false, 		// if clock should start on MouseOut
       startClockOnMouseOutAfter: 1000, 	// how long after MouseOut should the timer start again
       directionalNav: true, 				// manual advancing directional navs
+      directionalNavRightText: 'Right', // text of right directional element for accessibility
+      directionalNavLeftText: 'Left', // text of left directional element for accessibility
       captions: true, 					// do you want captions?
       captionAnimation: 'fade', 			// fade, slideOpen, none
       captionAnimationSpeed: 600, 		// if so how quickly should they animate in
@@ -48,7 +50,7 @@
     wrapperHTML: '<div class="orbit-wrapper" />',
     timerHTML: '<div class="timer"><span class="mask"><span class="rotator"></span></span><span class="pause"></span></div>',
     captionHTML: '<div class="orbit-caption"></div>',
-    directionalNavHTML: '<div class="slider-nav"><span class="right">Right</span><span class="left">Left</span></div>',
+    directionalNavHTML: '<div class="slider-nav"><span class="right"></span><span class="left"></span></div>',
     bulletHTML: '<ul class="orbit-bullets"></ul>',
     
     init: function (element, options) {
@@ -355,9 +357,13 @@
     },
     
     setupDirectionalNav: function () {
-      var self = this;
+      var self = this,
+          $directionalNav = $(this.directionalNavHTML);
+      
+      $directionalNav.find('.right').html(this.options.directionalNavRightText);
+      $directionalNav.find('.left').html(this.options.directionalNavLeftText);
 
-      this.$wrapper.append(this.directionalNavHTML);
+      this.$wrapper.append($directionalNav);
       
       this.$wrapper.find('.left').click(function () { 
         self.stopClock();

data/vendor/assets/javascripts/foundation/jquery.reveal.js

@@ -5,7 +5,7 @@
  * Free to use under the MIT license.
  * http://www.opensource.org/licenses/mit-license.php
 */
-
+/*globals jQuery */
 
 (function ($) {
   $('a[data-reveal-id]').live('click', function (event) {
@@ -19,109 +19,136 @@
       animation: 'fadeAndPop',                // fade, fadeAndPop, none
       animationSpeed: 300,                    // how fast animtions are
       closeOnBackgroundClick: true,           // if you click background will modal close?
-      dismissModalClass: 'close-reveal-modal' // the class of a button or element that will close an open modal
+      dismissModalClass: 'close-reveal-modal', // the class of a button or element that will close an open modal
+      open: $.noop,
+      opened: $.noop,
+      close: $.noop,
+      closed: $.noop
     };
-    var options = $.extend({}, defaults, options);
+    options = $.extend({}, defaults, options);
 
     return this.each(function () {
       var modal    = $(this),
-        topMeasure = parseInt(modal.css('top')),
+        topMeasure = parseInt(modal.css('top'), 10),
         topOffset  = modal.height() + topMeasure,
         locked     = false,
-        modalBg    = $('.reveal-modal-bg');
+        modalBg    = $('.reveal-modal-bg'),
+        closeButton;
 
-      if (modalBg.length == 0) {
+      if (modalBg.length === 0) {
         modalBg = $('<div class="reveal-modal-bg" />').insertAfter(modal);
         modalBg.fadeTo('fast', 0.8);
       }
+      
+      function unlockModal() {
+        locked = false;
+      }
+
+      function lockModal() {
+        locked = true;
+      }
 
       function openAnimation() {
-        modalBg.unbind('click.modalEvent');
-        $('.' + options.dismissModalClass).unbind('click.modalEvent');
         if (!locked) {
           lockModal();
-          if (options.animation == "fadeAndPop") {
+          if (options.animation === "fadeAndPop") {
             modal.css({'top': $(document).scrollTop() - topOffset, 'opacity': 0, 'visibility': 'visible'});
             modalBg.fadeIn(options.animationSpeed / 2);
             modal.delay(options.animationSpeed / 2).animate({
               "top": $(document).scrollTop() + topMeasure + 'px',
               "opacity": 1
-            }, options.animationSpeed, unlockModal);
+            }, options.animationSpeed, function () {
+              modal.trigger('reveal:opened');
+            });
+
           }
-          if (options.animation == "fade") {
+          if (options.animation === "fade") {
             modal.css({'opacity': 0, 'visibility': 'visible', 'top': $(document).scrollTop() + topMeasure});
             modalBg.fadeIn(options.animationSpeed / 2);
             modal.delay(options.animationSpeed / 2).animate({
               "opacity": 1
-            }, options.animationSpeed, unlockModal);
+            }, options.animationSpeed, function () {
+              modal.trigger('reveal:opened');
+            });
+
           }
-          if (options.animation == "none") {
+          if (options.animation === "none") {
             modal.css({'visibility': 'visible', 'top': $(document).scrollTop() + topMeasure});
             modalBg.css({"display": "block"});
-            unlockModal();
+            modal.trigger('reveal:opened');
           }
         }
-        modal.unbind('reveal:open', openAnimation);
       }
-      modal.bind('reveal:open', openAnimation);
+      modal.bind('reveal:open.reveal', openAnimation);
 
       function closeAnimation() {
         if (!locked) {
           lockModal();
-          if (options.animation == "fadeAndPop") {
-            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed);
+          if (options.animation === "fadeAndPop") {
             modal.animate({
               "top":  $(document).scrollTop() - topOffset + 'px',
               "opacity": 0
             }, options.animationSpeed / 2, function () {
               modal.css({'top': topMeasure, 'opacity': 1, 'visibility': 'hidden'});
-              unlockModal();
+            });
+            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed, function () {
+              modal.trigger('reveal:closed');
             });
           }
-          if (options.animation == "fade") {
-            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed);
+          if (options.animation === "fade") {
             modal.animate({
               "opacity" : 0
             }, options.animationSpeed, function () {
               modal.css({'opacity': 1, 'visibility': 'hidden', 'top': topMeasure});
-              unlockModal();
+            });
+            modalBg.delay(options.animationSpeed).fadeOut(options.animationSpeed, function () {
+              modal.trigger('reveal:closed');
             });
           }
-          if (options.animation == "none") {
+          if (options.animation === "none") {
             modal.css({'visibility': 'hidden', 'top': topMeasure});
             modalBg.css({'display': 'none'});
+            modal.trigger('reveal:closed');
           }
         }
-        modal.unbind('reveal:close', closeAnimation);
       }
-      modal.bind('reveal:close', closeAnimation);
+
+      function destroy() {
+        modal.unbind('.reveal');
+        modalBg.unbind('.reveal');
+        $('.' + options.dismissModalClass).unbind('.reveal');
+        $('body').unbind('.reveal');
+      }
+
+      modal.bind('reveal:close.reveal', closeAnimation);
+      modal.bind('reveal:opened.reveal reveal:closed.reveal', unlockModal);
+      modal.bind('reveal:closed.reveal', destroy);
+      
+      modal.bind('reveal:open.reveal', options.open);
+      modal.bind('reveal:opened.reveal', options.opened);
+      modal.bind('reveal:close.reveal', options.close);
+      modal.bind('reveal:closed.reveal', options.closed);
+      
       modal.trigger('reveal:open');
 
-      var closeButton = $('.' + options.dismissModalClass).bind('click.modalEvent', function () {
+      closeButton = $('.' + options.dismissModalClass).bind('click.reveal', function () {
         modal.trigger('reveal:close');
       });
 
       if (options.closeOnBackgroundClick) {
         modalBg.css({"cursor": "pointer"});
-        modalBg.bind('click.modalEvent', function () {
+        modalBg.bind('click.reveal', function () {
           modal.trigger('reveal:close');
         });
       }
 
-      $('body').keyup(function (event) {
+      $('body').bind('keyup.reveal', function (event) {
         if (event.which === 27) { // 27 is the keycode for the Escape key
           modal.trigger('reveal:close');
         }
       });
-
-      function unlockModal() {
-        locked = false;
-      }
-
-      function lockModal() {
-        locked = true;
-      }
     });
   };
-})(jQuery);
+} (jQuery));
+
 

data/vendor/assets/javascripts/foundation/jquery.tooltips.js

@@ -1,46 +1,87 @@
-$(document).ready(function () {
-/* TOOLTIPS ---------- */
-  /* Positiong and options for adding tooltips */
+/*
+ * jQuery Foundation Tooltip Plugin 1.0
+ * http://foundation.zurb.com
+ * Copyright 2012, ZURB
+ * Free to use under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+*/
+
+;(function($) {
+  var attributes = {
+    bodyHeight : 0,
+    pollInterval : 1000
+  };
+
+  var methods = {
+    init : function( options ) { 
+
+      return this.each(function() {    
+        var targets = $('.has-tip'),
+        tips = $('.tooltip'),
+        tipTemplate = function(target, content) {
+          return '<span data-id="' + target + '" class="tooltip">' + content + '<span class="nub"></span></span>';
+        },
+        poll = setInterval(methods.isDomResized, attributes.pollInterval);
+        if (tips.length < 1) {
+          targets.each(function(i){
+            var target = $(this),
+            id = 'foundationTooltip' + i,
+            content = target.attr('title'),
+            classes = target.attr('class');
+            target.data('id', id);
+            var tip = $(tipTemplate(id, content));
+            tip.addClass(classes).removeClass('has-tip').appendTo('body');
+            if (Modernizr.touch) {
+              tip.append('<span class="tap-to-close">tap to close </span>');
+            }
+            methods.reposition(target, tip, classes);
+            tip.fadeOut(150);
+          });
+        }
+        $(window).resize(function() {
+          var tips = $('.tooltip');
+          tips.each(function() {
+            var data = $(this).data();
+            target = targets = $('.has-tip'),
+            tip = $(this),
+            classes = tip.attr('class');
+            targets.each(function() {
+              ($(this).data().id == data.id) ? target = $(this) : target = target;
+            });
+            methods.reposition(target, tip, classes);
+          });
+            
+        });
+
+        if (Modernizr.touch) {
+          $('.tooltip').live('click touchstart touchend', function(e) {
+            e.preventDefault();
+            $(this).fadeOut(150);
+          });
+          targets.live('click touchstart touchend', function(e){
+            e.preventDefault();
+            $('.tooltip').hide();
+            $('span[data-id=' + $(this).data('id') + '].tooltip').fadeIn(150);
+            targets.attr('title', "");
+          });
+
+        } else {
+          targets.hover(function() {
+            $('span[data-id=' + $(this).data('id') + '].tooltip').fadeIn(150);
+            targets.attr('title', "");
+          }, function() {
+            $('span[data-id=' + $(this).data('id') + '].tooltip').fadeOut(150);
+          }); 
+        }
 
-  function foundationTooltipsInit() {
-    var targets = $('.has-tip'),
-    tipTemplate = function(target, content) {
-      return '<span data-id="' + target + '" class="tooltip">' + content + '<span class="nub"></span></span>';
-    };
-    targets.each(function(){
-      var target = $(this),
-      content = target.attr('title'),
-      classes = target.attr('class'),
-      id = target.attr('id'),
-      tip = $(tipTemplate(id, content));
-      tip.addClass(classes).removeClass('has-tip').appendTo('body');
-      reposition(target, tip, classes);
-      tip.hide();
-      if (Modernizr.touch) {
-        tip.append('<span class="tap-to-close">tap to close </span>');
-      }
-    });
-    $(window).resize(function() {
-      var tips = $('.tooltip');
-      tips.each(function() {
-        var target = $('#' + $(this).data('id')),
-        tip = $(this),
-        classes = tip.attr('class');
-        reposition(target, tip, classes);
       });
-        
-    });
-    
-    function reposition(target, tip, classes) {
+    },
+    reposition : function(target, tip, classes) {
       var width = target.data('width'),
       nub = tip.children('.nub'),
       nubHeight = nub.outerHeight(),
       nubWidth = nub.outerWidth();
-      tip.css({
-        'top' : (target.offset().top + target.outerHeight() + 10),
-        'left' : target.offset().left,
-        'width' : width
-      });
+      
       function nubPos(nub, top, right, bottom, left) {
         nub.css({
           'top' : top,
@@ -49,54 +90,64 @@ $(document).ready(function () {
           'right' : right
         });
       }
+
+      tip.css({
+        'top' : (target.offset().top + target.outerHeight() + 10),
+        'left' : target.offset().left,
+        'width' : width
+      });
       nubPos(nub, -nubHeight, 'auto', 'auto', 10);
+
       if ($(window).width() < 767) {
         var row = target.parents('.row');
-        tip.width(row.outerWidth() - 20).css('left', row.offset().left);
+        tip.width(row.outerWidth() - 20).css('left', row.offset().left).addClass('tip-override');
         nubPos(nub, -nubHeight, 'auto', 'auto', target.offset().left);
       } else {
-        if (classes.indexOf('top') > -1) {
-          tip.css('top', target.offset().top - tip.outerHeight());
-          nubPos(nub, 'auto', 'auto', -nubHeight, nubWidth);
-        }
-        if (classes.indexOf('left') > -1) {
+        if (classes.indexOf('tip-top') > -1) {
+          var top = target.offset().top - tip.outerHeight() - nubHeight;
+          tip.css({
+            'top' : top,
+            'left' : target.offset().left,
+            'width' : width
+          }).removeClass('tip-override');
+          nubPos(nub, 'auto', 'auto', -nubHeight, 'auto');
+        } else if (classes.indexOf('tip-left') > -1) {
           tip.css({
-            'top' : target.offset().top - (target.outerHeight() / 2),
-            'left' : target.offset().left - tip.outerWidth() - 10
-          }).children('.nub').css('top', (tip.outerHeight() / 2) - (nub.outerHeight() / 2));
-          nubPos(nub, ((tip.outerHeight() / 2) - (nub.outerHeight / 2)), -nubHeight, 'auto', 'auto');
-        } else if (classes.indexOf('right') > -1){
+            'top' : target.offset().top - (target.outerHeight() / 2) - (nubHeight / 2),
+            'left' : target.offset().left - tip.outerWidth() - 10,
+            'width' : width
+          }).removeClass('tip-override');
+          nubPos(nub, (tip.outerHeight() / 2) - (nubHeight / 2), -nubHeight, 'auto', 'auto');
+        } else if (classes.indexOf('tip-right') > -1){
           tip.css({
-            'top' : target.offset().top - (target.outerHeight() / 2),
-            'left' : target.offset().left + target.outerWidth() + 10
-          }).children('.nub').css('top', (tip.outerHeight() / 2) - (nub.outerHeight() / 2));
-          nubPos(nub, ((tip.outerHeight() / 2) - (nub.outerHeight / 2)), 'auto', 'auto', -nubHeight);
-        } 
+            'top' : target.offset().top - (target.outerHeight() / 2) - (nubHeight / 2),
+            'left' : target.offset().left + target.outerWidth() + 10,
+            'width' : width
+          }).removeClass('tip-override');
+          nubPos(nub, (tip.outerHeight() / 2) - (nubHeight / 2), 'auto', 'auto', -nubHeight);
+        }
+      }
+    },
+    isDomResized : function() {
+      $body = $('body');
+      if(attributes.bodyHeight != $body.height()) {
+        attributes.bodyHeight = $body.height();
+        $(window).trigger('resize');
       }
     }
-    if (Modernizr.touch) {
-      $('.tooltip').live('click', function(e) {
-        e.preventDefault();
-        $(this).hide();
-      });
-      targets.live('click', function(){
-        targets.hover(function() {
-          $('span[data-id=' + $(this).attr('id') + ']').show();
-          targets.attr('title', "");
-        }, function() {
-          $('span[data-id=' + $(this).attr('id') + ']').hide();
-        }); 
-      });
+  };
 
+  $.fn.tooltips = function( method ) {
+    
+    if ( methods[method] ) {
+      return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
+    } else if ( typeof method === 'object' || ! method ) {
+      return methods.init.apply( this, arguments );
     } else {
-      targets.hover(function() {
-        $('span[data-id=' + $(this).attr('id') + ']').show();
-        targets.attr('title', "");
-      }, function() {
-        $('span[data-id=' + $(this).attr('id') + ']').hide();
-      }); 
-    }
-  }
-  foundationTooltipsInit();
-});
+      $.error( 'Method ' +  method + ' does not exist on jQuery.tooltips' );
+    }    
+  
+  };
+})(jQuery);;
+