Skip to content

Commit 07da67a

Browse files
srchulosrchulo
committed
s
1 parent 5c5920d commit 07da67a

File tree

8 files changed

+47
-33
lines changed

8 files changed

+47
-33
lines changed

‎MYMETA.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@
4545
}
4646
},
4747
"release_status" : "stable",
48-
"version" : "0.14"
48+
"version" : "0.15"
4949
}

‎MYMETA.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ requires:
2727
Net::SSH2::SFTP: 0
2828
URI: 0
2929
perl: 5.006
30-
version: 0.14
30+
version: 0.15

‎Makefile

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ DIRFILESEP = /
6161
DFSEP = $(DIRFILESEP)
6262
NAME = jQuery::File::Upload
6363
NAME_SYM = jQuery_File_Upload
64-
VERSION = 0.14
64+
VERSION = 0.15
6565
VERSION_MACRO = VERSION
66-
VERSION_SYM = 0_14
66+
VERSION_SYM = 0_15
6767
DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
68-
XS_VERSION = 0.14
68+
XS_VERSION = 0.15
6969
XS_VERSION_MACRO = XS_VERSION
7070
XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
7171
INST_ARCHLIB = blib/arch
@@ -187,9 +187,12 @@ PERL_ARCHIVE =
187187
PERL_ARCHIVE_AFTER =
188188

189189

190-
TO_INST_PM = lib/jQuery/File/Upload.pm
190+
TO_INST_PM = lib/jQuery/File/.DS_Store \
191+
lib/jQuery/File/Upload.pm
191192

192-
PM_TO_BLIB = lib/jQuery/File/Upload.pm \
193+
PM_TO_BLIB = lib/jQuery/File/.DS_Store \
194+
blib/lib/jQuery/File/.DS_Store \
195+
lib/jQuery/File/Upload.pm \
193196
blib/lib/jQuery/File/Upload.pm
194197

195198

@@ -259,7 +262,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
259262
DIST_CP = best
260263
DIST_DEFAULT = tardist
261264
DISTNAME = jQuery-File-Upload
262-
DISTVNAME = jQuery-File-Upload-0.14
265+
DISTVNAME = jQuery-File-Upload-0.15
263266

264267

265268
# --- MakeMaker macro section:
@@ -508,7 +511,7 @@ metafile : create_distdir
508511
$(NOECHO) $(ECHO) ' Net::SSH2::SFTP: 0' >> META_new.yml
509512
$(NOECHO) $(ECHO) ' URI: 0' >> META_new.yml
510513
$(NOECHO) $(ECHO) ' perl: 5.006' >> META_new.yml
511-
$(NOECHO) $(ECHO) 'version: 0.14' >> META_new.yml
514+
$(NOECHO) $(ECHO) 'version: 0.15' >> META_new.yml
512515
-$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
513516
$(NOECHO) $(ECHO) Generating META.json
514517
$(NOECHO) $(ECHO) '{' > META_new.json
@@ -558,7 +561,7 @@ metafile : create_distdir
558561
$(NOECHO) $(ECHO) ' }' >> META_new.json
559562
$(NOECHO) $(ECHO) ' },' >> META_new.json
560563
$(NOECHO) $(ECHO) ' "release_status" : "stable",' >> META_new.json
561-
$(NOECHO) $(ECHO) ' "version" : "0.14"' >> META_new.json
564+
$(NOECHO) $(ECHO) ' "version" : "0.15"' >> META_new.json
562565
$(NOECHO) $(ECHO) '}' >> META_new.json
563566
-$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json
564567

