[Jifty-commit] jifty branch, master, updated. 1.10518-26-gf50e2a0
Jifty commits
jifty-commit at lists.jifty.org
Fri Jun 10 10:44:05 EDT 2011
The branch, master has been updated
via f50e2a062e0a797a8959554cca7a1bc560f9e7a4 (commit)
from 618ef044cfc5b56e9fb75e87f9ec5c2f8982c377 (commit)
Summary of changes:
share/web/static/js/jifty.js | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
- Log -----------------------------------------------------------------
commit f50e2a062e0a797a8959554cca7a1bc560f9e7a4
Author: Thomas Sibley <trs at bestpractical.com>
Date: Fri Jun 10 10:43:14 2011 -0400
Consolidate the jGrowl triggers and make full page refresh notifications only 10s, not sticky
Sticky quickly got annoying. This should likely be configurable, or
easily changeable, at least.
diff --git a/share/web/static/js/jifty.js b/share/web/static/js/jifty.js
index 585f535..0a28c21 100644
--- a/share/web/static/js/jifty.js
+++ b/share/web/static/js/jifty.js
@@ -800,24 +800,16 @@ Behaviour.register({
'#messages.jifty.results.messages, #errors.jifty.results.messages, .popup_message, .popup_error': function(e) {
jQuery(e).hide();
},
- /* Make full page refresh notifications sticky so they don't get lost in the page load */
- '#messages.jifty.results.messages .message, #errors.jifty.results.messages .message': function(e) {
- jQuery(e).addClass('popup_sticky');
- },
- '#messages.jifty.results.messages .message, .popup_message': function(e) {
- var sticky = jQuery(e).hasClass('popup_sticky');
- jQuery.jGrowl( e.innerHTML, {
- sticky: sticky,
- theme: 'result-message'
- });
+ '#messages.jifty.results.messages .message, #errors.jifty.results.messages .error, .popup_message, .popup_error': function(e) {
+ var je = jQuery(e);
+ var type = je.attr("class").match(/(message|error)\b/)[0];
+ var opt = {
+ sticky: je.hasClass('popup_sticky'),
+ theme: 'result-' + type
+ };
+ if ( je.closest('.jifty.results').length ) opt["life"] = 10000;
+ jQuery.jGrowl( e.innerHTML, opt );
},
- '#errors.jifty.results.messages .error, .popup_error': function(e) {
- var sticky = jQuery(e).hasClass('popup_sticky');
- jQuery.jGrowl( e.innerHTML, {
- sticky: sticky,
- theme: 'result-error'
- });
- }
});
-----------------------------------------------------------------------
More information about the Jifty-commit
mailing list