Permalink
Browse files

Return full error messages.

Updated requirements.
  • Loading branch information...
1 parent aa5ed85 commit 40ec6801ca979d27c8f82d63c2bad3ce7a7b9625 @blueimp committed Oct 17, 2012
Showing with 12 additions and 12 deletions.
  1. +4 −4 README.md
  2. +5 −5 js/jquery.fileupload-ui.js
  3. +3 −3 package.json
View
@@ -52,12 +52,12 @@ Please also provide a [JSFiddle](http://jsfiddle.net/) to allow to reproduce the
## Requirements
* [jQuery](http://jquery.com/) v. 1.6+
-* [jQuery UI widget factory](http://wiki.jqueryui.com/w/page/12138135/Widget%20factory) v. 1.8+
+* [jQuery UI widget factory](http://wiki.jqueryui.com/w/page/12138135/Widget%20factory) v. 1.8+ (included)
* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/jquery.iframe-transport.js) (included)
* [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.1.0+ (optional)
-* [JavaScript Load Image function](https://github.com/blueimp/JavaScript-Load-Image) v. 1.1.6+ (optional)
-* [JavaScript Canvas to Blob function](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.0.0+ (optional)
-* [Bootstrap CSS Toolkit](https://github.com/twitter/bootstrap/) v. 2.0+ (optional)
+* [JavaScript Load Image function](https://github.com/blueimp/JavaScript-Load-Image) v. 1.2.1+ (optional)
+* [JavaScript Canvas to Blob function](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.0.3+ (optional)
+* [Bootstrap CSS Toolkit](https://github.com/twitter/bootstrap/) v. 2.1+ (optional)
The jQuery UI widget factory is a requirement for the basic File Upload plugin, but very lightweight without any other dependencies.
The jQuery Iframe Transport is required for [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
View
@@ -1,5 +1,5 @@
/*
- * jQuery File Upload User Interface Plugin 6.9.6
+ * jQuery File Upload User Interface Plugin 6.9.7
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
@@ -399,22 +399,22 @@
// maxNumberOfFiles before validation, so we check if
// maxNumberOfFiles is below 0 (instead of below 1):
if (this.options.maxNumberOfFiles < 0) {
- return 'maxNumberOfFiles';
+ return 'Maximum number of files exceeded';
}
// Files are accepted if either the file type or the file name
// matches against the acceptFileTypes regular expression, as
// only browsers with support for the File API report the type:
if (!(this.options.acceptFileTypes.test(file.type) ||
this.options.acceptFileTypes.test(file.name))) {
- return 'acceptFileTypes';
+ return 'Filetype not allowed';
}
if (this.options.maxFileSize &&
file.size > this.options.maxFileSize) {
- return 'maxFileSize';
+ return 'File is too big';
}
if (typeof file.size === 'number' &&
file.size < this.options.minFileSize) {
- return 'minFileSize';
+ return 'File is too small';
}
return null;
},
View
@@ -1,6 +1,6 @@
{
"name": "blueimp-file-upload",
- "version": "6.9.6",
+ "version": "6.9.7",
"title": "jQuery File Upload",
"description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.",
"keywords": [
@@ -50,7 +50,7 @@
"jquery": ">=1.6",
"jquery.ui.widget": ">=1.8",
"blueimp-tmpl": ">=2.1.0",
- "blueimp-load-image": ">=1.1.6",
- "blueimp-canvas-to-blob": ">=2.0.0"
+ "blueimp-load-image": ">=1.2.1",
+ "blueimp-canvas-to-blob": ">=2.0.3"
}
}

0 comments on commit 40ec680

Please sign in to comment.