@@ -854,7 +857,7 @@ testdb_static :: testdb_dynamic
854857
# --- MakeMaker ppd section:
855858
# Creates a PPD (Perl Package Description) for a binary distribution.
856859
ppd :
857-
$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="0.14">' > $(DISTNAME).ppd
860+
$(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="0.15">' > $(DISTNAME).ppd
858861
$(NOECHO) $(ECHO) ' <ABSTRACT>Server-side solution for the L&lt;jQuery File Upload|https://github.com/blueimp/jQuery-File-Upload/&gt; plugin.</ABSTRACT>' >> $(DISTNAME).ppd
859862
$(NOECHO) $(ECHO) ' <AUTHOR>Adam Hopkins &lt;srchulo@cpan.org&gt;</AUTHOR>' >> $(DISTNAME).ppd
860863
$(NOECHO) $(ECHO) ' <IMPLEMENTATION>' >> $(DISTNAME).ppd
@@ -877,6 +880,7 @@ ppd :
877880

878881
pm_to_blib : $(FIRST_MAKEFILE) $(TO_INST_PM)
879882
$(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', q[$(PM_FILTER)], '\''$(PERM_DIR)'\'')' -- \
883+
lib/jQuery/File/.DS_Store blib/lib/jQuery/File/.DS_Store \
880884
lib/jQuery/File/Upload.pm blib/lib/jQuery/File/Upload.pm
881885
$(NOECHO) $(TOUCH) pm_to_blib
882886

‎blib/lib/jQuery/File/.DS_Store

6 KB
Binary file not shown.

‎blib/lib/jQuery/File/Upload.pm

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use URI;
1616
#use LWP::UserAgent;
1717
#use LWP::Protocol::https;
1818

19-
our $VERSION = '0.13';
19+
our $VERSION = '0.15';
2020

2121
my %errors = (
2222
'_validate_max_file_size' => 'File is too big',
@@ -656,13 +656,14 @@ sub is_image { shift->{is_image} }
656656
sub print_response {
657657
my $self = shift;
658658

659-
#thanks to Lukas Rampa for this suggestion
660659
my $content_type = 'text/plain';
661-
if ($c->req->headers->header('Accept') =~ qr(application/json) ) {
662-
$content_type = 'application/json';
663-
}
664-
665660
if(defined $self->ctx) {
661+
662+
#thanks to Lukas Rampa for this suggestion
663+
if ($self->ctx->req->headers->header('Accept') =~ qr(application/json) ) {
664+
$content_type = 'application/json';
665+
}
666+
666667
$self->ctx->stash->{current_view} = '';
667668
$self->ctx->res->content_type("$content_type; charset=utf-8");
668669
$self->ctx->res->body($self->output . ""); #concatenate "" for when there is no output

‎blib/man3/jQuery::File::Upload.3pm

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.13)
1+
.\" Automatically generated by Pod::Man 2.26 (Pod::Simple 3.22)
22
.\"
33
.\" Standard preamble:
44
.\" ========================================================================
@@ -38,6 +38,8 @@
3838
. ds PI \(*p
3939
. ds L" ``
4040
. ds R" ''
41+
. ds C`
42+
. ds C'
4143
'br\}
4244
.\"
4345
.\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
4850
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
4951
.\" entries marked with X<> in POD. Of course, you'll have to process the
5052
.\" output yourself in some meaningful fashion.
51-
.ie \nF \{\
52-
. de IX
53-
. tm Index:\\$1\t\\n%\t"\\$2"
53+
.\"
54+
.\" Avoid warning from groff about undefined register 'F'.
55+
.de IX
5456
..
55-
. nr % 0
56-
. rr F
57-
.\}
58-
.el \{\
59-
. de IX
57+
.nr rF 0
58+
.if \n(.g .if rF .nr rF 1
59+
.if (\n(rF:(\n(.g==0)) \{
60+
. if \nF \{
61+
. de IX
62+
. tm Index:\\$1\t\\n%\t"\\$2"
6063
..
64+
. if !\nF==2 \{
65+
. nr % 0
66+
. nr F 2
67+
. \}
68+
. \}
6169
.\}
70+
.rr rF
6271
.\"
6372
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
6473
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -124,13 +133,13 @@
124133
.\" ========================================================================
125134
.\"
126135
.IX Title "jQuery::File::Upload 3"
127-
.TH jQuery::File::Upload 3 "2013-04-17" "perl v5.10.1" "User Contributed Perl Documentation"
136+
.TH jQuery::File::Upload 3 "2013-04-17" "perl v5.12.4" "User Contributed Perl Documentation"
128137
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
129138
.\" way too many mistakes in technical documents.
130139
.if n .ad l
131140
.nh
132141
.SH "NAME"
133-
jQuery::File::Upload \- Server\-side solution for the <jQuery File Upload> plugin.
142+
jQuery::File::Upload \- Server\-side solution for the jQuery File Upload <https://github.com/blueimp/jQuery-File-Upload/> plugin.
134143
.SH "SYNOPSIS"
135144
.IX Header "SYNOPSIS"
136145
.Vb 1
@@ -272,7 +281,7 @@ This implementation accepts all types of files.
272281
.Ve
273282
.SH "DESCRIPTION"
274283
.IX Header "DESCRIPTION"
275-
jQuery::File::Upload makes integrating server-side with the <jQuery File Upload> plugin simple.
284+
jQuery::File::Upload makes integrating server-side with the jQuery File Upload <https://github.com/blueimp/jQuery-File-Upload/> plugin simple.
276285
It provides many features, such as:
277286
.IP "1." 4
278287
the ability to \s-1SCP\s0 file uploads to remote servers
@@ -285,7 +294,7 @@ automatically generates thumbnails if the file is an image
285294
.IP "5." 4
286295
see below for everything you can do with jQuery::File::Upload
287296
.PP
288-
The location of the script should be where <jQuery File Upload> is
297+
The location of the script should be where jQuery File Upload <https://github.com/blueimp/jQuery-File-Upload/> is
289298
told to upload to.
290299
.SH "METHODS"
291300
.IX Header "METHODS"
@@ -1076,7 +1085,7 @@ url \- url used for file. If not provided, will be generated with filename and o
10761085
.IP "\(bu" 4
10771086
thumbnail_url \- url used for thumbnail. If not provided, will be generated with other defaults.
10781087
.IP "\(bu" 4
1079-
delete_url \- url that will be called by <jQuery File Upload> to
1088+
delete_url \- url that will be called by jQuery File Upload <https://github.com/blueimp/jQuery-File-Upload/> to
10801089
delete the file. It's better to just let jQuery::File::Upload generate this and use delete_params
10811090
if you want to set your own parameters for the delete url.
10821091
.IP "\(bu" 4
@@ -1251,7 +1260,7 @@ Digest::MD5
12511260
.IP "\(bu" 4
12521261
\&\s-1URI\s0
12531262
.IP "\(bu" 4
1254-
<jQuery File Upload>
1263+
jQuery File Upload <https://github.com/blueimp/jQuery-File-Upload/>
12551264
.SH "AUTHOR"
12561265
.IX Header "AUTHOR"
12571266
Adam Hopkins, <srchulo@cpan.org<gt>

‎jQuery-File-Upload-0.15.tar.gz

19.7 KB
Binary file not shown.

‎lib/jQuery/File/Upload.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use URI;
1616
#use LWP::UserAgent;
1717
#use LWP::Protocol::https;
1818

19-
our $VERSION = '0.14';
19+
our $VERSION = '0.15';
2020

2121
my %errors = (
2222
'_validate_max_file_size' => 'File is too big',

0 commit comments

Comments
 (0)