From a2e4ac2fe857dbc6cfc55b2fb86f5f848f144b26 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 30 Nov 2009 15:25:06 +0000 Subject: Initial replacement for alert() messages coming from FormNoticeXHR(). Appends a success/error container to notice form. --- js/util.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/util.js b/js/util.js index 8d99ca0ff..9ffbd88e4 100644 --- a/js/util.js +++ b/js/util.js @@ -185,7 +185,7 @@ var SN = { // StatusNet $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); if (textStatus == 'timeout') { - alert ('Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists'); + form.append('

(Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.

'); } else { $('#'+form_id+' #'+SN.C.S.NoticeDataText).val(''); @@ -205,8 +205,9 @@ var SN = { // StatusNet success: function(data, textStatus) { var result; if ($('#'+SN.C.S.Error, data).length > 0) { - result = document._importNode($('p', data)[0], true); - alert(result.textContent || result.innerHTML); + result = document._importNode($('p', data)[0], true); + result = result.textContent || result.innerHTML; + form.append('

'+result+'

'); } else { if($('body')[0].id == 'bookmarklet') { @@ -215,7 +216,8 @@ var SN = { // StatusNet if ($('#'+SN.C.S.CommandResult, data).length > 0) { result = document._importNode($('p', data)[0], true); - alert(result.textContent || result.innerHTML); + result = result.textContent || result.innerHTML; + form.append('

'+result+'

'); } else { notice = document._importNode($('li', data)[0], true); -- cgit v1.2.3-54-g00ecf