diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-09-25 16:02:26 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:17 +0200 |
| commit | 0e55b2393dffa269a724f3090469dad563217dff (patch) | |
| tree | 3991c8ba0779bb8e76676778ef5bc02fbf13385e /phpBB/assets | |
| parent | 818d98916873945d7e0e7bf2855e982496c7fe35 (diff) | |
| download | forums-0e55b2393dffa269a724f3090469dad563217dff.tar forums-0e55b2393dffa269a724f3090469dad563217dff.tar.gz forums-0e55b2393dffa269a724f3090469dad563217dff.tar.bz2 forums-0e55b2393dffa269a724f3090469dad563217dff.tar.xz forums-0e55b2393dffa269a724f3090469dad563217dff.zip | |
[ticket/10270] Removed all the inline language and HTML from the JS.
PHPBB3-10270
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 7337a7fbc0..d685d28c81 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -25,7 +25,7 @@ phpbb.loading_alert = function() { setTimeout(function() { if (loading_alert.is(':visible')) { - phpbb.alert('Error', 'Error processing your request. Please try again.'); + phpbb.alert($('body').data('l-err'), $('body').data('l-err-processing-req')); } }, 5000); }); @@ -45,7 +45,9 @@ phpbb.loading_alert = function() { * @returns object Returns the div created. */ phpbb.alert = function(title, msg, fadedark) { - var div = $('<div class="jalert"><h3>' + title + '</h3><p>' + msg + '</p></div>'); + var div = $('#jalert_alert'); + div.find('h3').html(title); + div.find('p').html(msg); div.bind('click', function(e) { e.stopPropagation(); @@ -54,7 +56,7 @@ phpbb.alert = function(title, msg, fadedark) { dark.one('click', function(e) { var fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark; fade.fadeOut(100, function() { - div.remove(); + div.hide(); }); return false; }); @@ -101,15 +103,14 @@ phpbb.alert = function(title, msg, fadedark) { * @returns object Returns the div created. */ phpbb.confirm = function(msg, callback, fadedark) { - var div = $('<div class="jalert"><p>' + msg + '</p>\ - <input type="button" class="jalertbut button1" value="Yes" /> \ - <input type="button" class="jalertbut button2" value="No" /></div>'); + var div = $('#jalert_confirm'); + div.find('p').html(msg); div.find('.jalertbut').bind('click', function() { var res = this.value === 'Yes'; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; fade.fadeOut(100, function() { - div.remove(); + div.hide(); }); callback(res); return false; @@ -227,7 +228,7 @@ phpbb.ajaxify = function(options, refresh, callback) { } dark.fadeOut(100, function() { - alert.remove(); + alert.hide(); }); }, res.REFRESH_DATA.time * 1000); } @@ -296,5 +297,11 @@ phpbb.add_ajax_callback = function(id, callback) } +phpbb.add_ajax_callback('alt_text', function(el) { + var alt_text = $(el).data('alt-text'); + $(el).data('alt-text', $(el).text()); + $(el).text(el.title = alt_text); +}); + })(jQuery); // Avoid conflicts with other libraries
\ No newline at end of file |