Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 4f9e765

Browse files
author
rnicholus
committed
Merge branch 'master' into feature/flexible-upload-support
# Conflicts: # client/js/version.js # package.json
2 parents c7ed6e6 + 8d25ba3 commit 4f9e765

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

client/js/dnd.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ qq.DragAndDrop = function(o) {
215215
// * IE10+: If the file is dragged out of the window too quickly, IE does not set the expected values of the
216216
// event's X & Y properties.
217217
function leavingDocumentOut(e) {
218-
if (qq.firefox()) {
219-
return !e.relatedTarget;
220-
}
221-
222218
if (qq.safari()) {
223219
return e.x < 0 || e.y < 0;
224220
}

client/js/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/*global qq */
2-
qq.version = "5.16.0-beta.0";
2+
qq.version = "5.16.0-rc1";

docs/endpoint_handlers/azure.jmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ query string of this request URI:
5858

5959
* `_method`: The verb that will be used by Fine Uploader when it sends the associated request to Azure.
6060
Possible values are "DELETE" and "PUT" at this time.
61-
* `_bloburi`: The fully-qualified URI for the blob associated with the request that Fine Uploader will send to Azure.
61+
* `bloburi`: The fully-qualified URI for the blob associated with the request that Fine Uploader will send to Azure.
6262
* `qqtimestamp`: You can ignore this parameter. It is simply used to ensure that the browser requests a fresh
6363
SAS URI from your server every time.
6464

6565
#### Verification before returning a SAS URI
66-
Before you return a SAS URI, you might want to verify the `_bloburi` and `_method` to ensure that the associated
66+
Before you return a SAS URI, you might want to verify the `bloburi` and `_method` to ensure that the associated
6767
user is allowed to perform the requested action on the associated blob. If there is an issue, and your server
6868
does not want the requested operation to occur, your server should respond with a [403 status code][403]. If your
6969
server returns a 403, Fine Uploader Azure will not send the underlying request, and will not attempt an auto-retry

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"title": "Fine Uploader",
44
"main": "lib/traditional.js",
55
"types" : "typescript/fine-uploader.d.ts",
6-
"version": "5.16.0-beta.0",
6+
"version": "5.16.0-RC1",
77
"description": "Multiple file upload plugin with progress-bar, drag-and-drop, direct-to-S3 & Azure uploading, client-side image scaling, preview generation, form support, chunking, auto-resume, and tons of other features.",
88
"keywords": [
99
"amazon",

0 commit comments

Comments
 (0)