tonyair/silverstripe-simple
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-simple synced 2024-06-26 14:29:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from halkyon/odd_characters_fix

Browse Source 
BUG #29 Cleaned up whitespace that caused some browsers to not render JS
This commit is contained in:
Sean Harvey 2014-07-30 16:30:14 +12:00
commit 63c549e82f
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
javascript/script.js
View File

@ -1,8 +1,7 @@
jQuery.noConflict(); jQuery.noConflict();
(function($) {     (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 */ /* 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'); $('#SearchForm_SearchForm_action_results').val('L');
var searchField = $('#SearchForm_SearchForm_Search'); var searchField = $('#SearchForm_SearchForm_Search');
@ -18,29 +17,28 @@ jQuery.noConflict();
searchField.val(default_value); searchField.val(default_value);
} }
}); });
if (!$.browser.msie || ($.browser.msie && (parseInt($.browser.version, 10) > 8))) { if (!$.browser.msie || ($.browser.msie && (parseInt($.browser.version, 10) > 8))) {
var searchBarButton = $("span.search-dropdown-icon"); var searchBarButton = $("span.search-dropdown-icon");
var searchBar = $('div.search-bar'); var searchBar = $('div.search-bar');
var menuButton = $("span.nav-open-button"); var menuButton = $("span.nav-open-button");
var menu = $('.header .primary ul'); var menu = $('.header .primary ul');
var mobile = false; var mobile = false;
var changed = false; var changed = false;
$('body').append('<div id="media-query-trigger"></div>'); $('body').append('<div id="media-query-trigger"></div>');
function menuWidthCheck() { function menuWidthCheck() {
var header_w = $('header .inner').width(); var header_w = $('header .inner').width();
var elements_w = menu.width() + $('.brand').width(); var elements_w = menu.width() + $('.brand').width();
if ((header_w < elements_w) || ($(window).width() <= 768)) { if ((header_w < elements_w) || ($(window).width() <= 768)) {
$('body').addClass('tablet-nav'); $('body').addClass('tablet-nav');
} }
else { else {
$('body').removeClass('tablet-nav'); $('body').removeClass('tablet-nav');
} }
mobile_old = mobile; mobile_old = mobile;
if ($('#media-query-trigger').css('visibility') == 'hidden') { if ($('#media-query-trigger').css('visibility') == 'hidden') {
mobile = false; mobile = false;
@ -48,7 +46,7 @@ jQuery.noConflict();
else { else {
mobile = true; mobile = true;
} }
if (mobile_old != mobile) { if (mobile_old != mobile) {
changed = true; changed = true;
} }
@ -56,12 +54,12 @@ jQuery.noConflict();
changed = false; changed = false;
} }
} }
menuWidthCheck(); menuWidthCheck();
$(window).resize(function() { $(window).resize(function() {
menuWidthCheck(); menuWidthCheck();
if (!mobile) { if (!mobile) {
menu.show(); menu.show();
searchBar.show(); searchBar.show();
@ -69,23 +67,21 @@ jQuery.noConflict();
else { else {
if (changed) { if (changed) {
menu.hide(); menu.hide();
searchBar.hide(); searchBar.hide();
} }
} }
}); });
/* toggle navigation and search in mobile view */ /* toggle navigation and search in mobile view */
searchBarButton.click(function() { searchBarButton.click(function() {
menu.slideUp(); menu.slideUp();
searchBar.slideToggle(200); searchBar.slideToggle(200);
}); });
menuButton.click(function() {
searchBar.slideUp();
menu.slideToggle(200);
});
menuButton.click(function() {
searchBar.slideUp();
menu.slideToggle(200);
});
} }
});
   });
}(jQuery)); }(jQuery));