From 3134054f7b2004275fe9762e125eb24c4dfc4b2e Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 25 Feb 2011 15:47:55 +0000
Subject: [PATCH] NIHVIVO-2154 dwr/util.js overwrites $, so use jQuery() rather
 than $()

---
 webapp/web/js/vitroUtils.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/web/js/vitroUtils.js b/webapp/web/js/vitroUtils.js
index d84d8bcbd..15594baee 100755
--- a/webapp/web/js/vitroUtils.js
+++ b/webapp/web/js/vitroUtils.js
@@ -2,9 +2,11 @@
 
 $(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
-    $('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
-    $('section#flash-message').css('display', 'none').fadeIn(1500);
+    jQuery('section#flash-message').css('display', 'none').fadeIn(1500);
 });
\ No newline at end of file