From beb75371fa2091320bbe761c156efa86cf280f4d Mon Sep 17 00:00:00 2001
From: Julian Seidenberg <julian@silverstripe.com>
Date: Thu, 24 Feb 2011 17:47:34 +1300
Subject: [PATCH] BUGFIX: update jquery form to latest version

---
 thirdparty/jquery-form/.piston.yml    |   2 +-
 thirdparty/jquery-form/jquery.form.js | 408 +++++++++++++++++---------
 2 files changed, 269 insertions(+), 141 deletions(-)

diff --git a/thirdparty/jquery-form/.piston.yml b/thirdparty/jquery-form/.piston.yml
index fa6d4eee5..b137baa3f 100644
--- a/thirdparty/jquery-form/.piston.yml
+++ b/thirdparty/jquery-form/.piston.yml
@@ -1,7 +1,7 @@
 --- 
 format: 1
 handler: 
-  commit: 1f9901ad56ba458c8db0bffb759dbb65921891ae
+  commit: 317312dbb96538297b540be19e42533c4baea6ec
   branch: master
 lock: false
 repository_class: Piston::Git::Repository
diff --git a/thirdparty/jquery-form/jquery.form.js b/thirdparty/jquery-form/jquery.form.js
index be8c0b6bf..14e14572a 100644
--- a/thirdparty/jquery-form/jquery.form.js
+++ b/thirdparty/jquery-form/jquery.form.js
@@ -1,6 +1,6 @@
 /*!
  * jQuery Form Plugin
- * version: 2.43 (12-MAR-2010)
+ * version: 2.63 (29-JAN-2011)
  * @requires jQuery v1.3.2 or later
  *
  * Examples and documentation at: http://malsup.com/jquery/form/
@@ -18,11 +18,11 @@
 	to bind your own submit handler to the form.  For example,
 
 	$(document).ready(function() {
-		$('#myForm').bind('submit', function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
 			$(this).ajaxSubmit({
 				target: '#output'
 			});
-			return false; // <-- important!
 		});
 	});
 
@@ -50,21 +50,23 @@ $.fn.ajaxSubmit = function(options) {
 		return this;
 	}
 
-	if (typeof options == 'function')
+	if (typeof options == 'function') {
 		options = { success: options };
+	}
 
-	var url = $.trim(this.attr('action'));
+	var action = this.attr('action');
+	var url = (typeof action === 'string') ? $.trim(action) : '';
 	if (url) {
 		// clean url (don't include hash vaue)
 		url = (url.match(/^([^#]+)/)||[])[1];
-   	}
-   	url = url || window.location.href || '';
+	}
+	url = url || window.location.href || '';
 
-	options = $.extend({
+	options = $.extend(true, {
 		url:  url,
-		type: this.attr('method') || 'GET',
+		type: this[0].getAttribute('method') || 'GET', // IE7 massage (see issue 57)
 		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
-	}, options || {});
+	}, options);
 
 	// hook for manipulating the form data before it is extracted;
 	// convenient for use with rich editors like tinyMCE or FCKEditor
@@ -81,16 +83,20 @@ $.fn.ajaxSubmit = function(options) {
 		return this;
 	}
 
-	var a = this.formToArray(options.semantic);
+	var n,v,a = this.formToArray(options.semantic);
 	if (options.data) {
 		options.extraData = options.data;
-		for (var n in options.data) {
-		  if(options.data[n] instanceof Array) {
-			for (var k in options.data[n])
-			  a.push( { name: n, value: options.data[n][k] } );
-		  }
-		  else
-			 a.push( { name: n, value: options.data[n] } );
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
 		}
 	}
 
@@ -113,12 +119,17 @@ $.fn.ajaxSubmit = function(options) {
 		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
 		options.data = null;  // data is null for 'get'
 	}
-	else
+	else {
 		options.data = q; // data is the query string for 'post'
+	}
 
 	var $form = this, callbacks = [];
-	if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
-	if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
 
 	// perform a load on the target only if dataType is not provided
 	if (!options.dataType && options.target) {
@@ -128,37 +139,37 @@ $.fn.ajaxSubmit = function(options) {
 			$(options.target)[fn](data).each(oldSuccess, arguments);
 		});
 	}
-	else if (options.success)
+	else if (options.success) {
 		callbacks.push(options.success);
+	}
 
 	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
-		for (var i=0, max=callbacks.length; i < max; i++)
-			callbacks[i].apply(options, [data, status, xhr || $form, $form]);
+		var context = options.context || options;   // 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]);
+		}
 	};
 
 	// are there files to upload?
-	var files = $('input:file', this).fieldValue();
-	var found = false;
-	for (var j=0; j < files.length; j++)
-		if (files[j])
-			found = true;
-
-	var multipart = false;
-//	var mp = 'multipart/form-data';
-//	multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
 
 	// options.iframe allows user to force iframe mode
 	// 06-NOV-09: now defaulting to iframe mode if file input is detected
-   if ((files.length && options.iframe !== false) || options.iframe || found || multipart) {
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
 	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
 	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
-	   if (options.closeKeepAlive)
+	   if (options.closeKeepAlive) {
 		   $.get(options.closeKeepAlive, fileUpload);
-	   else
+		}
+	   else {
 		   fileUpload();
-	   }
-   else
-	   $.ajax(options);
+		}
+   }
+   else {
+		$.ajax(options);
+   }
 
 	// fire 'notify' event
 	this.trigger('form-submit-notify', [this, options]);
@@ -169,16 +180,17 @@ $.fn.ajaxSubmit = function(options) {
 	function fileUpload() {
 		var form = $form[0];
 
-		if ($(':input[name=submit]', form).length) {
-			alert('Error: Form elements must not be named "submit".');
+		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;
 		}
-
-		var opts = $.extend({}, $.ajaxSettings, options);
-		var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
-
-		var id = 'jqFormIO' + (new Date().getTime());
-		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" onload="(jQuery(this).data(\'form-plugin-onload\'))()" />');
+		
+		var s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" />');
 		var io = $io[0];
 
 		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
@@ -194,23 +206,29 @@ $.fn.ajaxSubmit = function(options) {
 			setRequestHeader: function() {},
 			abort: function() {
 				this.aborted = 1;
-				$io.attr('src', opts.iframeSrc); // abort op in progress
+				$io.attr('src', s.iframeSrc); // abort op in progress
 			}
 		};
 
-		var g = opts.global;
+		var g = s.global;
 		// trigger ajax global events so that activity/block indicators work like normal
-		if (g && ! $.active++) $.event.trigger("ajaxStart");
-		if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
 
-		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
-			s.global && $.active--;
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) { 
+				$.active--;
+			}
 			return;
 		}
-		if (xhr.aborted)
+		if (xhr.aborted) {
 			return;
+		}
 
-		var cbInvoked = false;
 		var timedOut = 0;
 
 		// add submitting element to data if we know it
@@ -218,11 +236,11 @@ $.fn.ajaxSubmit = function(options) {
 		if (sub) {
 			var n = sub.name;
 			if (n && !sub.disabled) {
-				opts.extraData = opts.extraData || {};
-				opts.extraData[n] = sub.value;
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
 				if (sub.type == "image") {
-					opts.extraData[n+'.x'] = form.clk_x;
-					opts.extraData[n+'.y'] = form.clk_y;
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
 				}
 			}
 		}
@@ -234,13 +252,15 @@ $.fn.ajaxSubmit = function(options) {
 
 			// update form attrs in IE friendly way
 			form.setAttribute('target',id);
-			if (form.getAttribute('method') != 'POST')
+			if (form.getAttribute('method') != 'POST') {
 				form.setAttribute('method', 'POST');
-			if (form.getAttribute('action') != opts.url)
-				form.setAttribute('action', opts.url);
+			}
+			if (form.getAttribute('action') != s.url) {
+				form.setAttribute('action', s.url);
+			}
 
 			// ie borks in some cases when setting encoding
-			if (! opts.skipEncodingOverride) {
+			if (! s.skipEncodingOverride) {
 				$form.attr({
 					encoding: 'multipart/form-data',
 					enctype:  'multipart/form-data'
@@ -248,105 +268,135 @@ $.fn.ajaxSubmit = function(options) {
 			}
 
 			// support timout
-			if (opts.timeout)
-				setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+			if (s.timeout) {
+				setTimeout(function() { timedOut = true; cb(); }, s.timeout);
+			}
 
 			// add "extra" data to form if provided in options
 			var extraInputs = [];
 			try {
-				if (opts.extraData)
-					for (var n in opts.extraData)
+				if (s.extraData) {
+					for (var n in s.extraData) {
 						extraInputs.push(
-							$('<input type="hidden" name="'+n+'" value="'+opts.extraData[n]+'" />')
+							$('<input type="hidden" name="'+n+'" value="'+s.extraData[n]+'" />')
 								.appendTo(form)[0]);
+					}
+				}
 
 				// add iframe to doc and submit the form
 				$io.appendTo('body');
-				$io.data('form-plugin-onload', cb);
+                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
 				form.submit();
 			}
 			finally {
 				// reset attrs and remove "extra" input elements
 				form.setAttribute('action',a);
-				t ? form.setAttribute('target', t) : $form.removeAttr('target');
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
 				$(extraInputs).remove();
 			}
-		};
+		}
 
-		if (opts.forceSync)
+		if (s.forceSync) {
 			doSubmit();
-		else
+		}
+		else {
 			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
 	
-		var domCheckCount = 100;
+		var data, doc, domCheckCount = 50;
 
 		function cb() {
-			if (cbInvoked) 
+			doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
 				return;
+			}
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
 
 			var ok = true;
 			try {
-				if (timedOut) throw 'timeout';
-				// extract the server response from the iframe
-				var data, doc;
+				if (timedOut) {
+					throw 'timeout';
+				}
 
-				doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-				
-				var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
 				log('isXml='+isXml);
-				if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
-				 	if (--domCheckCount) {
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
 						// in some browsers (Opera) the iframe DOM is not always traversable when
 						// the onload callback fires, so we loop a bit to accommodate
-				 		log('requeing onLoad callback, DOM not available');
+						log('requeing onLoad callback, DOM not available');
 						setTimeout(cb, 250);
 						return;
 					}
-					log('Could not access iframe DOM after 100 tries.');
-					return;
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
 				}
 
-				log('response detected');
-				cbInvoked = true;
-				xhr.responseText = doc.body ? doc.body.innerHTML : null;
+				//log('response detected');
+				xhr.responseText = doc.body ? doc.body.innerHTML : doc.documentElement ? doc.documentElement.innerHTML : null; 
 				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
 				xhr.getResponseHeader = function(header){
-					var headers = {'content-type': opts.dataType};
+					var headers = {'content-type': s.dataType};
 					return headers[header];
 				};
 
-				if (opts.dataType == 'json' || opts.dataType == 'script') {
+				var scr = /(json|script)/.test(s.dataType);
+				if (scr || s.textarea) {
 					// see if user embedded response in textarea
 					var ta = doc.getElementsByTagName('textarea')[0];
-					if (ta)
+					if (ta) {
 						xhr.responseText = ta.value;
-					else {
+					}
+					else if (scr) {
 						// account for browsers injecting pre around json response
 						var pre = doc.getElementsByTagName('pre')[0];
-						if (pre)
-							xhr.responseText = pre.innerHTML;
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
 					}			  
 				}
-				else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
 					xhr.responseXML = toXml(xhr.responseText);
 				}
-				data = $.httpData(xhr, opts.dataType);
+				
+				data = httpData(xhr, s.dataType, s);
 			}
 			catch(e){
 				log('error caught:',e);
 				ok = false;
 				xhr.error = e;
-				$.handleError(opts, xhr, 'error', e);
+				s.error.call(s.context, xhr, 'error', e);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+			}
+			
+			if (xhr.aborted) {
+				log('upload aborted');
+				ok = false;
 			}
 
 			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
 			if (ok) {
-				opts.success(data, 'success');
-				if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+				s.success.call(s.context, data, 'success', xhr);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
 			}
-			if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
-			if (g && ! --$.active) $.event.trigger("ajaxStop");
-			if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+			
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+			
+			s.complete && s.complete.call(s.context, xhr, ok ? 'success' : 'error');
 
 			// clean up
 			setTimeout(function() {
@@ -354,19 +404,44 @@ $.fn.ajaxSubmit = function(options) {
 				$io.remove();
 				xhr.responseXML = null;
 			}, 100);
-		};
+		}
 
-		function toXml(s, doc) {
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
 			if (window.ActiveXObject) {
 				doc = new ActiveXObject('Microsoft.XMLDOM');
 				doc.async = 'false';
 				doc.loadXML(s);
 			}
-			else
+			else {
 				doc = (new DOMParser()).parseFromString(s, 'text/xml');
-			return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+			}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
 		};
-	};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+		
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
+	}
 };
 
 /**
@@ -385,17 +460,35 @@ $.fn.ajaxSubmit = function(options) {
  * the form itself.
  */
 $.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+	
 	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
