Skip to content

Commit e7847dc

Browse files
committed
Compatibility update for jQuery 1.8.
2 parents 9304abf + e8693c1 commit e7847dc

File tree

6 files changed

+154
-181
lines changed

6 files changed

+154
-181
lines changed

cors/postmessage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<head>
1616
<meta charset="utf-8">
1717
<title>jQuery File Upload Plugin postMessage API</title>
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
1919
</head>
2020
<body>
2121
<script>

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ <h3>Demo Notes</h3>
204204
</tr>
205205
{% } %}
206206
</script>
207-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
208-
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
207+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
208+
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
209209
<!-- The Templates plugin is included to render the upload/download listings -->
210210
<script src="http://blueimp.github.com/JavaScript-Templates/tmpl.min.js"></script>
211211
<!-- The Load Image plugin is included for the preview images and image resizing functionality -->

js/jquery.fileupload.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery File Upload Plugin 5.16
2+
* jQuery File Upload Plugin 5.16.1
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2010, Sebastian Tschan
@@ -666,9 +666,15 @@
666666
options.limitConcurrentUploads > that._sending) {
667667
// Start the next queued upload,
668668
// that has not been aborted:
669-
var nextSlot = that._slots.shift();
669+
var nextSlot = that._slots.shift(),
670+
isPending;
670671
while (nextSlot) {
671-
if (!nextSlot.isRejected()) {
672+
// jQuery 1.6 doesn't provide .state(),
673+
// while jQuery 1.8+ removed .isRejected():
674+
isPending = nextSlot.state ?
675+
nextSlot.state() === 'pending' :
676+
!nextSlot.isRejected();
677+
if (isPending) {
672678
nextSlot.resolve();
673679
break;
674680
}

js/vendor/jquery.ui.widget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery UI Widget 1.8.22+amd
2+
* jQuery UI Widget 1.8.23+amd
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
55
* Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)

test/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ <h2 id="qunit-userAgent"></h2>
129129
</tr>
130130
{% } %}
131131
</script>
132-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
133-
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
132+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
133+
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
134134
<script src="http://blueimp.github.com/JavaScript-Templates/tmpl.min.js"></script>
135135
<script src="http://blueimp.github.com/JavaScript-Load-Image/load-image.min.js"></script>
136136
<script src="http://blueimp.github.com/JavaScript-Canvas-to-Blob/canvas-to-blob.min.js"></script>

0 commit comments

Comments
 (0)