urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve detection of ajax request 

Firefox sent an accept header for application/xml, not application/json,
and also weakened the priority to 0.8. So that stuff is not to be trusted;
instead I found a better way: When an ajax upload is *not* being made,
the Upload Attachment button will be used, so enable ajax if an upload
is being made without that button having been used.

Also, testing with firefox revealed it refused to process a response that
was type application/json, and checking the demo page for the jquery file
upload plugin, it actually returns the json with type text/html. Ugh.
Followed suite.

Now tested with: chromium, chromium (w/o js), firefox, firefox (w/o js),
and w3m.
master
Joey Hess 2011-06-17 15:17:20 -04:00
parent d82fa99426
commit ace3665f81
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IkiWiki/Plugin/attachment.pm
View File

@ -228,7 +228,7 @@ sub attachment_store {
check_canattach($session, $final_filename, $tempfile);
};
if ($@) {
json_response($q, $dest."/".$filename, $@);
json_response($q, $form, $dest."/".$filename, $@);
error $@;
}
@ -259,7 +259,7 @@ sub attachment_store {
});
}
json_response($q, $dest."/".$filename, stored_msg());
json_response($q, $form, $dest."/".$filename, stored_msg());
}
# Save all stored attachments for a page.
@ -360,17 +360,17 @@ sub stored_msg {
gettext("just uploaded");
}
sub json_response ($$$) {
sub json_response ($$$$) {
my $q=shift;
my $form=shift;
my $filename=shift;
my $stored_msg=shift;
# for the jquery file upload widget
if ($q->Accept("application/json") >= 1.0 &&
grep { /application\/json/i } $q->Accept) {
if (! defined $form->submitted ||
$form->submitted ne "Upload Attachment") {
eval q{use JSON};
error $@ if $@;
print "Content-type: application/json\n\n";
print "Content-type: text/html\n\n";
my $size=-s $filename;
print to_json([
{