From b3d92b97797e0d4cb995e36548b0f4ce042ed3f8 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Tue, 3 May 2011 13:46:33 +0200 Subject: [PATCH] fix #1160 (again) by changing the long fadeout of the flash message into a fadein.delay.fadeout sequence for better readability. --- public/javascripts/application.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 64044b69..e98c592c 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -177,8 +177,13 @@ var TracksPages = { var flash = $('div#message_holder'); flash.html("

"+message+"

"); flash = $('h4#flash'); - flash.show(); - flash.fadeOut(fade_duration_in_sec*1000); + + fadein_duration = 1500; + fadeout_duration = 1500; + show_duration = fade_duration_in_sec*1000 - fadein_duration - fadeout_duration + if (show_duration < 0) + show_duration = 1000; + flash.fadeIn(fadein_duration).delay(show_duration).fadeOut(fadeout_duration); }, set_page_badge: function(count) { $('#badge_count').html(count);