From 65550266a167d1d530f670543813a04725f2552a Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Tue, 2 Oct 2012 07:34:53 -0500 Subject: [PATCH] Move some app.js setup into a ready callback, re #949. --- vendor/assets/javascripts/foundation/app.js | 24 +++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/vendor/assets/javascripts/foundation/app.js b/vendor/assets/javascripts/foundation/app.js index b3949e88c..84cc5a36f 100644 --- a/vendor/assets/javascripts/foundation/app.js +++ b/vendor/assets/javascripts/foundation/app.js @@ -4,17 +4,19 @@ var $doc = $(document), Modernizr = window.Modernizr; - $.fn.foundationAlerts ? $doc.foundationAlerts() : null; - $.fn.foundationButtons ? $doc.foundationButtons() : null; - $.fn.foundationAccordion ? $doc.foundationAccordion() : null; - $.fn.foundationNavigation ? $doc.foundationNavigation() : null; - $.fn.foundationTopBar ? $doc.foundationTopBar() : null; - $.fn.foundationCustomForms ? $doc.foundationCustomForms() : null; - $.fn.foundationMediaQueryViewer ? $doc.foundationMediaQueryViewer() : null; - $.fn.foundationTabs ? $doc.foundationTabs({callback : $.foundation.customForms.appendCustomMarkup}) : null; - $.fn.foundationTooltips ? $doc.foundationTooltips() : null; + $(document).ready(function() { + $.fn.foundationAlerts ? $doc.foundationAlerts() : null; + $.fn.foundationButtons ? $doc.foundationButtons() : null; + $.fn.foundationAccordion ? $doc.foundationAccordion() : null; + $.fn.foundationNavigation ? $doc.foundationNavigation() : null; + $.fn.foundationTopBar ? $doc.foundationTopBar() : null; + $.fn.foundationCustomForms ? $doc.foundationCustomForms() : null; + $.fn.foundationMediaQueryViewer ? $doc.foundationMediaQueryViewer() : null; + $.fn.foundationTabs ? $doc.foundationTabs({callback : $.foundation.customForms.appendCustomMarkup}) : null; + $.fn.foundationTooltips ? $doc.foundationTooltips() : null; - $('input, textarea').placeholder(); + $('input, textarea').placeholder(); + }); // UNCOMMENT THE LINE YOU WANT BELOW IF YOU WANT IE8 SUPPORT AND ARE USING .block-grids // $('.block-grid.two-up>li:nth-child(2n+1)').css({clear: 'both'}); @@ -31,4 +33,4 @@ }); } -})(jQuery, this); \ No newline at end of file +})(jQuery, this); -- 2.47.3