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

NIHVIVO-2154 dwr/util.js overwrites $, so use jQuery() rather than $()

Browse source
This commit is contained in:
rjy7 2011-02-25 15:47:55 +00:00
parent a6f579bd5d
commit 3134054f7b
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,11 @@
$(document).ready(function(){ $(document).ready(function(){
// Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing
// pages, overwrites $.
// fade out welcome-message when user logs in // fade out welcome-message when user logs in
$('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500); jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500);
// fade in flash-message when user logs out // fade in flash-message when user logs out
$('section#flash-message').css('display', 'none').fadeIn(1500); jQuery('section#flash-message').css('display', 'none').fadeIn(1500);
}); });