Skip to content

Commit 9886b4e

Browse files
Adam HopkinsAdam Hopkins
authored andcommitted
Updated delete response for new expected JSON
1 parent e8ba9d0 commit 9886b4e

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

Changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,8 @@ Revision history for jQuery-File-Upload
9191
0.22
9292

9393
Updated deleteType, deleteUrl, and thumbnailUrl for new jQuery File Upload
94+
95+
96+
0.23
97+
98+
Updated delete response for new expected JSON

blib/lib/jQuery/File/Upload.pm

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -865,18 +865,27 @@ sub _post {
865865
sub _generate_output {
866866
my $self = shift;
867867

868-
my %hash;
869-
$hash{'name'} = $self->show_client_filename ? $self->client_filename . "" : $self->filename;
870-
$hash{'size'} = $self->{file_size};
871-
$hash{'url'} = $self->url;
872-
$hash{'thumbnailUrl'} = $self->thumbnail_url;
873-
$hash{'deleteUrl'} = $self->_delete_url;
874-
$hash{'deleteType'} = 'DELETE';
868+
my $method = $self->_get_request_method;
869+
my $obj;
875870

876-
$hash{'error'} = $self->_generate_error;
871+
if($method eq 'POST') {
872+
my %hash;
873+
$hash{'name'} = $self->show_client_filename ? $self->client_filename . "" : $self->filename;
874+
$hash{'size'} = $self->{file_size};
875+
$hash{'url'} = $self->url;
876+
$hash{'thumbnailUrl'} = $self->thumbnail_url;
877+
$hash{'deleteUrl'} = $self->_delete_url;
878+
$hash{'deleteType'} = 'DELETE';
879+
880+
$hash{'error'} = $self->_generate_error;
881+
$obj->{files} = [\%hash];
882+
}
883+
elsif($method eq 'DELETE') {
884+
$obj->{$self->_get_param('filename')} = JSON::true;
885+
}
877886

878887
my $json = JSON::XS->new->ascii->pretty->allow_nonref;
879-
$self->{output} = $json->encode({files => [\%hash]});
888+
$self->{output} = $json->encode($obj);
880889
}
881890

882891
sub _delete {
@@ -902,6 +911,8 @@ sub _delete {
902911
unlink $self->upload_dir . '/' . $filename;
903912
unlink($self->thumbnail_upload_dir . '/' . $thumbnail_filename) if $image_yn eq 'y';
904913
}
914+
915+
$self->_generate_output;
905916
}
906917

907918
sub _get_param {

jQuery-File-Upload-0.22.tar.gz

47 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)