litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-11-25 10:51:50 -05:00
commit e4023f2e76
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
webapp/web/js/vitroUtils.js
View file

@ -13,20 +13,16 @@ $(document).ready(function(){
jQuery('section#flash-message').css('display', 'none').fadeIn(1500); jQuery('section#flash-message').css('display', 'none').fadeIn(1500);
///////////////////////////// /////////////////////////////
// Home search fiter // Home search filter
// Toggle filter select list // Toggle filter select list
var $searchFilterList = $('#filter-search-nav'); var $searchFilterList = $('#filter-search-nav');
var $isFilterOpen = false; var $isFilterOpen = false;
console.log("Filter is open = " + $isFilterOpen);
$('a.filter-search').click(function(e) { $('a.filter-search').click(function(e) {
e.preventDefault(); e.preventDefault();
if (!$isFilterOpen) { if (!$isFilterOpen) {
console.log("Filter is closed = " + $isFilterOpen);
//Change button filter state to selected //Change button filter state to selected
//$(this).css('background','url(../../themes/vivo-cornell/images/filteredSearchActive.gif) no-repeat right top'); //$(this).css('background','url(../../themes/vivo-cornell/images/filteredSearchActive.gif) no-repeat right top');
$(this).removeClass('filter-default'); $(this).removeClass('filter-default');
@ -37,7 +33,6 @@ $(document).ready(function(){
$isFilterOpen = true; $isFilterOpen = true;
console.log("open");
} else { } else {
//Change button filter state to default //Change button filter state to default
//$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top'); //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
@ -49,7 +44,6 @@ $(document).ready(function(){
$isFilterOpen = false; $isFilterOpen = false;
console.log("closed");
} }
}); });
@ -63,7 +57,6 @@ $(document).ready(function(){
//Selected filter feedback //Selected filter feedback
$('.search-filter-selected').text(''); $('.search-filter-selected').text('');
$('input[name="classgroup"]').val(''); $('input[name="classgroup"]').val('');
console.log("ALL");
} else { } else {
$('.search-filter-selected').text($(this).text()).fadeIn('slow'); $('.search-filter-selected').text($(this).text()).fadeIn('slow');
@ -110,6 +103,5 @@ $(document).ready(function(){
} }
console.log("HIDE input value ") ;
}); });
}); });