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

Commit

Permalink
Merge branch 'master' into feature/flexible-upload-support
Browse files Browse the repository at this point in the history
# Conflicts:
#	client/js/version.js
#	package.json
  • Loading branch information
rnicholus committed Dec 18, 2017
2 parents c7ed6e6 + 8d25ba3 commit 4f9e765
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
4 changes: 0 additions & 4 deletions client/js/dnd.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,6 @@ qq.DragAndDrop = function(o) {
// * IE10+: If the file is dragged out of the window too quickly, IE does not set the expected values of the
// event's X & Y properties.
function leavingDocumentOut(e) {
if (qq.firefox()) {
return !e.relatedTarget;
}

if (qq.safari()) {
return e.x < 0 || e.y < 0;
}
Expand Down
2 changes: 1 addition & 1 deletion client/js/version.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/*global qq */
qq.version = "5.16.0-beta.0";
qq.version = "5.16.0-rc1";
4 changes: 2 additions & 2 deletions docs/endpoint_handlers/azure.jmd
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ query string of this request URI:

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

#### Verification before returning a SAS URI
Before you return a SAS URI, you might want to verify the `_bloburi` and `_method` to ensure that the associated
Before you return a SAS URI, you might want to verify the `bloburi` and `_method` to ensure that the associated
user is allowed to perform the requested action on the associated blob. If there is an issue, and your server
does not want the requested operation to occur, your server should respond with a [403 status code][403]. If your
server returns a 403, Fine Uploader Azure will not send the underlying request, and will not attempt an auto-retry
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Fine Uploader",
"main": "lib/traditional.js",
"types" : "typescript/fine-uploader.d.ts",
"version": "5.16.0-beta.0",
"version": "5.16.0-RC1",
"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.",
"keywords": [
"amazon",
Expand Down

0 comments on commit 4f9e765

Please sign in to comment.