-		e.preventDefault();
-		$(this).ajaxSubmit(options);
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
 	}).bind('click.form-plugin', function(e) {
 		var target = e.target;
 		var $el = $(target);
 		if (!($el.is(":submit,input:image"))) {
 			// is this a child element of the submit el?  (ex: a span within a button)
 			var t = $el.closest(':submit');
-			if (t.length == 0)
+			if (t.length == 0) {
 				return;
+			}
 			target = t[0];
 		}
 		var form = this;
@@ -436,15 +529,23 @@ $.fn.ajaxFormUnbind = function() {
  */
 $.fn.formToArray = function(semantic) {
 	var a = [];
-	if (this.length == 0) return a;
+	if (this.length === 0) {
+		return a;
+	}
 
 	var form = this[0];
 	var els = semantic ? form.getElementsByTagName('*') : form.elements;
-	if (!els) return a;
-	for(var i=0, max=els.length; i < max; i++) {
-		var el = els[i];
-		var n = el.name;
-		if (!n) continue;
+	if (!els) {
+		return a;
+	}
+	
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
 
 		if (semantic && form.clk && el.type == "image") {
 			// handle image inputs on the fly when semantic == true
@@ -455,18 +556,21 @@ $.fn.formToArray = function(semantic) {
 			continue;
 		}
 
-		var v = $.fieldValue(el, true);
+		v = $.fieldValue(el, true);
 		if (v && v.constructor == Array) {
-			for(var j=0, jmax=v.length; j < jmax; j++)
+			for(j=0, jmax=v.length; j < jmax; j++) {
 				a.push({name: n, value: v[j]});
+			}
 		}
-		else if (v !== null && typeof v != 'undefined')
+		else if (v !== null && typeof v != 'undefined') {
 			a.push({name: n, value: v});
+		}
 	}
 
 	if (!semantic && form.clk) {
 		// input type=='image' are not found in elements array! handle it here
-		var $input = $(form.clk), input = $input[0], n = input.name;
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
 		if (n && !input.disabled && input.type == 'image') {
 			a.push({name: n, value: $input.val()});
 			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
@@ -492,14 +596,18 @@ $.fn.fieldSerialize = function(successful) {
 	var a = [];
 	this.each(function() {
 		var n = this.name;
-		if (!n) return;
+		if (!n) {
+			return;
+		}
 		var v = $.fieldValue(this, successful);
 		if (v && v.constructor == Array) {
-			for (var i=0,max=v.length; i < max; i++)
+			for (var i=0,max=v.length; i < max; i++) {
 				a.push({name: n, value: v[i]});
+			}
 		}
-		else if (v !== null && typeof v != 'undefined')
+		else if (v !== null && typeof v != 'undefined') {
 			a.push({name: this.name, value: v});
+		}
 	});
 	//hand off to jQuery.param for proper encoding
 	return $.param(a);
@@ -547,8 +655,9 @@ $.fn.fieldValue = function(successful) {
 	for (var val=[], i=0, max=this.length; i < max; i++) {
 		var el = this[i];
 		var v = $.fieldValue(el, successful);
-		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
 			continue;
+		}
 		v.constructor == Array ? $.merge(val, v) : val.push(v);
 	}
 	return val;
@@ -559,17 +668,22 @@ $.fn.fieldValue = function(successful) {
  */
 $.fieldValue = function(el, successful) {
 	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
-	if (typeof successful == 'undefined') successful = true;
+	if (successful === undefined) {
+		successful = true;
+	}
 
 	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
 		(t == 'checkbox' || t == 'radio') && !el.checked ||
 		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
-		tag == 'select' && el.selectedIndex == -1))
+		tag == 'select' && el.selectedIndex == -1)) {
 			return null;
+	}
 
 	if (tag == 'select') {
 		var index = el.selectedIndex;
-		if (index < 0) return null;
+		if (index < 0) {
+			return null;
+		}
 		var a = [], ops = el.options;
 		var one = (t == 'select-one');
 		var max = (one ? index+1 : ops.length);
@@ -577,15 +691,18 @@ $.fieldValue = function(el, successful) {
 			var op = ops[i];
 			if (op.selected) {
 				var v = op.value;
-				if (!v) // extra pain for IE...
+				if (!v) { // extra pain for IE...
 					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
-				if (one) return v;
+				}
+				if (one) {
+					return v;
+				}
 				a.push(v);
 			}
 		}
 		return a;
 	}
-	return el.value;
+	return $(el).val();
 };
 
 /**
@@ -608,12 +725,15 @@ $.fn.clearForm = function() {
 $.fn.clearFields = $.fn.clearInputs = function() {
 	return this.each(function() {
 		var t = this.type, tag = this.tagName.toLowerCase();
-		if (t == 'text' || t == 'password' || tag == 'textarea')
+		if (t == 'text' || t == 'password' || tag == 'textarea') {
 			this.value = '';
-		else if (t == 'checkbox' || t == 'radio')
+		}
+		else if (t == 'checkbox' || t == 'radio') {
 			this.checked = false;
-		else if (tag == 'select')
+		}
+		else if (tag == 'select') {
 			this.selectedIndex = -1;
+		}
 	});
 };
 
@@ -624,8 +744,9 @@ $.fn.resetForm = function() {
 	return this.each(function() {
 		// guard against an input with the name of 'reset'
 		// note that IE reports the reset function as an 'object'
-		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
 			this.reset();
+		}
 	});
 };
 
@@ -633,7 +754,9 @@ $.fn.resetForm = function() {
  * Enables or disables any matching elements.
  */
 $.fn.enable = function(b) {
-	if (b == undefined) b = true;
+	if (b === undefined) {
+		b = true;
+	}
 	return this.each(function() {
 		this.disabled = !b;
 	});
@@ -644,11 +767,14 @@ $.fn.enable = function(b) {
  * selects/deselects and matching option elements.
  */
 $.fn.selected = function(select) {
-	if (select == undefined) select = true;
+	if (select === undefined) {
+		select = true;
+	}
 	return this.each(function() {
 		var t = this.type;
-		if (t == 'checkbox' || t == 'radio')
+		if (t == 'checkbox' || t == 'radio') {
 			this.checked = select;
+		}
 		else if (this.tagName.toLowerCase() == 'option') {
 			var $sel = $(this).parent('select');
 			if (select && $sel[0] && $sel[0].type == 'select-one') {
@@ -665,10 +791,12 @@ $.fn.selected = function(select) {
 function log() {
 	if ($.fn.ajaxSubmit.debug) {
 		var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
-		if (window.console && window.console.log)
+		if (window.console && window.console.log) {
 			window.console.log(msg);
-		else if (window.opera && window.opera.postError)
+		}
+		else if (window.opera && window.opera.postError) {
 			window.opera.postError(msg);
+		}
 	}
 };