From aaac2441241df5565b4fa1562065a387e56578e1 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 20 Jan 2009 01:29:33 +0000 Subject: Comment out the code that checks for form elements named "submit". It appears not to work correctly and is getting in the way. Commenting it out here means that it'll get overwitten on the next update of this library (but that's ok). --- lib/jquery.form.js | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'lib/jquery.form.js') diff --git a/lib/jquery.form.js b/lib/jquery.form.js index 0891c593..329d47b9 100644 --- a/lib/jquery.form.js +++ b/lib/jquery.form.js @@ -13,7 +13,7 @@ ;(function($) { /* - Usage Note: + Usage Note: ----------- Do not use both ajaxSubmit and ajaxForm on the same form. These functions are intended to be exclusive. Use ajaxSubmit if you want @@ -36,13 +36,13 @@ target: '#output' }); }); - + When using ajaxForm, the ajaxSubmit function will be invoked for you - at the appropriate time. + at the appropriate time. */ /** - * ajaxSubmit() provides a mechanism for immediately submitting + * ajaxSubmit() provides a mechanism for immediately submitting * an HTML form using AJAX. */ $.fn.ajaxSubmit = function(options) { @@ -73,8 +73,8 @@ $.fn.ajaxSubmit = function(options) { if (options.beforeSerialize && options.beforeSerialize(this, options) === false) { log('ajaxSubmit: submit aborted via beforeSerialize callback'); return this; - } - + } + var a = this.formToArray(options.semantic); if (options.data) { options.extraData = options.data; @@ -82,7 +82,7 @@ $.fn.ajaxSubmit = function(options) { 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] } ); } @@ -92,14 +92,14 @@ $.fn.ajaxSubmit = function(options) { if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) { log('ajaxSubmit: submit aborted via beforeSubmit callback'); return this; - } + } // fire vetoable 'validate' event this.trigger('form-submit-validate', [a, this, options, veto]); if (veto.veto) { log('ajaxSubmit: submit vetoed via form-submit-validate trigger'); return this; - } + } var q = $.param(a); @@ -137,7 +137,7 @@ $.fn.ajaxSubmit = function(options) { found = true; // options.iframe allows user to force iframe mode - if (options.iframe || found) { + if (options.iframe || found) { // hack to fix Safari hang (thanks to Tim Molendijk for this) // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d if ($.browser.safari && options.closeKeepAlive) @@ -156,12 +156,13 @@ $.fn.ajaxSubmit = function(options) { // private function for handling file uploads (hat tip to YAHOO!) function fileUpload() { var form = $form[0]; - + /* if ($(':input[@name=submit]', form).length) { alert('Error: Form elements must not be named "submit".'); return; } - + */ + var opts = $.extend({}, $.ajaxSettings, options); var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts); @@ -169,7 +170,7 @@ $.fn.ajaxSubmit = function(options) { var $io = $('