tonyair/silverstripe-simple
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-simple synced 2024-06-18 10:31:36 +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

10
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');
@ -20,7 +19,6 @@ jQuery.noConflict();
}); });
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");
@ -84,8 +82,6 @@ jQuery.noConflict();
searchBar.slideUp(); searchBar.slideUp();
menu.slideToggle(200); menu.slideToggle(200);
}); });
} }
});
   });
}(jQuery)); }(jQuery));