Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explicitly spell out fallback element input type #189

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Explicitly spell out fallback element input type #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac1f231
Explicitly spell out fallback element input type
barbeque Jun 25, 2019
bb99079
Make fallback_id optional
barbeque Jun 26, 2019
8906838
File type sanity checking
barbeque Jun 26, 2019
c855f96
Merge branch 'master' into patch-1
barbeque Jun 26, 2019
648573e
No longer raise errors if fallback_id is unset
barbeque Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Usage Example

```javascript
$('#dropzone').filedrop({
fallback_id: 'upload_button', // an identifier of a standard file input element, becomes the target of "click" events on the dropzone
fallback_dropzoneClick : true, // if true, clicking dropzone triggers fallback file selection and the fallback element is made invisible.
fallback_id: 'upload_button', // an identifier of a standard input[type="file"] element, becomes the target of "click" events on the dropzone
fallback_dropzoneClick : true, // if true, clicking dropzone triggers fallback file selection and the fallback input[type="file"] element is made invisible.
url: 'upload.php', // upload handler, handles each file separately, can also be a function taking the file and returning a url
paramname: 'userfile', // POST parameter name used on serverside to reference file, can also be a function taking the filename and returning the paramname
withCredentials: true, // make a cross-origin request with cookies
Expand Down
33 changes: 19 additions & 14 deletions jquery.filedrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,23 @@
files_count = 0,
files;

if ( opts.fallback_dropzoneClick === true )
this.on('drop', drop).on('dragstart', opts.dragStart).on('dragenter', dragEnter).on('dragover', dragOver).on('dragleave', dragLeave);
$(document).on('drop', docDrop).on('dragenter', docEnter).on('dragover', docOver).on('dragleave', docLeave);

if ( opts.fallback_dropzoneClick === true && opts.fallback_id )
{
// Fallback must be an input[type='file']
var fallback_type = $('#' + opts.fallback_id).attr('type');
if(fallback_type !== 'file') {
throw "Fallback element ["+opts.fallback_id+"] must be of type 'file', but it is of '" + fallback_type + "'.";
}

$('#' + opts.fallback_id).css({
display: 'none',
width: 0,
height: 0
});
}

this.on('drop', drop).on('dragstart', opts.dragStart).on('dragenter', dragEnter).on('dragover', dragOver).on('dragleave', dragLeave);
$(document).on('drop', docDrop).on('dragenter', docEnter).on('dragover', docOver).on('dragleave', docLeave);

if ( opts.fallback_dropzoneClick === true )
{
if ( this.find('#' + opts.fallback_id).length > 0 )
{
throw "Fallback element ["+opts.fallback_id+"] cannot be inside dropzone, unless option fallback_dropzoneClick is false";
Expand All @@ -97,12 +100,14 @@
}
}

$('#' + opts.fallback_id).change(function(e) {
opts.drop(e);
files = e.target.files;
files_count = files.length;
upload();
});
if(opts.fallback_id) {
$('#' + opts.fallback_id).change(function(e) {
opts.drop(e);
files = e.target.files;
files_count = files.length;
upload();
});
}

function drop(e) {
if( opts.drop.call(this, e) === false ) return false;
Expand Down Expand Up @@ -424,7 +429,7 @@
this.send(ui8a.buffer);
}
}

xhr.sendAsBinary(builder);

global_progress[global_progress_index] = 0;
Expand Down