Skip to content

Commit

Permalink
fixed #1344, fixed #1307, fixed #1325, fixed #1323, fixed #1336, fixed
Browse files Browse the repository at this point in the history
…#1335, fixed #1341, fixed #1342
  • Loading branch information
Danial Farid authored and Danial Farid committed Feb 14, 2016
1 parent 03fa0ce commit 7758b69
Show file tree
Hide file tree
Showing 24 changed files with 845 additions and 620 deletions.
9 changes: 8 additions & 1 deletion README.md
Expand Up @@ -165,7 +165,7 @@ At least one of the `ngf-select` or `ngf-drop` are mandatory for the plugin to l
// updateOn could be used to disable resetting on click, or updating on paste, browser image drop, etc.
// allowInvalid default is false could allow invalid files in the model
// debouncing will postpone model update (miliseconds). See angular ng-model-options for more details.
ngf-model-invalid="invalidFilesArray" // binds the invalid selected/dropped files to this model.
ngf-model-invalid="invalidFile(s)" // binds the invalid selected/dropped file or files to this model.
ng-disabled="boolean" // disables this element
ngf-select-disabled="boolean" // default false, disables file select on this element
ngf-drop-disabled="boolean" // default false, disables file drop on this element
Expand Down Expand Up @@ -342,6 +342,13 @@ Upload.http({
/* Set the default values for ngf-select and ngf-drop directives*/
Upload.setDefaults({ngfMinSize: 20000, ngfMaxSize:20000000, ...})

// These two defaults could be decreased if you experience out of memory issues
// or could be increased if your app needs to show many images on the page.
// Each image in ngf-src, ngf-background or ngf-thumbnail is stored and referenced as a blob url
// and will only be released if the max value of the followings is reached.
Upload.defaults.blobUrlsMaxMemory = 268435456 // default max total size of files stored in blob urls.
Upload.defaults.blobUrlsMaxQueueSize = 200 // default max number of blob urls stored by this application.

/* Convert a single file or array of files to a single or array of
base64 data url representation of the file(s).
Could be used to send file in base64 format inside json to the databases */
Expand Down
4 changes: 2 additions & 2 deletions demo/src/main/webapp/index.html
Expand Up @@ -205,11 +205,11 @@ <h3>
<div class="srv-title">How to upload to the server:</div>

<div class="howto">
<label><input type="radio" name="howToSend" ng-model="howToSend" value="1" ng-init="howToSend = 1">$upload.upload():
<label><input type="radio" name="howToSend" ng-model="howToSend" value="1" ng-init="howToSend = 1">Upload.upload():
multipart/form-data upload cross browser</label>
<br/>
<label><input type="radio" name="howToSend" ng-model="howToSend" value="2"
ng-disabled="usingFlash">$upload.http(): binary content with file's
ng-disabled="usingFlash">Upload.http(): binary content with file's
Content-Type</label>

<div class="sub">Can be used to upload files directory into <a
Expand Down
2 changes: 1 addition & 1 deletion demo/src/main/webapp/js/FileAPI.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7758b69

Please sign in to comment.