svn commit: r1776930 [6/19] - in /ofbiz/trunk/specialpurpose: lucene/ lucene/src/main/java/org/apache/ofbiz/content/search/ solr/ solr/src/main/java/org/apache/ofbiz/solr/webapp/ solr/webapp/solr/ solr/webapp/solr/WEB-INF/ solr/webapp/solr/css/ solr/we...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1776930 [6/19] - in /ofbiz/trunk/specialpurpose: lucene/ lucene/src/main/java/org/apache/ofbiz/content/search/ solr/ solr/src/main/java/org/apache/ofbiz/solr/webapp/ solr/webapp/solr/ solr/webapp/solr/WEB-INF/ solr/webapp/solr/css/ solr/we...

shijh
Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.blockUI.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.blockUI.js?rev=1776930&r1=1776929&r2=1776930&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.blockUI.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.blockUI.js Mon Jan  2 13:44:06 2017
@@ -39,8 +39,8 @@ THE SOFTWARE.
 ;(function($) {
 
 if (/1\.(0|1|2)\.(0|1|2)/.test($.fn.jquery) || /^1.1/.test($.fn.jquery)) {
- alert('blockUI requires jQuery v1.2.3 or later!  You are using v' + $.fn.jquery);
- return;
+  alert('blockUI requires jQuery v1.2.3 or later!  You are using v' + $.fn.jquery);
+  return;
 }
 
 $.fn._fadeIn = $.fn.fadeIn;
@@ -59,153 +59,153 @@ $.unblockUI = function(opts) { remove(wi
 
 // convenience method for quick growl-like notifications  (http://www.google.com/search?q=growl)
 $.growlUI = function(title, message, timeout, onClose) {
- var $m = $('<div class="growlUI"></div>');
- if (title) $m.append('<h1>'+title+'</h1>');
- if (message) $m.append('<h2>'+message+'</h2>');
- if (timeout == undefined) timeout = 3000;
- $.blockUI({
- message: $m, fadeIn: 700, fadeOut: 1000, centerY: false,
- timeout: timeout, showOverlay: false,
- onUnblock: onClose,
- css: $.blockUI.defaults.growlCSS
- });
+  var $m = $('<div class="growlUI"></div>');
+  if (title) $m.append('<h1>'+title+'</h1>');
+  if (message) $m.append('<h2>'+message+'</h2>');
+  if (timeout == undefined) timeout = 3000;
+  $.blockUI({
+    message: $m, fadeIn: 700, fadeOut: 1000, centerY: false,
+    timeout: timeout, showOverlay: false,
+    onUnblock: onClose,
+    css: $.blockUI.defaults.growlCSS
+  });
 };
 
 // plugin method for blocking element content
 $.fn.block = function(opts) {
- return this.unblock({ fadeOut: 0 }).each(function() {
- if ($.css(this,'position') == 'static')
- this.style.position = 'relative';
- if ($.browser.msie)
- this.style.zoom = 1; // force 'hasLayout'
- install(this, opts);
- });
+  return this.unblock({ fadeOut: 0 }).each(function() {
+    if ($.css(this,'position') == 'static')
+      this.style.position = 'relative';
+    if ($.browser.msie)
+      this.style.zoom = 1; // force 'hasLayout'
+    install(this, opts);
+  });
 };
 
 // plugin method for unblocking element content
 $.fn.unblock = function(opts) {
- return this.each(function() {
- remove(this, opts);
- });
+  return this.each(function() {
+    remove(this, opts);
+  });
 };
 
 $.blockUI.version = 2.39; // 2nd generation blocking at no extra cost!
 
 // override these in your code to change the default behavior and style
 $.blockUI.defaults = {
- // message displayed when blocking (use null for no message)
- message:  '<h1>Please wait...</h1>',
+  // message displayed when blocking (use null for no message)
+  message:  '<h1>Please wait...</h1>',
 
- title: null,  // title string; only used when theme == true
- draggable: true,  // only used when theme == true (requires jquery-ui.js to be loaded)
-
- theme: false, // set to true to use with jQuery UI themes
-
- // styles for the message when blocking; if you wish to disable
- // these and use an external stylesheet then do this in your code:
- // $.blockUI.defaults.css = {};
- css: {
- padding: 0,
- margin: 0,
- width: '30%',
- top: '40%',
- left: '35%',
- textAlign: 'center',
- color: '#000',
- border: '3px solid #aaa',
- backgroundColor:'#fff',
- cursor: 'wait'
- },
-
- // minimal style set used when themes are used
- themedCSS: {
- width: '30%',
- top: '40%',
- left: '35%'
- },
-
- // styles for the overlay
- overlayCSS:  {
- backgroundColor: '#000',
- opacity:   0.6,
- cursor:   'wait'
- },
-
- // styles applied when using $.growlUI
- growlCSS: {
- width:   '350px',
- top: '10px',
- left:   '',
- right:   '10px',
- border: 'none',
- padding: '5px',
- opacity: 0.6,
- cursor: 'default',
- color: '#fff',
- backgroundColor: '#000',
- '-webkit-border-radius': '10px',
- '-moz-border-radius': '10px',
- 'border-radius': '10px'
- },
-
- // IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w
- // (hat tip to Jorge H. N. de Vasconcelos)
- iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank',
-
- // force usage of iframe in non-IE browsers (handy for blocking applets)
- forceIframe: false,
-
- // z-index for the blocking overlay
- baseZ: 1000,
-
- // set these to true to have the message automatically centered
- centerX: true, // <-- only effects element blocking (page block controlled via css above)
- centerY: true,
-
- // allow body element to be stetched in ie6; this makes blocking look better
- // on "short" pages.  disable if you wish to prevent changes to the body height
- allowBodyStretch: true,
-
- // enable if you want key and mouse events to be disabled for content that is blocked
- bindEvents: true,
-
- // be default blockUI will supress tab navigation from leaving blocking content
- // (if bindEvents is true)
- constrainTabKey: true,
-
- // fadeIn time in millis; set to 0 to disable fadeIn on block
- fadeIn:  200,
-
- // fadeOut time in millis; set to 0 to disable fadeOut on unblock
- fadeOut:  400,
-
- // time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock
- timeout: 0,
-
- // disable if you don't want to show the overlay
- showOverlay: true,
-
- // if true, focus will be placed in the first available input field when
- // page blocking
- focusInput: true,
-
- // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity)
- applyPlatformOpacityRules: true,
-
- // callback method invoked when fadeIn has completed and blocking message is visible
- onBlock: null,
-
- // callback method invoked when unblocking has completed; the callback is
- // passed the element that has been unblocked (which is the window object for page
- // blocks) and the options that were passed to the unblock call:
- // onUnblock(element, options)
- onUnblock: null,
+  title: null,    // title string; only used when theme == true
+  draggable: true,  // only used when theme == true (requires jquery-ui.js to be loaded)
+  
+  theme: false, // set to true to use with jQuery UI themes
+  
+  // styles for the message when blocking; if you wish to disable
+  // these and use an external stylesheet then do this in your code:
+  // $.blockUI.defaults.css = {};
+  css: {
+    padding:  0,
+    margin:    0,
+    width:    '30%',
+    top:    '40%',
+    left:    '35%',
+    textAlign:  'center',
+    color:    '#000',
+    border:    '3px solid #aaa',
+    backgroundColor:'#fff',
+    cursor:    'wait'
+  },
+  
+  // minimal style set used when themes are used
+  themedCSS: {
+    width:  '30%',
+    top:  '40%',
+    left:  '35%'
+  },
+
+  // styles for the overlay
+  overlayCSS:  {
+    backgroundColor: '#000',
+    opacity:       0.6,
+    cursor:         'wait'
+  },
+
+  // styles applied when using $.growlUI
+  growlCSS: {
+    width:    '350px',
+    top:    '10px',
+    left:     '',
+    right:    '10px',
+    border:   'none',
+    padding:  '5px',
+    opacity:  0.6,
+    cursor:   'default',
+    color:    '#fff',
+    backgroundColor: '#000',
+    '-webkit-border-radius': '10px',
+    '-moz-border-radius':   '10px',
+    'border-radius':      '10px'
+  },
+  
+  // IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w
+  // (hat tip to Jorge H. N. de Vasconcelos)
+  iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank',
+
+  // force usage of iframe in non-IE browsers (handy for blocking applets)
+  forceIframe: false,
+
+  // z-index for the blocking overlay
+  baseZ: 1000,
+
+  // set these to true to have the message automatically centered
+  centerX: true, // <-- only effects element blocking (page block controlled via css above)
+  centerY: true,
+
+  // allow body element to be stetched in ie6; this makes blocking look better
+  // on "short" pages.  disable if you wish to prevent changes to the body height
+  allowBodyStretch: true,
+
+  // enable if you want key and mouse events to be disabled for content that is blocked
+  bindEvents: true,
+
+  // be default blockUI will supress tab navigation from leaving blocking content
+  // (if bindEvents is true)
+  constrainTabKey: true,
+
+  // fadeIn time in millis; set to 0 to disable fadeIn on block
+  fadeIn:  200,
+
+  // fadeOut time in millis; set to 0 to disable fadeOut on unblock
+  fadeOut:  400,
+
+  // time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock
+  timeout: 0,
+
+  // disable if you don't want to show the overlay
+  showOverlay: true,
+
+  // if true, focus will be placed in the first available input field when
+  // page blocking
+  focusInput: true,
+
+  // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity)
+  applyPlatformOpacityRules: true,
+  
+  // callback method invoked when fadeIn has completed and blocking message is visible
+  onBlock: null,
+
+  // callback method invoked when unblocking has completed; the callback is
+  // passed the element that has been unblocked (which is the window object for page
+  // blocks) and the options that were passed to the unblock call:
+  //   onUnblock(element, options)
+  onUnblock: null,
 
- // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493
- quirksmodeOffsetHack: 4,
+  // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493
+  quirksmodeOffsetHack: 4,
 
- // class name of the message block
- blockMsgClass: 'blockMsg'
+  // class name of the message block
+  blockMsgClass: 'blockMsg'
 };
 
 // private data and functions follow...
@@ -214,310 +214,310 @@ var pageBlock = null;
 var pageBlockEls = [];
 
 function install(el, opts) {
- var full = (el == window);
- var msg = opts && opts.message !== undefined ? opts.message : undefined;
- opts = $.extend({}, $.blockUI.defaults, opts || {});
- opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {});
- var css = $.extend({}, $.blockUI.defaults.css, opts.css || {});
- var themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {});
- msg = msg === undefined ? opts.message : msg;
-
- // remove the current block (if there is one)
- if (full && pageBlock)
- remove(window, {fadeOut:0});
-
- // if an existing element is being used as the blocking content then we capture
- // its current place in the DOM (and current display style) so we can restore
- // it when we unblock
- if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) {
- var node = msg.jquery ? msg[0] : msg;
- var data = {};
- $(el).data('blockUI.history', data);
- data.el = node;
- data.parent = node.parentNode;
- data.display = node.style.display;
- data.position = node.style.position;
- if (data.parent)
- data.parent.removeChild(node);
- }
-
- $(el).data('blockUI.onUnblock', opts.onUnblock);
- var z = opts.baseZ;
-
- // blockUI uses 3 layers for blocking, for simplicity they are all used on every platform;
- // layer1 is the iframe layer which is used to supress bleed through of underlying content
- // layer2 is the overlay layer which has opacity and a wait cursor (by default)
- // layer3 is the message content that is displayed while blocking
-
- var lyr1 = ($.browser.msie || opts.forceIframe)
- ? $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>')
- : $('<div class="blockUI" style="display:none"></div>');
-
- var lyr2 = opts.theme
- ? $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>')
- : $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>');
-
- var lyr3, s;
- if (opts.theme && full) {
- s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:fixed">' +
- '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>' +
- '<div class="ui-widget-content ui-dialog-content"></div>' +
- '</div>';
- }
- else if (opts.theme) {
- s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:absolute">' +
- '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>' +
- '<div class="ui-widget-content ui-dialog-content"></div>' +
- '</div>';
- }
- else if (full) {
- s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage" style="z-index:'+(z+10)+';display:none;position:fixed"></div>';
- }
- else {
- s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>';
- }
- lyr3 = $(s);
-
- // if we have a message, style it
- if (msg) {
- if (opts.theme) {
- lyr3.css(themedCSS);
- lyr3.addClass('ui-widget-content');
- }
- else
- lyr3.css(css);
- }
-
- // style the overlay
- if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
- lyr2.css(opts.overlayCSS);
- lyr2.css('position', full ? 'fixed' : 'absolute');
-
- // make iframe layer transparent in IE
- if ($.browser.msie || opts.forceIframe)
- lyr1.css('opacity',0.0);
-
- //$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el);
- var layers = [lyr1,lyr2,lyr3], $par = full ? $('body') : $(el);
- $.each(layers, function() {
- this.appendTo($par);
- });
-
- if (opts.theme && opts.draggable && $.fn.draggable) {
- lyr3.draggable({
- handle: '.ui-dialog-titlebar',
- cancel: 'li'
- });
- }
-
- // ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling)
- var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0);
- if (ie6 || expr) {
- // give body 100% height
- if (full && opts.allowBodyStretch && $.boxModel)
- $('html,body').css('height','100%');
-
- // fix ie6 issue when blocked element has a border width
- if ((ie6 || !$.boxModel) && !full) {
- var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth');
- var fixT = t ? '(0 - '+t+')' : 0;
- var fixL = l ? '(0 - '+l+')' : 0;
- }
-
- // simulate fixed position
- $.each([lyr1,lyr2,lyr3], function(i,o) {
- var s = o[0].style;
- s.position = 'absolute';
- if (i < 2) {
- full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"')
- : s.setExpression('height','this.parentNode.offsetHeight + "px"');
- full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"')
- : s.setExpression('width','this.parentNode.offsetWidth + "px"');
- if (fixL) s.setExpression('left', fixL);
- if (fixT) s.setExpression('top', fixT);
- }
- else if (opts.centerY) {
- if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"');
- s.marginTop = 0;
- }
- else if (!opts.centerY && full) {
- var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0;
- var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"';
- s.setExpression('top',expression);
- }
- });
- }
-
- // show the message
- if (msg) {
- if (opts.theme)
- lyr3.find('.ui-widget-content').append(msg);
- else
- lyr3.append(msg);
- if (msg.jquery || msg.nodeType)
- $(msg).show();
- }
-
- if (($.browser.msie || opts.forceIframe) && opts.showOverlay)
- lyr1.show(); // opacity is zero
- if (opts.fadeIn) {
- var cb = opts.onBlock ? opts.onBlock : noOp;
- var cb1 = (opts.showOverlay && !msg) ? cb : noOp;
- var cb2 = msg ? cb : noOp;
- if (opts.showOverlay)
- lyr2._fadeIn(opts.fadeIn, cb1);
- if (msg)
- lyr3._fadeIn(opts.fadeIn, cb2);
- }
- else {
- if (opts.showOverlay)
- lyr2.show();
- if (msg)
- lyr3.show();
- if (opts.onBlock)
- opts.onBlock();
- }
-
- // bind key and mouse events
- bind(1, el, opts);
-
- if (full) {
- pageBlock = lyr3[0];
- pageBlockEls = $(':input:enabled:visible',pageBlock);
- if (opts.focusInput)
- setTimeout(focus, 20);
- }
- else
- center(lyr3[0], opts.centerX, opts.centerY);
-
- if (opts.timeout) {
- // auto-unblock
- var to = setTimeout(function() {
- full ? $.unblockUI(opts) : $(el).unblock(opts);
- }, opts.timeout);
- $(el).data('blockUI.timeout', to);
- }
+  var full = (el == window);
+  var msg = opts && opts.message !== undefined ? opts.message : undefined;
+  opts = $.extend({}, $.blockUI.defaults, opts || {});
+  opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {});
+  var css = $.extend({}, $.blockUI.defaults.css, opts.css || {});
+  var themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {});
+  msg = msg === undefined ? opts.message : msg;
+
+  // remove the current block (if there is one)
+  if (full && pageBlock)
+    remove(window, {fadeOut:0});
+
+  // if an existing element is being used as the blocking content then we capture
+  // its current place in the DOM (and current display style) so we can restore
+  // it when we unblock
+  if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) {
+    var node = msg.jquery ? msg[0] : msg;
+    var data = {};
+    $(el).data('blockUI.history', data);
+    data.el = node;
+    data.parent = node.parentNode;
+    data.display = node.style.display;
+    data.position = node.style.position;
+    if (data.parent)
+      data.parent.removeChild(node);
+  }
+
+  $(el).data('blockUI.onUnblock', opts.onUnblock);
+  var z = opts.baseZ;
+
+  // blockUI uses 3 layers for blocking, for simplicity they are all used on every platform;
+  // layer1 is the iframe layer which is used to supress bleed through of underlying content
+  // layer2 is the overlay layer which has opacity and a wait cursor (by default)
+  // layer3 is the message content that is displayed while blocking
+
+  var lyr1 = ($.browser.msie || opts.forceIframe)
+    ? $('<iframe class="blockUI" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;position:absolute;width:100%;height:100%;top:0;left:0" src="'+opts.iframeSrc+'"></iframe>')
+    : $('<div class="blockUI" style="display:none"></div>');
+  
+  var lyr2 = opts.theme
+     ? $('<div class="blockUI blockOverlay ui-widget-overlay" style="z-index:'+ (z++) +';display:none"></div>')
+     : $('<div class="blockUI blockOverlay" style="z-index:'+ (z++) +';display:none;border:none;margin:0;padding:0;width:100%;height:100%;top:0;left:0"></div>');
+
+  var lyr3, s;
+  if (opts.theme && full) {
+    s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:fixed">' +
+        '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>' +
+        '<div class="ui-widget-content ui-dialog-content"></div>' +
+      '</div>';
+  }
+  else if (opts.theme) {
+    s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement ui-dialog ui-widget ui-corner-all" style="z-index:'+(z+10)+';display:none;position:absolute">' +
+        '<div class="ui-widget-header ui-dialog-titlebar ui-corner-all blockTitle">'+(opts.title || '&nbsp;')+'</div>' +
+        '<div class="ui-widget-content ui-dialog-content"></div>' +
+      '</div>';
+  }
+  else if (full) {
+    s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage" style="z-index:'+(z+10)+';display:none;position:fixed"></div>';
+  }      
+  else {
+    s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>';
+  }
+  lyr3 = $(s);
+
+  // if we have a message, style it
+  if (msg) {
+    if (opts.theme) {
+      lyr3.css(themedCSS);
+      lyr3.addClass('ui-widget-content');
+    }
+    else
+      lyr3.css(css);
+  }
+
+  // style the overlay
+  if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))))
+    lyr2.css(opts.overlayCSS);
+  lyr2.css('position', full ? 'fixed' : 'absolute');
+
+  // make iframe layer transparent in IE
+  if ($.browser.msie || opts.forceIframe)
+    lyr1.css('opacity',0.0);
+
+  //$([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el);
+  var layers = [lyr1,lyr2,lyr3], $par = full ? $('body') : $(el);
+  $.each(layers, function() {
+    this.appendTo($par);
+  });
+  
+  if (opts.theme && opts.draggable && $.fn.draggable) {
+    lyr3.draggable({
+      handle: '.ui-dialog-titlebar',
+      cancel: 'li'
+    });
+  }
+
+  // ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling)
+  var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0);
+  if (ie6 || expr) {
+    // give body 100% height
+    if (full && opts.allowBodyStretch && $.boxModel)
+      $('html,body').css('height','100%');
+
+    // fix ie6 issue when blocked element has a border width
+    if ((ie6 || !$.boxModel) && !full) {
+      var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth');
+      var fixT = t ? '(0 - '+t+')' : 0;
+      var fixL = l ? '(0 - '+l+')' : 0;
+    }
+
+    // simulate fixed position
+    $.each([lyr1,lyr2,lyr3], function(i,o) {
+      var s = o[0].style;
+      s.position = 'absolute';
+      if (i < 2) {
+        full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"')
+           : s.setExpression('height','this.parentNode.offsetHeight + "px"');
+        full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"')
+           : s.setExpression('width','this.parentNode.offsetWidth + "px"');
+        if (fixL) s.setExpression('left', fixL);
+        if (fixT) s.setExpression('top', fixT);
+      }
+      else if (opts.centerY) {
+        if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"');
+        s.marginTop = 0;
+      }
+      else if (!opts.centerY && full) {
+        var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0;
+        var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"';
+        s.setExpression('top',expression);
+      }
+    });
+  }
+
+  // show the message
+  if (msg) {
+    if (opts.theme)
+      lyr3.find('.ui-widget-content').append(msg);
+    else
+      lyr3.append(msg);
+    if (msg.jquery || msg.nodeType)
+      $(msg).show();
+  }
+
+  if (($.browser.msie || opts.forceIframe) && opts.showOverlay)
+    lyr1.show(); // opacity is zero
+  if (opts.fadeIn) {
+    var cb = opts.onBlock ? opts.onBlock : noOp;
+    var cb1 = (opts.showOverlay && !msg) ? cb : noOp;
+    var cb2 = msg ? cb : noOp;
+    if (opts.showOverlay)
+      lyr2._fadeIn(opts.fadeIn, cb1);
+    if (msg)
+      lyr3._fadeIn(opts.fadeIn, cb2);
+  }
+  else {
+    if (opts.showOverlay)
+      lyr2.show();
+    if (msg)
+      lyr3.show();
+    if (opts.onBlock)
+      opts.onBlock();
+  }
+
+  // bind key and mouse events
+  bind(1, el, opts);
+
+  if (full) {
+    pageBlock = lyr3[0];
+    pageBlockEls = $(':input:enabled:visible',pageBlock);
+    if (opts.focusInput)
+      setTimeout(focus, 20);
+  }
+  else
+    center(lyr3[0], opts.centerX, opts.centerY);
+
+  if (opts.timeout) {
+    // auto-unblock
+    var to = setTimeout(function() {
+      full ? $.unblockUI(opts) : $(el).unblock(opts);
+    }, opts.timeout);
+    $(el).data('blockUI.timeout', to);
+  }
 };
 
 // remove the block
 function remove(el, opts) {
- var full = (el == window);
- var $el = $(el);
- var data = $el.data('blockUI.history');
- var to = $el.data('blockUI.timeout');
- if (to) {
- clearTimeout(to);
- $el.removeData('blockUI.timeout');
- }
- opts = $.extend({}, $.blockUI.defaults, opts || {});
- bind(0, el, opts); // unbind events
-
- if (opts.onUnblock === null) {
- opts.onUnblock = $el.data('blockUI.onUnblock');
- $el.removeData('blockUI.onUnblock');
- }
-
- var els;
- if (full) // crazy selector to handle odd field errors in ie6/7
- els = $('body').children().filter('.blockUI').add('body > .blockUI');
- else
- els = $('.blockUI', el);
-
- if (full)
- pageBlock = pageBlockEls = null;
-
- if (opts.fadeOut) {
- els.fadeOut(opts.fadeOut);
- setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut);
- }
- else
- reset(els, data, opts, el);
+  var full = (el == window);
+  var $el = $(el);
+  var data = $el.data('blockUI.history');
+  var to = $el.data('blockUI.timeout');
+  if (to) {
+    clearTimeout(to);
+    $el.removeData('blockUI.timeout');
+  }
+  opts = $.extend({}, $.blockUI.defaults, opts || {});
+  bind(0, el, opts); // unbind events
+
+  if (opts.onUnblock === null) {
+    opts.onUnblock = $el.data('blockUI.onUnblock');
+    $el.removeData('blockUI.onUnblock');
+  }
+
+  var els;
+  if (full) // crazy selector to handle odd field errors in ie6/7
+    els = $('body').children().filter('.blockUI').add('body > .blockUI');
+  else
+    els = $('.blockUI', el);
+
+  if (full)
+    pageBlock = pageBlockEls = null;
+
+  if (opts.fadeOut) {
+    els.fadeOut(opts.fadeOut);
+    setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut);
+  }
+  else
+    reset(els, data, opts, el);
 };
 
 // move blocking element back into the DOM where it started
 function reset(els,data,opts,el) {
- els.each(function(i,o) {
- // remove via DOM calls so we don't lose event handlers
- if (this.parentNode)
- this.parentNode.removeChild(this);
- });
-
- if (data && data.el) {
- data.el.style.display = data.display;
- data.el.style.position = data.position;
- if (data.parent)
- data.parent.appendChild(data.el);
- $(el).removeData('blockUI.history');
- }
+  els.each(function(i,o) {
+    // remove via DOM calls so we don't lose event handlers
+    if (this.parentNode)
+      this.parentNode.removeChild(this);
+  });
+
+  if (data && data.el) {
+    data.el.style.display = data.display;
+    data.el.style.position = data.position;
+    if (data.parent)
+      data.parent.appendChild(data.el);
+    $(el).removeData('blockUI.history');
+  }
 
- if (typeof opts.onUnblock == 'function')
- opts.onUnblock(el,opts);
+  if (typeof opts.onUnblock == 'function')
+    opts.onUnblock(el,opts);
 };
 
 // bind/unbind the handler
 function bind(b, el, opts) {
- var full = el == window, $el = $(el);
+  var full = el == window, $el = $(el);
 
- // don't bother unbinding if there is nothing to unbind
- if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked')))
- return;
- if (!full)
- $el.data('blockUI.isBlocked', b);
-
- // don't bind events when overlay is not in use or if bindEvents is false
- if (!opts.bindEvents || (b && !opts.showOverlay))
- return;
-
- // bind anchors and inputs for mouse and key events
- var events = 'mousedown mouseup keydown keypress';
- b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler);
+  // don't bother unbinding if there is nothing to unbind
+  if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked')))
+    return;
+  if (!full)
+    $el.data('blockUI.isBlocked', b);
+
+  // don't bind events when overlay is not in use or if bindEvents is false
+  if (!opts.bindEvents || (b && !opts.showOverlay))
+    return;
+
+  // bind anchors and inputs for mouse and key events
+  var events = 'mousedown mouseup keydown keypress';
+  b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler);
 
 // former impl...
