Skip to content

Commit

Permalink
Merge branch 'file-data-file'
Browse files Browse the repository at this point in the history
  • Loading branch information
plepe committed Nov 26, 2018
2 parents c45bd15 + 1b10103 commit 50f1ea5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Newer
* Form Element Form Chooser: children may have option 'non_used_value'
* Form Element Array (and Hash): new check 'count'
* Form Element File: replace 'Change' by 'Delete' button
* Form Element File: include 'file' in JS data (when uploading, JS type File)

2017-09-15 (Version >= 2.6)
---------------------------
Expand Down
1 change: 1 addition & 0 deletions inc/form_element_file.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ form_element_file.prototype.get_data=function() {
data.ext = file['name'].substr(file['name'].lastIndexOf(".") + 1);

this.js_file = file;
data.file = this.js_file
}
else {
data.orig_name = this.dom_element.value;
Expand Down

0 comments on commit 50f1ea5

Please sign in to comment.