From c61d3e2363403ba203bc1668b90c3e44ff9e3212 Mon Sep 17 00:00:00 2001 From: Stig Lindqvist Date: Fri, 7 Mar 2014 14:20:14 +1300 Subject: [PATCH] Fix mix of tab / space whitespace and missing var declaration --- javascript/script.js | 74 ++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 40 deletions(-) diff --git a/javascript/script.js b/javascript/script.js index b0ec808..252ba11 100644 --- a/javascript/script.js +++ b/javascript/script.js @@ -1,91 +1,85 @@ jQuery.noConflict(); (function($) {     -    $(document).ready(function() { - + $(document).ready(function() { + /* removes text from search form on focus and replaces it on unfocus - if text is entered then it does not get replaced with default on unfocus */ $('#SearchForm_SearchForm_action_results').val('L'); var searchField = $('#SearchForm_SearchForm_Search'); var default_value = searchField.val(); searchField.focus(function() { $(this).addClass('active'); - if(searchField.val() == default_value) { + if (searchField.val() == default_value) { searchField.val(''); } }); searchField.blur(function() { - if(searchField.val() == '') { - searchField.val(default_value); - } + if (searchField.val() == '') { + searchField.val(default_value); + } }); - + if (!$.browser.msie || ($.browser.msie && (parseInt($.browser.version, 10) > 8))) { - + var searchBarButton = $("span.search-dropdown-icon"); var searchBar = $('div.search-bar'); var menuButton = $("span.nav-open-button"); - var menu = $('.header .primary ul'); + var menu = $('.header .primary ul'); var mobile = false; var changed = false; - + $('body').append('
'); - - function menuWidthCheck() { + + function menuWidthCheck() { var header_w = $('header .inner').width(); var elements_w = menu.width() + $('.brand').width(); - + if ((header_w < elements_w) || ($(window).width() <= 768)) { $('body').addClass('tablet-nav'); + } else { + $('body').removeClass('tablet-nav'); } - else { - $('body').removeClass('tablet-nav'); - } - - mobile_old = mobile; + + var mobile_old = mobile; if ($('#media-query-trigger').css('visibility') == 'hidden') { mobile = false; - } - else { + } else { mobile = true; } - - if (mobile_old != mobile) { + + if (mobile_old !== mobile) { changed = true; - } - else { + } else { changed = false; } } - + menuWidthCheck(); - + $(window).resize(function() { menuWidthCheck(); - + if (!mobile) { menu.show(); searchBar.show(); - } - else { + } else { if (changed) { menu.hide(); - searchBar.hide(); + searchBar.hide(); } } }); - - /* toggle navigation and search in mobile view */ + + /* toggle navigation and search in mobile view */ searchBarButton.click(function() { - menu.slideUp(); + menu.slideUp(); searchBar.slideToggle(200); }); - - menuButton.click(function() { - searchBar.slideUp(); - menu.slideToggle(200); - }); + menuButton.click(function() { + searchBar.slideUp(); + menu.slideToggle(200); + }); } - -    }); + }); }(jQuery));