-//   var $e = $('a,:input');
-//   b ? $e.bind(events, opts, handler) : $e.unbind(events, handler);
+//     var $e = $('a,:input');
+//     b ? $e.bind(events, opts, handler) : $e.unbind(events, handler);
 };
 
 // event handler to suppress keyboard/mouse events when blocking
 function handler(e) {
- // allow tab navigation (conditionally)
- if (e.keyCode && e.keyCode == 9) {
- if (pageBlock && e.data.constrainTabKey) {
- var els = pageBlockEls;
- var fwd = !e.shiftKey && e.target === els[els.length-1];
- var back = e.shiftKey && e.target === els[0];
- if (fwd || back) {
- setTimeout(function(){focus(back)},10);
- return false;
- }
- }
- }
- var opts = e.data;
- // allow events within the message content
- if ($(e.target).parents('div.' + opts.blockMsgClass).length > 0)
- return true;
+  // allow tab navigation (conditionally)
+  if (e.keyCode && e.keyCode == 9) {
+    if (pageBlock && e.data.constrainTabKey) {
+      var els = pageBlockEls;
+      var fwd = !e.shiftKey && e.target === els[els.length-1];
+      var back = e.shiftKey && e.target === els[0];
+      if (fwd || back) {
+        setTimeout(function(){focus(back)},10);
+        return false;
+      }
+    }
+  }
+  var opts = e.data;
+  // allow events within the message content
+  if ($(e.target).parents('div.' + opts.blockMsgClass).length > 0)
+    return true;
 
- // allow events for content that is not being blocked
- return $(e.target).parents().children().filter('div.blockUI').length == 0;
+  // allow events for content that is not being blocked
+  return $(e.target).parents().children().filter('div.blockUI').length == 0;
 };
 
 function focus(back) {
- if (!pageBlockEls)
- return;
- var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0];
- if (e)
- e.focus();
+  if (!pageBlockEls)
+    return;
+  var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0];
+  if (e)
+    e.focus();
 };
 
 function center(el, x, y) {
- var p = el.parentNode, s = el.style;
- var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth');
- var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth');
- if (x) s.left = l > 0 ? (l+'px') : '0';
- if (y) s.top  = t > 0 ? (t+'px') : '0';
+  var p = el.parentNode, s = el.style;
+  var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth');
+  var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth');
+  if (x) s.left = l > 0 ? (l+'px') : '0';
+  if (y) s.top  = t > 0 ? (t+'px') : '0';
 };
 
 function sz(el, p) {
- return parseInt($.css(el,p))||0;
+  return parseInt($.css(el,p))||0;
 };
 
 })(jQuery);

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.form.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.form.js?rev=1776930&r1=1776929&r2=1776930&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.form.js (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/js/lib/jquery.form.js Mon Jan  2 13:44:06 2017
@@ -36,32 +36,32 @@ THE SOFTWARE.
 ;(function($) {
 
 /*
- 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
- to bind your own submit handler to the form.  For example,
-
- $(document).ready(function() {
- $('#myForm').bind('submit', function() {
- $(this).ajaxSubmit({
- target: '#output'
- });
- return false; // <-- important!
- });
- });
-
- Use ajaxForm when you want the plugin to manage all the event binding
- for you.  For example,
-
- $(document).ready(function() {
- $('#myForm').ajaxForm({
- target: '#output'
- });
- });
+  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
+  to bind your own submit handler to the form.  For example,
+
+  $(document).ready(function() {
+    $('#myForm').bind('submit', function() {
+      $(this).ajaxSubmit({
+        target: '#output'
+      });
+      return false; // <-- important!
+    });
+  });
+
+  Use ajaxForm when you want the plugin to manage all the event binding
+  for you.  For example,
+
+  $(document).ready(function() {
+    $('#myForm').ajaxForm({
+      target: '#output'
+    });
+  });
 
- When using ajaxForm, the ajaxSubmit function will be invoked for you
- at the appropriate time.
+  When using ajaxForm, the ajaxSubmit function will be invoked for you
+  at the appropriate time.
 */
 
 /**
@@ -69,382 +69,382 @@ THE SOFTWARE.
  * an HTML form using AJAX.
  */
 $.fn.ajaxSubmit = function(options) {
- // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
- if (!this.length) {
- log('ajaxSubmit: skipping submit process - no element selected');
- return this;
- }
-
- if (typeof options == 'function') {
- options = { success: options };
- }
-
- var url = $.trim(this.attr('action'));
- if (url) {
- // clean url (don't include hash vaue)
- url = (url.match(/^([^#]+)/)||[])[1];
- }
- url = url || window.location.href || '';
-
- options = $.extend(true, {
- url:  url,
- type: this.attr('method') || 'GET',
- iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
- }, options);
-
- // hook for manipulating the form data before it is extracted;
- // convenient for use with rich editors like tinyMCE or FCKEditor
- var veto = {};
- this.trigger('form-pre-serialize', [this, options, veto]);
- if (veto.veto) {
- log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
- return this;
- }
-
- // provide opportunity to alter form data before it is serialized
- if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
- log('ajaxSubmit: submit aborted via beforeSerialize callback');
- return this;
- }
-
- var n,v,a = this.formToArray(options.semantic);
- if (options.data) {
- options.extraData = options.data;
- 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 } );
- }
- }
- }
-
- // give pre-submit callback an opportunity to abort the submit
- 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);
-
- if (options.type.toUpperCase() == 'GET') {
- options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
- options.data = null;  // data is null for 'get'
- }
- 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(); });
- }
-
- // perform a load on the target only if dataType is not provided
- if (!options.dataType && options.target) {
- var oldSuccess = options.success || function(){};
- callbacks.push(function(data) {
- var fn = options.replaceTarget ? 'replaceWith' : 'html';
- $(options.target)[fn](data).each(oldSuccess, arguments);
- });
- }
- else if (options.success) {
- callbacks.push(options.success);
- }
-
- options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
- 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 fileInputs = $('input:file', this).length > 0;
- var mp = 'multipart/form-data';
- var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+  // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+  if (!this.length) {
+    log('ajaxSubmit: skipping submit process - no element selected');
+    return this;
+  }
+
+  if (typeof options == 'function') {
+    options = { success: options };
+  }
+
+  var url = $.trim(this.attr('action'));
+  if (url) {
+    // clean url (don't include hash vaue)
+    url = (url.match(/^([^#]+)/)||[])[1];
+  }
+  url = url || window.location.href || '';
+
+  options = $.extend(true, {
+    url:  url,
+    type: this.attr('method') || 'GET',
+    iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+  }, options);
+
+  // hook for manipulating the form data before it is extracted;
+  // convenient for use with rich editors like tinyMCE or FCKEditor
+  var veto = {};
+  this.trigger('form-pre-serialize', [this, options, veto]);
+  if (veto.veto) {
+    log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+    return this;
+  }
+
+  // provide opportunity to alter form data before it is serialized
+  if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+    log('ajaxSubmit: submit aborted via beforeSerialize callback');
+    return this;
+  }
+
+  var n,v,a = this.formToArray(options.semantic);
+  if (options.data) {
+    options.extraData = options.data;
+    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 } );
+      }
+    }
+  }
+
+  // give pre-submit callback an opportunity to abort the submit
+  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);
+
+  if (options.type.toUpperCase() == 'GET') {
+    options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+    options.data = null;  // data is null for 'get'
+  }
+  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(); });
+  }
+
+  // perform a load on the target only if dataType is not provided
+  if (!options.dataType && options.target) {
+    var oldSuccess = options.success || function(){};
+    callbacks.push(function(data) {
+      var fn = options.replaceTarget ? 'replaceWith' : 'html';
+      $(options.target)[fn](data).each(oldSuccess, arguments);
+    });
+  }
+  else if (options.success) {
+    callbacks.push(options.success);
+  }
+
+  options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+    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 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
+  // 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 && (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) {
-   $.get(options.closeKeepAlive, fileUpload);
- }
-   else {
-   fileUpload();
- }
+     // 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) {
+       $.get(options.closeKeepAlive, fileUpload);
+    }
+     else {
+       fileUpload();
+    }
    }
    else {
-   $.ajax(options);
+     $.ajax(options);
    }
 
