GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Direct message XHR response fix for IE and minor tweaks

Browse Source 
darcs-hash:20081216071818-efd22-d2e59bb60a236538452be356f38d0974f35f0107.gz
This commit is contained in:
Sarven Capadisli 2008-12-16 02:18:18 -05:00
parent c0977dfa1b
commit 946eee4256
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/newmessage.php
View File

@ -122,7 +122,7 @@ class NewmessageAction extends Action {
array($this, 'show_top')); array($this, 'show_top'));
if ($msg) { if ($msg) {
common_element('p', 'error', $msg); common_element('p', array('id'=>'error'), $msg);
} }
common_show_footer(); common_show_footer();

4
actions/newnotice.php
View File

@ -116,7 +116,7 @@ class NewnoticeAction extends Action {
common_element('title', null, _('Ajax Error')); common_element('title', null, _('Ajax Error'));
common_element_end('head'); common_element_end('head');
common_element_start('body'); common_element_start('body');
common_element('p', array('class' => 'error'), $msg); common_element('p', array('id' => 'error'), $msg);
common_element_end('body'); common_element_end('body');
common_element_end('html'); common_element_end('html');
} }
@ -141,7 +141,7 @@ class NewnoticeAction extends Action {
common_show_header(_('New notice'), NULL, $content, common_show_header(_('New notice'), NULL, $content,
array($this, 'show_top')); array($this, 'show_top'));
if ($msg) { if ($msg) {
common_element('p', 'error', $msg); common_element('p', array('id' => 'error'), $msg);
} }
common_show_footer(); common_show_footer();
} }

8
classes/Channel.php
View File

@ -124,23 +124,23 @@ class WebChannel extends Channel {
class AjaxWebChannel extends WebChannel { class AjaxWebChannel extends WebChannel {
function output($user, $text) { function output($user, $text) {
common_start_html('text/xml;charset=utf-8', false); common_start_html('text/xml;charset=utf-8', true);
common_element_start('head'); common_element_start('head');
common_element('title', null, _('Command results')); common_element('title', null, _('Command results'));
common_element_end('head'); common_element_end('head');
common_element_start('body'); common_element_start('body');
common_element('p', array('class' => 'command_results'), $text); common_element('p', array('id' => 'command_result'), $text);
common_element_end('body'); common_element_end('body');
common_element_end('html'); common_element_end('html');
} }
function error($user, $text) { function error($user, $text) {
common_start_html('text/xml;charset=utf-8', false); common_start_html('text/xml;charset=utf-8', true);
common_element_start('head'); common_element_start('head');
common_element('title', null, _('Ajax Error')); common_element('title', null, _('Ajax Error'));
common_element_end('head'); common_element_end('head');
common_element_start('body'); common_element_start('body');
common_element('p', array('class' => 'error'), $text); common_element('p', array('id' => 'error'), $text);
common_element_end('body'); common_element_end('body');
common_element_end('html'); common_element_end('html');
} }

17
js/util.js
View File

@ -144,15 +144,10 @@ $(document).ready(function(){
$("#status_form input[type=submit]").addClass("disabled"); $("#status_form input[type=submit]").addClass("disabled");
return true; return true;
}, },
success: function(xml) { if ($(".error", xml).length > 0) { success: function(xml) { if ($("#error", xml).length > 0 || $("#command_result", xml).length > 0) {
var response_error = document._importNode($(".error", xml).get(0), true); var result = document._importNode($("p", xml).get(0), true);
response_error = response_error.textContent || response_error.innerHTML; result = result.textContent || result.innerHTML;
alert(response_error); alert(result);
}
else if ($(".command_results", xml).length > 0) {
var command_results = document._importNode($(".command_results", xml).get(0), true);
command_results = command_results.textContent || command_results.innerHTML;
alert(command_results);
} }
else { else {
$("#notices").prepend(document._importNode($("li", xml).get(0), true)); $("#notices").prepend(document._importNode($("li", xml).get(0), true));
@ -160,13 +155,11 @@ $(document).ready(function(){
counter(); counter();
$(".notice_single:first").css({display:"none"}); $(".notice_single:first").css({display:"none"});
$(".notice_single:first").fadeIn(2500); $(".notice_single:first").fadeIn(2500);
} }
$("#status_form input[type=submit]").removeAttr("disabled"); $("#status_form input[type=submit]").removeAttr("disabled");
$("#status_form input[type=submit]").removeClass("disabled"); $("#status_form input[type=submit]").removeClass("disabled");
} }
} };
$("#status_form").ajaxForm(PostNotice); $("#status_form").ajaxForm(PostNotice);
$("#status_form").each(addAjaxHidden); $("#status_form").each(addAjaxHidden);
}); });