diff --git a/scripts/jquery.form.js b/scripts/jquery.form.js
index 2731765..6fa4042 100644
--- a/scripts/jquery.form.js
+++ b/scripts/jquery.form.js
@@ -1,16 +1,28 @@
/*!
* jQuery Form Plugin
- * version: 3.15 (09-SEP-2012)
- * @requires jQuery v1.3.2 or later
- *
+ * version: 3.48.0-2013.12.28
+ * Requires jQuery v1.5 or later
+ * Copyright (c) 2013 M. Alsup
* Examples and documentation at: http://malsup.com/jquery/form/
* Project repository: https://github.com/malsup/form
- * Dual licensed under the MIT and GPL licenses:
- * http://malsup.github.com/mit-license.txt
- * http://malsup.github.com/gpl-license-v2.txt
+ * Dual licensed under the MIT and GPL licenses.
+ * https://github.com/malsup/form#copyright-and-license
*/
-/*global ActiveXObject alert */
-;(function($) {
+/*global ActiveXObject */
+
+// AMD support
+(function (factory) {
+ "use strict";
+ if (typeof define === 'function' && define.amd) {
+ // using AMD; register as anon module
+ define(['jquery'], factory);
+ } else {
+ // no AMD; invoke directly
+ factory( (typeof(jQuery) != 'undefined') ? jQuery : window.Zepto );
+ }
+}
+
+(function($) {
"use strict";
/*
@@ -37,7 +49,7 @@
target: '#output'
});
});
-
+
You can also use ajaxForm with delegation (requires jQuery v1.7+), so the
form does not have to exist when you invoke ajaxForm:
@@ -45,7 +57,7 @@
delegation: true,
target: '#output'
});
-
+
When using ajaxForm, the ajaxSubmit function will be invoked for you
at the appropriate time.
*/
@@ -57,6 +69,23 @@ var feature = {};
feature.fileapi = $("").get(0).files !== undefined;
feature.formdata = window.FormData !== undefined;
+var hasProp = !!$.fn.prop;
+
+// attr2 uses prop when it can but checks the return type for
+// an expected string. this accounts for the case where a form
+// contains inputs with names like "action" or "method"; in those
+// cases "prop" returns the element
+$.fn.attr2 = function() {
+ if ( ! hasProp ) {
+ return this.attr.apply(this, arguments);
+ }
+ var val = this.prop.apply(this, arguments);
+ if ( ( val && val.jquery ) || typeof val === 'string' ) {
+ return val;
+ }
+ return this.attr.apply(this, arguments);
+};
+
/**
* ajaxSubmit() provides a mechanism for immediately submitting
* an HTML form using AJAX.
@@ -69,15 +98,19 @@ $.fn.ajaxSubmit = function(options) {
log('ajaxSubmit: skipping submit process - no element selected');
return this;
}
-
+
var method, action, url, $form = this;
if (typeof options == 'function') {
options = { success: options };
}
+ else if ( options === undefined ) {
+ options = {};
+ }
+
+ method = options.type || this.attr2('method');
+ action = options.url || this.attr2('action');
- method = this.attr('method');
- action = this.attr('action');
url = (typeof action === 'string') ? $.trim(action) : '';
url = url || window.location.href || '';
if (url) {
@@ -88,7 +121,7 @@ $.fn.ajaxSubmit = function(options) {
options = $.extend(true, {
url: url,
success: $.ajaxSettings.success,
- type: method || 'GET',
+ type: method || $.ajaxSettings.type,
iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
}, options);
@@ -111,7 +144,7 @@ $.fn.ajaxSubmit = function(options) {
if ( traditional === undefined ) {
traditional = $.ajaxSettings.traditional;
}
-
+
var elements = [];
var qx, a = this.formToArray(options.semantic, elements);
if (options.data) {
@@ -135,7 +168,7 @@ $.fn.ajaxSubmit = function(options) {
var q = $.param(a, traditional);
if (qx) {
q = ( q ? (q + '&' + qx) : qx );
- }
+ }
if (options.type.toUpperCase() == 'GET') {
options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
options.data = null; // data is null for 'get'
@@ -165,14 +198,34 @@ $.fn.ajaxSubmit = function(options) {
}
options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
- var context = options.context || this ; // jQuery 1.4+ supports scope context
+ var context = options.context || this ; // jQuery 1.4+ supports scope context
for (var i=0, max=callbacks.length; i < max; i++) {
callbacks[i].apply(context, [data, status, xhr || $form, $form]);
}
};
+ if (options.error) {
+ var oldError = options.error;
+ options.error = function(xhr, status, error) {
+ var context = options.context || this;
+ oldError.apply(context, [xhr, status, error, $form]);
+ };
+ }
+
+ if (options.complete) {
+ var oldComplete = options.complete;
+ options.complete = function(xhr, status) {
+ var context = options.context || this;
+ oldComplete.apply(context, [xhr, status, $form]);
+ };
+ }
+
// are there files to upload?
- var fileInputs = $('input:file:enabled[value]', this); // [value] (issue #113)
+
+ // [value] (issue #113), also see comment:
+ // https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219
+ var fileInputs = $('input[type=file]:enabled', this).filter(function() { return $(this).val() !== ''; });
+
var hasFileInputs = fileInputs.length > 0;
var mp = 'multipart/form-data';
var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
@@ -181,6 +234,8 @@ $.fn.ajaxSubmit = function(options) {
log("fileAPI :" + fileAPI);
var shouldUseFrame = (hasFileInputs || multipart) && !fileAPI;
+ var jqxhr;
+
// options.iframe allows user to force iframe mode
// 06-NOV-09: now defaulting to iframe mode if file input is detected
if (options.iframe !== false && (options.iframe || shouldUseFrame)) {
@@ -188,23 +243,26 @@ $.fn.ajaxSubmit = function(options) {
// see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
if (options.closeKeepAlive) {
$.get(options.closeKeepAlive, function() {
- fileUploadIframe(a);
+ jqxhr = fileUploadIframe(a);
});
}
- else {
- fileUploadIframe(a);
- }
+ else {
+ jqxhr = fileUploadIframe(a);
+ }
}
else if ((hasFileInputs || multipart) && fileAPI) {
- fileUploadXhr(a);
+ jqxhr = fileUploadXhr(a);
}
else {
- $.ajax(options);
+ jqxhr = $.ajax(options);
}
+ $form.removeData('jqxhr').data('jqxhr', jqxhr);
+
// clear element array
- for (var k=0; k < elements.length; k++)
+ for (var k=0; k < elements.length; k++) {
elements[k] = null;
+ }
// fire 'notify' event
this.trigger('form-submit-notify', [this, options]);
@@ -212,13 +270,16 @@ $.fn.ajaxSubmit = function(options) {
// utility fn for deep serialization
function deepSerialize(extraData){
- var serialized = $.param(extraData).split('&');
+ var serialized = $.param(extraData, options.traditional).split('&');
var len = serialized.length;
- var result = {};
+ 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('=');
- result[decodeURIComponent(part[0])] = decodeURIComponent(part[1]);
+ // #278; use array instead of object storage, favoring array serializations
+ result.push([decodeURIComponent(part[0]), decodeURIComponent(part[1])]);
}
return result;
}
@@ -233,9 +294,11 @@ $.fn.ajaxSubmit = function(options) {
if (options.extraData) {
var serializedData = deepSerialize(options.extraData);
- for (var p in serializedData)
- if (serializedData.hasOwnProperty(p))
- formdata.append(p, serializedData[p]);
+ for (i=0; i < serializedData.length; i++) {
+ if (serializedData[i]) {
+ formdata.append(serializedData[i][0], serializedData[i][1]);
+ }
+ }
}
options.data = null;
@@ -244,15 +307,15 @@ $.fn.ajaxSubmit = function(options) {
contentType: false,
processData: false,
cache: false,
- type: 'POST'
+ type: method || 'POST'
});
-
+
if (options.uploadProgress) {
// workaround because jqXHR does not expose upload property
s.xhr = function() {
- var xhr = jQuery.ajaxSettings.xhr();
+ var xhr = $.ajaxSettings.xhr();
if (xhr.upload) {
- xhr.upload.onprogress = function(event) {
+ xhr.upload.addEventListener('progress', function(event) {
var percent = 0;
var position = event.loaded || event.position; /*event.position is deprecated*/
var total = event.total;
@@ -260,42 +323,49 @@ $.fn.ajaxSubmit = function(options) {
percent = Math.ceil(position / total * 100);
}
options.uploadProgress(event, position, total, percent);
- };
+ }, false);
}
return xhr;
};
}
s.data = null;
- var beforeSend = s.beforeSend;
- s.beforeSend = function(xhr, o) {
+ var beforeSend = s.beforeSend;
+ s.beforeSend = function(xhr, o) {
+ //Send FormData() provided by user
+ if (options.formData) {
+ o.data = options.formData;
+ }
+ else {
o.data = formdata;
- if(beforeSend)
- beforeSend.call(this, xhr, o);
+ }
+ if(beforeSend) {
+ beforeSend.call(this, xhr, o);
+ }
};
- $.ajax(s);
+ return $.ajax(s);
}
// private function for handling file uploads (hat tip to YAHOO!)
function fileUploadIframe(a) {
var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
- var useProp = !!$.fn.prop;
+ var deferred = $.Deferred();
+
+ // #341
+ deferred.abort = function(status) {
+ xhr.abort(status);
+ };
- if ($(':input[name=submit],:input[id=submit]', form).length) {
- // if there is an input with a name or id of 'submit' then we won't be
- // able to invoke the submit fn on the form (at least not x-browser)
- alert('Error: Form elements must not have name or id of "submit".');
- return;
- }
-
if (a) {
// ensure that every serialized input is still enabled
for (i=0; i < elements.length; i++) {
el = $(elements[i]);
- if ( useProp )
+ if ( hasProp ) {
el.prop('disabled', false);
- else
+ }
+ else {
el.removeAttr('disabled');
+ }
}
}
@@ -304,11 +374,13 @@ $.fn.ajaxSubmit = function(options) {
id = 'jqFormIO' + (new Date().getTime());
if (s.iframeTarget) {
$io = $(s.iframeTarget);
- n = $io.attr('name');
- if (!n)
- $io.attr('name', id);
- else
+ n = $io.attr2('name');
+ if (!n) {
+ $io.attr2('name', id);
+ }
+ else {
id = n;
+ }
}
else {
$io = $('');
@@ -330,20 +402,25 @@ $.fn.ajaxSubmit = function(options) {
var e = (status === 'timeout' ? 'timeout' : 'aborted');
log('aborting upload... ' + e);
this.aborted = 1;
- // #214
- if (io.contentWindow.document.execCommand) {
- try { // #214
+
+ try { // #214, #257
+ if (io.contentWindow.document.execCommand) {
io.contentWindow.document.execCommand('Stop');
- } catch(ignore) {}
+ }
}
+ catch(ignore) {}
+
$io.attr('src', s.iframeSrc); // abort op in progress
xhr.error = e;
- if (s.error)
+ if (s.error) {
s.error.call(s.context, xhr, e, status);
- if (g)
+ }
+ if (g) {
$.event.trigger("ajaxError", [xhr, s, e]);
- if (s.complete)
+ }
+ if (s.complete) {
s.complete.call(s.context, xhr, e);
+ }
}
};
@@ -360,10 +437,12 @@ $.fn.ajaxSubmit = function(options) {
if (s.global) {
$.active--;
}
- return;
+ deferred.reject();
+ return deferred;
}
if (xhr.aborted) {
- return;
+ deferred.reject();
+ return deferred;
}
// add submitting element to data if we know it
@@ -379,15 +458,44 @@ $.fn.ajaxSubmit = function(options) {
}
}
}
-
+
var CLIENT_TIMEOUT_ABORT = 1;
var SERVER_ABORT = 2;
-
+
function getDoc(frame) {
- var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
+ /* it looks like contentWindow or contentDocument do not
+ * carry the protocol property in ie8, when running under ssl
+ * frame.document is the only valid response document, since
+ * the protocol is know but not on the other two objects. strange?
+ * "Same origin policy" http://en.wikipedia.org/wiki/Same_origin_policy
+ */
+
+ var doc = null;
+
+ // IE8 cascading access check
+ try {
+ if (frame.contentWindow) {
+ doc = frame.contentWindow.document;
+ }
+ } catch(err) {
+ // IE8 access denied under ssl & missing protocol
+ log('cannot get iframe.contentWindow document: ' + err);
+ }
+
+ if (doc) { // successful getting content
+ return doc;
+ }
+
+ try { // simply checking may throw in ie8 under ssl or mismatched protocol
+ doc = frame.contentDocument ? frame.contentDocument : frame.document;
+ } catch(err) {
+ // last attempt
+ log('cannot get iframe.contentDocument: ' + err);
+ doc = frame.document;
+ }
return doc;
}
-
+
// Rails CSRF hack (thanks to Yvan Barthelemy)
var csrf_token = $('meta[name=csrf-token]').attr('content');
var csrf_param = $('meta[name=csrf-param]').attr('content');
@@ -399,11 +507,14 @@ $.fn.ajaxSubmit = function(options) {
// take a breath so that pending repaints get some cpu time before the upload starts
function doSubmit() {
// make sure form attrs are set
- var t = $form.attr('target'), a = $form.attr('action');
+ var t = $form.attr2('target'),
+ a = $form.attr2('action'),
+ mp = 'multipart/form-data',
+ et = $form.attr('enctype') || $form.attr('encoding') || mp;
// update form attrs in IE friendly way
form.setAttribute('target',id);
- if (!method) {
+ if (!method || /post/i.test(method) ) {
form.setAttribute('method', 'POST');
}
if (a != s.url) {
@@ -422,20 +533,22 @@ $.fn.ajaxSubmit = function(options) {
if (s.timeout) {
timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
}
-
+
// look for server aborts
function checkState() {
try {
var state = getDoc(io).readyState;
log('state = ' + state);
- if (state && state.toLowerCase() == 'uninitialized')
+ if (state && state.toLowerCase() == 'uninitialized') {
setTimeout(checkState,50);
+ }
}
catch(e) {
log('Server abort: ' , e, ' (', e.name, ')');
cb(SERVER_ABORT);
- if (timeoutHandle)
+ if (timeoutHandle) {
clearTimeout(timeoutHandle);
+ }
timeoutHandle = undefined;
}
}
@@ -449,11 +562,11 @@ $.fn.ajaxSubmit = function(options) {
// if using the $.param format that allows for multiple values with the same name
if($.isPlainObject(s.extraData[n]) && s.extraData[n].hasOwnProperty('name') && s.extraData[n].hasOwnProperty('value')) {
extraInputs.push(
- $('').attr('value',s.extraData[n].value)
+ $('').val(s.extraData[n].value)
.appendTo(form)[0]);
} else {
extraInputs.push(
- $('').attr('value',s.extraData[n])
+ $('').val(s.extraData[n])
.appendTo(form)[0]);
}
}
@@ -463,17 +576,27 @@ $.fn.ajaxSubmit = function(options) {
if (!s.iframeTarget) {
// add iframe to doc and submit the form
$io.appendTo('body');
- if (io.attachEvent)
- io.attachEvent('onload', cb);
- else
- io.addEventListener('load', cb, false);
+ }
+ if (io.attachEvent) {
+ io.attachEvent('onload', cb);
+ }
+ else {
+ io.addEventListener('load', cb, false);
}
setTimeout(checkState,15);
- form.submit();
+
+ try {
+ form.submit();
+ } catch(err) {
+ // just in case form has element with name/id of 'submit'
+ var submitFn = document.createElement('form').submit;
+ submitFn.apply(form);
+ }
}
finally {
// reset attrs and remove "extra" input elements
form.setAttribute('action',a);
+ form.setAttribute('enctype', et); // #380
if(t) {
form.setAttribute('target', t);
} else {
@@ -496,31 +619,35 @@ $.fn.ajaxSubmit = function(options) {
if (xhr.aborted || callbackProcessed) {
return;
}
- try {
- doc = getDoc(io);
- }
- catch(ex) {
- log('cannot access response document: ', ex);
+
+ doc = getDoc(io);
+ if(!doc) {
+ log('cannot access response document');
e = SERVER_ABORT;
}
if (e === CLIENT_TIMEOUT_ABORT && xhr) {
xhr.abort('timeout');
+ deferred.reject(xhr, 'timeout');
return;
}
else if (e == SERVER_ABORT && xhr) {
xhr.abort('server abort');
+ deferred.reject(xhr, 'error', 'server abort');
return;
}
if (!doc || doc.location.href == s.iframeSrc) {
// response not received yet
- if (!timedOut)
+ if (!timedOut) {
return;
+ }
}
- if (io.detachEvent)
+ if (io.detachEvent) {
io.detachEvent('onload', cb);
- else
+ }
+ else {
io.removeEventListener('load', cb, false);
+ }
var status = 'success', errMsg;
try {
@@ -547,11 +674,12 @@ $.fn.ajaxSubmit = function(options) {
var docRoot = doc.body ? doc.body : doc.documentElement;
xhr.responseText = docRoot ? docRoot.innerHTML : null;
xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
- if (isXml)
+ if (isXml) {
s.dataType = 'xml';
+ }
xhr.getResponseHeader = function(header){
var headers = {'content-type': s.dataType};
- return headers[header];
+ return headers[header.toLowerCase()];
};
// support for XHR 'status' & 'statusText' emulation :
if (docRoot) {
@@ -589,15 +717,15 @@ $.fn.ajaxSubmit = function(options) {
try {
data = httpData(xhr, dt, s);
}
- catch (e) {
+ catch (err) {
status = 'parsererror';
- xhr.error = errMsg = (e || status);
+ xhr.error = errMsg = (err || status);
}
}
- catch (e) {
- log('error caught: ',e);
+ catch (err) {
+ log('error caught: ',err);
status = 'error';
- xhr.error = errMsg = (e || status);
+ xhr.error = errMsg = (err || status);
}
if (xhr.aborted) {
@@ -611,38 +739,52 @@ $.fn.ajaxSubmit = function(options) {
// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
if (status === 'success') {
- if (s.success)
+ if (s.success) {
s.success.call(s.context, data, 'success', xhr);
- if (g)
+ }
+ deferred.resolve(xhr.responseText, 'success', xhr);
+ if (g) {
$.event.trigger("ajaxSuccess", [xhr, s]);
+ }
}
else if (status) {
- if (errMsg === undefined)
+ if (errMsg === undefined) {
errMsg = xhr.statusText;
- if (s.error)
+ }
+ if (s.error) {
s.error.call(s.context, xhr, status, errMsg);
- if (g)
+ }
+ deferred.reject(xhr, 'error', errMsg);
+ if (g) {
$.event.trigger("ajaxError", [xhr, s, errMsg]);
+ }
}
- if (g)
+ if (g) {
$.event.trigger("ajaxComplete", [xhr, s]);
+ }
if (g && ! --$.active) {
$.event.trigger("ajaxStop");
}
- if (s.complete)
+ if (s.complete) {
s.complete.call(s.context, xhr, status);
+ }
callbackProcessed = true;
- if (s.timeout)
+ if (s.timeout) {
clearTimeout(timeoutHandle);
+ }
// clean up
setTimeout(function() {
- if (!s.iframeTarget)
+ if (!s.iframeTarget) {
$io.remove();
+ }
+ else { //adding else to clean up existing iframe response.
+ $io.attr('src', s.iframeSrc);
+ }
xhr.responseXML = null;
}, 100);
}
@@ -670,8 +812,9 @@ $.fn.ajaxSubmit = function(options) {
data = xml ? xhr.responseXML : xhr.responseText;
if (xml && data.documentElement.nodeName === 'parsererror') {
- if ($.error)
+ if ($.error) {
$.error('parsererror');
+ }
}
if (s && s.dataFilter) {
data = s.dataFilter(data, type);
@@ -685,6 +828,8 @@ $.fn.ajaxSubmit = function(options) {
}
return data;
};
+
+ return deferred;
}
};
@@ -706,7 +851,7 @@ $.fn.ajaxSubmit = function(options) {
$.fn.ajaxForm = function(options) {
options = options || {};
options.delegation = options.delegation && $.isFunction($.fn.on);
-
+
// in jQuery 1.3+ we can fix mistakes with the ready state
if (!options.delegation && this.length === 0) {
var o = { s: this.selector, c: this.context };
@@ -736,23 +881,23 @@ $.fn.ajaxForm = function(options) {
.bind('click.form-plugin', options, captureSubmittingElement);
};
-// private event handlers
+// private event handlers
function doAjaxSubmit(e) {
/*jshint validthis:true */
var options = e.data;
if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
e.preventDefault();
- $(this).ajaxSubmit(options);
+ $(e.target).ajaxSubmit(options); // #365
}
}
-
+
function captureSubmittingElement(e) {
/*jshint validthis:true */
var target = e.target;
var $el = $(target);
- if (!($el.is(":submit,input:image"))) {
+ if (!($el.is("[type=submit],[type=image]"))) {
// is this a child element of the submit el? (ex: a span within a button)
- var t = $el.closest(':submit');
+ var t = $el.closest('[type=submit]');
if (t.length === 0) {
return;
}
@@ -801,8 +946,23 @@ $.fn.formToArray = function(semantic, elements) {
}
var form = this[0];
+ var formId = this.attr('id');
var els = semantic ? form.getElementsByTagName('*') : form.elements;
- if (!els) {
+ var els2;
+
+ if ( els ) {
+ els = $(els).get(); // convert to standard array
+ }
+
+ // #386; account for inputs outside the form which use the 'form' attribute
+ if ( formId ) {
+ els2 = $(':input[form=' + formId + ']').get();
+ if ( els2.length ) {
+ els = (els || []).concat(els2);
+ }
+ }
+
+ if (!els || !els.length) {
return a;
}
@@ -810,13 +970,13 @@ $.fn.formToArray = function(semantic, elements) {
for(i=0, max=els.length; i < max; i++) {
el = els[i];
n = el.name;
- if (!n) {
+ if (!n || el.disabled) {
continue;
}
if (semantic && form.clk && el.type == "image") {
// handle image inputs on the fly when semantic == true
- if(!el.disabled && form.clk == el) {
+ if(form.clk == el) {
a.push({name: n, value: $(el).val(), type: el.type });
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
}
@@ -825,15 +985,17 @@ $.fn.formToArray = function(semantic, elements) {
v = $.fieldValue(el, true);
if (v && v.constructor == Array) {
- if (elements)
+ if (elements) {
elements.push(el);
+ }
for(j=0, jmax=v.length; j < jmax; j++) {
a.push({name: n, value: v[j]});
}
}
- else if (feature.fileapi && el.type == 'file' && !el.disabled) {
- if (elements)
+ else if (feature.fileapi && el.type == 'file') {
+ if (elements) {
elements.push(el);
+ }
var files = el.files;
if (files.length) {
for (j=0; j < files.length; j++) {
@@ -846,8 +1008,9 @@ $.fn.formToArray = function(semantic, elements) {
}
}
else if (v !== null && typeof v != 'undefined') {
- if (elements)
+ if (elements) {
elements.push(el);
+ }
a.push({name: n, value: v, type: el.type, required: el.required});
}
}
@@ -910,19 +1073,19 @@ $.fn.fieldSerialize = function(successful) {
*
*
*
- * var v = $(':text').fieldValue();
+ * var v = $('input[type=text]').fieldValue();
* // if no values are entered into the text inputs
* v == ['','']
* // if values entered into the text inputs are 'foo' and 'bar'
* v == ['foo','bar']
*
- * var v = $(':checkbox').fieldValue();
+ * var v = $('input[type=checkbox]').fieldValue();
* // if neither checkbox is checked
* v === undefined
* // if both checkboxes are checked
* v == ['B1', 'B2']
*
- * var v = $(':radio').fieldValue();
+ * var v = $('input[type=radio]').fieldValue();
* // if neither radio is checked
* v === undefined
* // if first radio is checked
@@ -943,10 +1106,12 @@ $.fn.fieldValue = function(successful) {
if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
continue;
}
- if (v.constructor == Array)
+ if (v.constructor == Array) {
$.merge(val, v);
- else
+ }
+ else {
val.push(v);
+ }
}
return val;
};
@@ -980,7 +1145,7 @@ $.fieldValue = function(el, successful) {
if (op.selected) {
var v = op.value;
if (!v) { // extra pain for IE...
- v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+ v = (op.attributes && op.attributes.value && !(op.attributes.value.specified)) ? op.text : op.value;
}
if (one) {
return v;
@@ -1023,14 +1188,22 @@ $.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
else if (tag == 'select') {
this.selectedIndex = -1;
}
+ else if (t == "file") {
+ if (/MSIE/.test(navigator.userAgent)) {
+ $(this).replaceWith($(this).clone(true));
+ } else {
+ $(this).val('');
+ }
+ }
else if (includeHidden) {
// includeHidden can be the value true, or it can be a selector string
// indicating a special test; for example:
// $('#myForm').clearForm('.special:hidden')
// the above would clean hidden inputs that have the class of 'special'
if ( (includeHidden === true && /hidden/.test(t)) ||
- (typeof includeHidden == 'string' && $(this).is(includeHidden)) )
+ (typeof includeHidden == 'string' && $(this).is(includeHidden)) ) {
this.value = '';
+ }
}
});
};
@@ -1089,8 +1262,9 @@ $.fn.ajaxSubmit.debug = false;
// helper fn for console logging
function log() {
- if (!$.fn.ajaxSubmit.debug)
+ if (!$.fn.ajaxSubmit.debug) {
return;
+ }
var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
if (window.console && window.console.log) {
window.console.log(msg);
@@ -1100,4 +1274,5 @@ function log() {
}
}
-})(jQuery);
\ No newline at end of file
+}));
+