- // fire 'notify' event
- this.trigger('form-submit-notify', [this, options]);
- return this;
-
-
- // private function for handling file uploads (hat tip to YAHOO!)
- function fileUpload() {
- var form = $form[0];
-
- 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 s = $.extend(true, {}, $.ajaxSettings, options);
- s.context = s.context || s;
- var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
- window[fn] = function() {
- var f = $io.data('form-plugin-onload');
- if (f) {
- f();
- window[fn] = undefined;
- try { delete window[fn]; } catch(e){}
- }
- }
- var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" onload="window[\'_\'+this.id]()" />');
- var io = $io[0];
-
- $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-
- var xhr = { // mock object
- aborted: 0,
- responseText: null,
- responseXML: null,
- status: 0,
- statusText: 'n/a',
- getAllResponseHeaders: function() {},
- getResponseHeader: function() {},
- setRequestHeader: function() {},
- abort: function() {
- this.aborted = 1;
- $io.attr('src', s.iframeSrc); // abort op in progress
- }
- };
-
- 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, s]);
- }
-
- if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
- if (s.global) {
- $.active--;
- }
- return;
- }
- if (xhr.aborted) {
- return;
- }
-
- var cbInvoked = false;
- var timedOut = 0;
-
- // add submitting element to data if we know it
- var sub = form.clk;
- if (sub) {
- var n = sub.name;
- if (n && !sub.disabled) {
- s.extraData = s.extraData || {};
- s.extraData[n] = sub.value;
- if (sub.type == "image") {
- s.extraData[n+'.x'] = form.clk_x;
- s.extraData[n+'.y'] = form.clk_y;
- }
- }
- }
-
- // 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');
-
- // update form attrs in IE friendly way
- form.setAttribute('target',id);
- if (form.getAttribute('method') != 'POST') {
- form.setAttribute('method', 'POST');
- }
- if (form.getAttribute('action') != s.url) {
- form.setAttribute('action', s.url);
- }
-
- // ie borks in some cases when setting encoding
- if (! s.skipEncodingOverride) {
- $form.attr({
- encoding: 'multipart/form-data',
- enctype:  'multipart/form-data'
- });
- }
-
- // support timout
- if (s.timeout) {
- setTimeout(function() { timedOut = true; cb(); }, s.timeout);
- }
-
- // add "extra" data to form if provided in options
- var extraInputs = [];
- try {
- if (s.extraData) {
- for (var n in s.extraData) {
- extraInputs.push(
- $('<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);
- form.submit();
- }
- finally {
- // reset attrs and remove "extra" input elements
- form.setAttribute('action',a);
- if(t) {
- form.setAttribute('target', t);
- } else {
- $form.removeAttr('target');
- }
- $(extraInputs).remove();
- }
- }
-
- if (s.forceSync) {
- doSubmit();
- }
- else {
- setTimeout(doSubmit, 10); // this lets dom updates render
- }
-
- var data, doc, domCheckCount = 50;
-
- function cb() {
- if (cbInvoked) {
- return;
- }
-
- $io.removeData('form-plugin-onload');
-
- var ok = true;
- try {
- if (timedOut) {
- throw 'timeout';
- }
- // extract the server response from the iframe
- doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-
- var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
- log('isXml='+isXml);
- 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');
- setTimeout(cb, 250);
- 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.documentElement ? doc.documentElement.innerHTML : null;
- xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
- xhr.getResponseHeader = function(header){
- var headers = {'content-type': s.dataType};
- return headers[header];
- };
-
- 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) {
- xhr.responseText = ta.value;
- }
- else if (scr) {
- // account for browsers injecting pre around json response
- var pre = doc.getElementsByTagName('pre')[0];
- if (pre) {
- xhr.responseText = pre.innerHTML;
- }
- }  
- }
- else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
- xhr.responseXML = toXml(xhr.responseText);
- }
- data = $.httpData(xhr, s.dataType);
- }
- catch(e){
- log('error caught:',e);
- ok = false;
- xhr.error = e;
- $.handleError(s, xhr, 'error', e);
- }
-
- // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
- if (ok) {
- s.success.call(s.context, data, 'success', xhr);
- if (g) {
- $.event.trigger("ajaxSuccess", [xhr, s]);
- }
- }
- if (g) {
- $.event.trigger("ajaxComplete", [xhr, s]);
- }
- if (g && ! --$.active) {
- $.event.trigger("ajaxStop");
- }
- if (s.complete) {
- s.complete.call(s.context, xhr, ok ? 'success' : 'error');
- }
-
- // clean up
- setTimeout(function() {
- $io.removeData('form-plugin-onload');
- $io.remove();
- xhr.responseXML = null;
- }, 100);
- }
-
- function toXml(s, doc) {
- if (window.ActiveXObject) {
- doc = new ActiveXObject('Microsoft.XMLDOM');
- doc.async = 'false';
- doc.loadXML(s);
- }
- else {
- doc = (new DOMParser()).parseFromString(s, 'text/xml');
- }
- return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
- }
- }
+  // fire 'notify' event
+  this.trigger('form-submit-notify', [this, options]);
+  return this;
+
+
+  // private function for handling file uploads (hat tip to YAHOO!)
+  function fileUpload() {
+    var form = $form[0];
+
+    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 s = $.extend(true, {}, $.ajaxSettings, options);
+    s.context = s.context || s;
+    var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
+    window[fn] = function() {
+      var f = $io.data('form-plugin-onload');
+      if (f) {
+        f();
+        window[fn] = undefined;
+        try { delete window[fn]; } catch(e){}
+      }
+    }
+    var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" onload="window[\'_\'+this.id]()" />');
+    var io = $io[0];
+
+    $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+    var xhr = { // mock object
+      aborted: 0,
+      responseText: null,
+      responseXML: null,
+      status: 0,
+      statusText: 'n/a',
+      getAllResponseHeaders: function() {},
+      getResponseHeader: function() {},
+      setRequestHeader: function() {},
+      abort: function() {
+        this.aborted = 1;
+        $io.attr('src', s.iframeSrc); // abort op in progress
+      }
+    };
+
+    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, s]);
+    }
+
+    if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+      if (s.global) {
+        $.active--;
+      }
+      return;
+    }
+    if (xhr.aborted) {
+      return;
+    }
+
+    var cbInvoked = false;
+    var timedOut = 0;
+
+    // add submitting element to data if we know it
+    var sub = form.clk;
+    if (sub) {
+      var n = sub.name;
+      if (n && !sub.disabled) {
+        s.extraData = s.extraData || {};
+        s.extraData[n] = sub.value;
+        if (sub.type == "image") {
+          s.extraData[n+'.x'] = form.clk_x;
+          s.extraData[n+'.y'] = form.clk_y;
+        }
+      }
+    }
+
+    // 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');
+
+      // update form attrs in IE friendly way
+      form.setAttribute('target',id);
+      if (form.getAttribute('method') != 'POST') {
+        form.setAttribute('method', 'POST');
+      }
+      if (form.getAttribute('action') != s.url) {
+        form.setAttribute('action', s.url);
+      }
+
+      // ie borks in some cases when setting encoding
+      if (! s.skipEncodingOverride) {
+        $form.attr({
+          encoding: 'multipart/form-data',
+          enctype:  'multipart/form-data'
+        });
+      }
+
+      // support timout
+      if (s.timeout) {
+        setTimeout(function() { timedOut = true; cb(); }, s.timeout);
+      }
+
+      // add "extra" data to form if provided in options
+      var extraInputs = [];
+      try {
+        if (s.extraData) {
+          for (var n in s.extraData) {
+            extraInputs.push(
+              $('<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);
+        form.submit();
+      }
+      finally {
+        // reset attrs and remove "extra" input elements
+        form.setAttribute('action',a);
+        if(t) {
+          form.setAttribute('target', t);
+        } else {
+          $form.removeAttr('target');
+        }
+        $(extraInputs).remove();
+      }
+    }
+
+    if (s.forceSync) {
+      doSubmit();
+    }
+    else {
+      setTimeout(doSubmit, 10); // this lets dom updates render
+    }
+  
+    var data, doc, domCheckCount = 50;
+
+    function cb() {
+      if (cbInvoked) {
+        return;
+      }
+
+      $io.removeData('form-plugin-onload');
+      
+      var ok = true;
+      try {
+        if (timedOut) {
+          throw 'timeout';
+        }
+        // extract the server response from the iframe
+        doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+        
+        var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+        log('isXml='+isXml);
+        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');
+            setTimeout(cb, 250);
+            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.documentElement ? doc.documentElement.innerHTML : null;
+        xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+        xhr.getResponseHeader = function(header){
+          var headers = {'content-type': s.dataType};
+          return headers[header];
+        };
+
+        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) {
+            xhr.responseText = ta.value;
+          }
+          else if (scr) {
+            // account for browsers injecting pre around json response
+            var pre = doc.getElementsByTagName('pre')[0];
+            if (pre) {
+              xhr.responseText = pre.innerHTML;
+            }
+          }        
+        }
+        else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+          xhr.responseXML = toXml(xhr.responseText);
+        }
+        data = $.httpData(xhr, s.dataType);
+      }
+      catch(e){
+        log('error caught:',e);
+        ok = false;
+        xhr.error = e;
+        $.handleError(s, xhr, 'error', e);
+      }
+
+      // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+      if (ok) {
+        s.success.call(s.context, data, 'success', xhr);
+        if (g) {
+          $.event.trigger("ajaxSuccess", [xhr, s]);
+        }
+      }
+      if (g) {
+        $.event.trigger("ajaxComplete", [xhr, s]);
+      }
+      if (g && ! --$.active) {
+        $.event.trigger("ajaxStop");
+      }
+      if (s.complete) {
+        s.complete.call(s.context, xhr, ok ? 'success' : 'error');
+      }
+
+      // clean up
+      setTimeout(function() {
+        $io.removeData('form-plugin-onload');
+        $io.remove();
+        xhr.responseXML = null;
+      }, 100);
+    }
+
+    function toXml(s, doc) {
+      if (window.ActiveXObject) {
+        doc = new ActiveXObject('Microsoft.XMLDOM');
+        doc.async = 'false';
+        doc.loadXML(s);
+      }
+      else {
+        doc = (new DOMParser()).parseFromString(s, 'text/xml');
+      }
+      return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+    }
+  }
 };
 
 /**
@@ -453,9 +453,9 @@ $.fn.ajaxSubmit = function(options) {
  * The advantages of using this method instead of ajaxSubmit() are:
  *
  * 1: This method will include coordinates for <input type="image" /> elements (if the element
- * is used to submit the form).
+ *  is used to submit the form).
  * 2. This method will include the submit element's name/value data (for the element that was
- * used to submit the form).
+ *  used to submit the form).
  * 3. This method binds the submit() method to the form for you.
  *
  * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
@@ -463,60 +463,60 @@ $.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) {
- 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) {
- return;
- }
- target = t[0];
- }
- var form = this;
- form.clk = target;
- if (target.type == 'image') {
- if (e.offsetX != undefined) {
- form.clk_x = e.offsetX;
- form.clk_y = e.offsetY;
- } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
- var offset = $el.offset();
- form.clk_x = e.pageX - offset.left;
- form.clk_y = e.pageY - offset.top;
- } else {
- form.clk_x = e.pageX - target.offsetLeft;
- form.clk_y = e.pageY - target.offsetTop;
- }
- }
- // clear form vars
- setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
- });
+  // 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) {
+    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) {
+        return;
+      }
+      target = t[0];
+    }
+    var form = this;
+    form.clk = target;
+    if (target.type == 'image') {
+      if (e.offsetX != undefined) {
+        form.clk_x = e.offsetX;
+        form.clk_y = e.offsetY;
+      } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+        var offset = $el.offset();
+        form.clk_x = e.pageX - offset.left;
+        form.clk_y = e.pageY - offset.top;
+      } else {
+        form.clk_x = e.pageX - target.offsetLeft;
+        form.clk_y = e.pageY - target.offsetTop;
+      }
+    }
+    // clear form vars
+    setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+  });
 };
 
 // ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
 $.fn.ajaxFormUnbind = function() {
- return this.unbind('submit.form-plugin click.form-plugin');
+  return this.unbind('submit.form-plugin click.form-plugin');
 };
 
 /**
@@ -531,55 +531,55 @@ $.fn.ajaxFormUnbind = function() {
  * ajaxSubmit() and ajaxForm() methods.
  */
 $.fn.formToArray = function(semantic) {
- var a = [];
- if (this.length === 0) {
- return a;
- }
-
- var form = this[0];
- var els = semantic ? form.getElementsByTagName('*') : form.elements;
- if (!els) {
- return a;
- }
-
- var i,j,n,v,el;
- 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
- if(!el.disabled && form.clk == el) {
- a.push({name: n, value: $(el).val()});
- a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
- }
- continue;
- }
-
- v = $.fieldValue(el, true);
- if (v && v.constructor == Array) {
- for(j=0, jmax=v.length; j < jmax; j++) {
- a.push({name: n, value: v[j]});
- }
- }
- 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;
- 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});
- }
- }
- return a;
+  var a = [];
+  if (this.length === 0) {
+    return a;
+  }
+
+  var form = this[0];
+  var els = semantic ? form.getElementsByTagName('*') : form.elements;
+  if (!els) {
+    return a;
+  }
+  
+  var i,j,n,v,el;
+  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
+      if(!el.disabled && form.clk == el) {
+        a.push({name: n, value: $(el).val()});
+        a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+      }
+      continue;
+    }
+
+    v = $.fieldValue(el, true);
+    if (v && v.constructor == Array) {
+      for(j=0, jmax=v.length; j < jmax; j++) {
+        a.push({name: n, value: v[j]});
+      }
+    }
+    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;
+    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});
+    }
+  }
+  return a;
 };
 
 /**
@@ -587,8 +587,8 @@ $.fn.formToArray = function(semantic) {
  * in the format: name1=value1&amp;name2=value2
  */
 $.fn.formSerialize = function(semantic) {
- //hand off to jQuery.param for proper encoding
- return $.param(this.formToArray(semantic));
+  //hand off to jQuery.param for proper encoding
+  return $.param(this.formToArray(semantic));
 };
 
 /**
@@ -596,36 +596,36 @@ $.fn.formSerialize = function(semantic)
  * This method will return a string in the format: name1=value1&amp;name2=value2
  */
 $.fn.fieldSerialize = function(successful) {
- var a = [];
- this.each(function() {
- var n = this.name;
- if (!n) {
- return;
- }
- var v = $.fieldValue(this, successful);
- if (v && v.constructor == Array) {
- for (var i=0,max=v.length; i < max; i++) {
- a.push({name: n, value: v[i]});
- }
- }
- 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);
+  var a = [];
+  this.each(function() {
+    var n = this.name;
+    if (!n) {
+      return;
+    }
+    var v = $.fieldValue(this, successful);
+    if (v && v.constructor == Array) {
+      for (var i=0,max=v.length; i < max; i++) {
+        a.push({name: n, value: v[i]});
+      }
+    }
+    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);
 };
 
 /**
  * Returns the value(s) of the element in the matched set.  For example, consider the following form:
  *
  *  <form><fieldset>
- *  <input name="A" type="text" />
- *  <input name="A" type="text" />
- *  <input name="B" type="checkbox" value="B1" />
- *  <input name="B" type="checkbox" value="B2"/>
- *  <input name="C" type="radio" value="C1" />
- *  <input name="C" type="radio" value="C2" />
+ *    <input name="A" type="text" />
+ *    <input name="A" type="text" />
+ *    <input name="B" type="checkbox" value="B1" />
+ *    <input name="B" type="checkbox" value="B2"/>
+ *    <input name="C" type="radio" value="C1" />
+ *    <input name="C" type="radio" value="C2" />
  *  </fieldset></form>
  *
  *  var v = $(':text').fieldValue();
@@ -652,60 +652,60 @@ $.fn.fieldSerialize = function(successfu
  * for each element is returned.
  *
  * Note: This method *always* returns an array.  If no valid value can be determined the
- *   array will be empty, otherwise it will contain one or more values.
+ *     array will be empty, otherwise it will contain one or more values.
  */
 $.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)) {
- continue;
- }
- v.constructor == Array ? $.merge(val, v) : val.push(v);
- }
- return val;
+  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)) {
+      continue;
+    }
+    v.constructor == Array ? $.merge(val, v) : val.push(v);
+  }
+  return val;
 };
 
 /**
  * Returns the value of the field element.
  */
 $.fieldValue = function(el, successful) {
- var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
- 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)) {
- return null;
- }
-
- if (tag == 'select') {
- var index = el.selectedIndex;
- if (index < 0) {
- return null;
- }
- var a = [], ops = el.options;
- var one = (t == 'select-one');
- var max = (one ? index+1 : ops.length);
- for(var i=(one ? index : 0); i < max; i++) {
- var op = ops[i];
- 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;
- }
- if (one) {
- return v;
- }
- a.push(v);
- }
- }
- return a;
- }
- return $(el).val();
+  var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+  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)) {
+      return null;
+  }
+
+  if (tag == 'select') {
+    var index = el.selectedIndex;
+    if (index < 0) {
+      return null;
+    }
+    var a = [], ops = el.options;
+    var one = (t == 'select-one');
+    var max = (one ? index+1 : ops.length);
+    for(var i=(one ? index : 0); i < max; i++) {
+      var op = ops[i];
+      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;
+        }
+        if (one) {
+          return v;
+        }
+        a.push(v);
+      }
+    }
+    return a;
+  }
+  return $(el).val();
 };
 
 /**
@@ -717,52 +717,52 @@ $.fieldValue = function(el, successful)
  *  - button elements will *not* be effected
  */
 $.fn.clearForm = function() {
- return this.each(function() {
- $('input,select,textarea', this).clearFields();
- });
+  return this.each(function() {
+    $('input,select,textarea', this).clearFields();
+  });
 };
 
 /**
  * Clears the selected form elements.
  */
 $.fn.clearFields = $.fn.clearInputs = function() {
- return this.each(function() {
- var t = this.type, tag = this.tagName.toLowerCase();
- if (t == 'text' || t == 'password' || tag == 'textarea') {
- this.value = '';
- }
- else if (t == 'checkbox' || t == 'radio') {
- this.checked = false;
- }
- else if (tag == 'select') {
- this.selectedIndex = -1;
- }
- });
+  return this.each(function() {
+    var t = this.type, tag = this.tagName.toLowerCase();
+    if (t == 'text' || t == 'password' || tag == 'textarea') {
+      this.value = '';
+    }
+    else if (t == 'checkbox' || t == 'radio') {
+      this.checked = false;
+    }
+    else if (tag == 'select') {
+      this.selectedIndex = -1;
+    }
+  });
 };
 
 /**
  * Resets the form data.  Causes all form elements to be reset to their original value.
  */
 $.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)) {
- this.reset();
- }
- });
+  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)) {
+      this.reset();
+    }
+  });
 };
 
 /**
  * Enables or disables any matching elements.
  */
 $.fn.enable = function(b) {
- if (b === undefined) {
- b = true;
- }
- return this.each(function() {
- this.disabled = !b;
- });
+  if (b === undefined) {
+    b = true;
+  }
+  return this.each(function() {
+    this.disabled = !b;
+  });
 };
 
 /**
@@ -770,37 +770,37 @@ $.fn.enable = function(b) {
  * selects/deselects and matching option elements.
  */
 $.fn.selected = function(select) {
- if (select === undefined) {
- select = true;
- }
- return this.each(function() {
- var t = this.type;
- 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') {
- // deselect all other options
- $sel.find('option').selected(false);
- }
- this.selected = select;
- }
- });
+  if (select === undefined) {
+    select = true;
+  }
+  return this.each(function() {
+    var t = this.type;
+    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') {
+        // deselect all other options
+        $sel.find('option').selected(false);
+      }
+      this.selected = select;
+    }
+  });
 };
 
 // helper fn for console logging
 // set $.fn.ajaxSubmit.debug to true to enable debug logging
 function log() {
- if ($.fn.ajaxSubmit.debug) {
- var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
- if (window.console && window.console.log) {
- window.console.log(msg);
- }
- else if (window.opera && window.opera.postError) {
- window.opera.postError(msg);
- }
- }
+  if ($.fn.ajaxSubmit.debug) {
+    var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+    if (window.console && window.console.log) {
+      window.console.log(msg);
+    }
+    else if (window.opera && window.opera.postError) {
+      window.opera.postError(msg);
+    }
+  }
 };
 
 })(jQuery);