Skip to content

Added support for functions in 'data' option for ajaxForm and ajaxSubmit. #262

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

Merged
merged 5 commits into from
Feb 20, 2017
Merged

Added support for functions in 'data' option for ajaxForm and ajaxSubmit. #262

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10676ff
Added support for functions in 'data' option for ajaxForm and ajaxSub…
franciscoruiz Dec 20, 2012
cb6d50a
Fixed incorrect serialization of extraData
Jan 8, 2013
97cd97b
Reverted customizations for file uploading.
franciscoruiz Feb 4, 2013
453ff1d
Merge branch 'master' of https://github.com/malsup/form
Feb 4, 2013
29d282b
Merge remote-tracking branch 'malsup/master'
Jul 9, 2014
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
9 changes: 4 additions & 5 deletions jquery.form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,9 @@ $.fn.ajaxSubmit = function(options) {
var elements = [];
var qx, a = this.formToArray(options.semantic, elements);
if (options.data) {
options.extraData = options.data;
qx = $.param(options.data, traditional);
var optionsData = $.isFunction(options.data) ? options.data(a) : options.data;
options.extraData = optionsData;
qx = $.param(optionsData, traditional);
}

// give pre-submit callback an opportunity to abort the submit
Expand Down Expand Up @@ -275,16 +276,14 @@ $.fn.ajaxSubmit = function(options) {
var result = [];
var i, part;
for (i=0; i < len; i++) {
// #252; undo param space replacement
serialized[i] = serialized[i].replace(/\+/g,' ');
part = serialized[i].split('=');
// #278; use array instead of object storage, favoring array serializations
result.push([decodeURIComponent(part[0]), decodeURIComponent(part[1])]);
}
return result;
}

// XMLHttpRequest Level 2 file uploads (big hat tip to francois2metz)
// XMLHttpRequest Level 2 file uploads (big hat tip to francois2metz)
function fileUploadXhr(a) {
var formdata = new FormData();

Expand Down