/branches/2.8.x/wb/include/yui/connection/connection.js - Diff - WB 2.08.x - Tracking

« Previous | Next »

Revision 1263

Added by Dietmar over 14 years ago

updated YUI 2.4.1 to 2.8.0r4

     /*
     Copyright (c) 2007, Yahoo! Inc. All rights reserved.
     Copyright (c) 2009, Yahoo! Inc. All rights reserved.
     Code licensed under the BSD License:
     http://developer.yahoo.net/yui/license.txt
     version: 2.4.1
     version: 2.8.0r4
     */
     /**
      * The Connection Manager provides a simplified interface to the XMLHttpRequest
-...
         _default_headers:{},
      /**
       * @description Property modified by setForm() to determine if the data
       * should be submitted as an HTML form.
       * @property _isFormSubmit
       * @private
       * @static
       * @type boolean
       */
         _isFormSubmit:false,
      /**
       * @description Property modified by setForm() to determine if a file(s)
       * upload is expected.
       * @property _isFileUpload
       * @private
       * @static
       * @type boolean
       */
         _isFileUpload:false,
      /**
       * @description Property modified by setForm() to set a reference to the HTML
       * form node if the desired action is file upload.
       * @property _formNode
       * @private
       * @static
       * @type object
       */
         _formNode:null,
      /**
       * @description Property modified by setForm() to set the HTML form data
       * for each transaction.
       * @property _sFormData
       * @private
       * @static
       * @type string
       */
         _sFormData:null,
      /**
       * @description Collection of polling references to the polling mechanism in handleReadyState.
       * @property _poll
       * @private
-...
          _transaction_id:0,
       /**
        * @description Tracks the name-value pair of the "clicked" submit button if multiple submit
        * buttons are present in an HTML form; and, if YAHOO.util.Event is available.
        * @property _submitElementValue
        * @private
        * @static
        * @type string
        */
     	 _submitElementValue:null,
       /**
        * @description Determines whether YAHOO.util.Event is available and returns true or false.
        * If true, an event listener is bound at the document level to trap click events that
        * resolve to a target type of "Submit".  This listener will enable setForm() to determine
        * the clicked "Submit" value in a multi-Submit button, HTML form.
        * @property _hasSubmitListener
        * @private
        * @static
        */
     	 _hasSubmitListener:(function()
+    	 {
     		if(YAHOO.util.Event){
     			YAHOO.util.Event.addListener(
     				document,
     				'click',
     				function(e){
     					var obj = YAHOO.util.Event.getTarget(e);
     					if(obj.type && obj.type.toLowerCase() == 'submit'){
     						YAHOO.util.Connect._submitElementValue = encodeURIComponent(obj.name) + "=" + encodeURIComponent(obj.value);
+    					}
     				});
     			return true;
+    	    }
     	    return false;
     	 })(),
       /**
        * @description Custom event that fires at the start of a transaction
        * @property startEvent
        * @private
-...
     	failureEvent: new YAHOO.util.CustomEvent('failure'),
       /**
        * @description Custom event that fires when handleTransactionResponse() determines a
        * response in the HTTP 4xx/5xx range.
        * @property failureEvent
        * @private
        * @static
        * @type CustomEvent
        */
     	uploadEvent: new YAHOO.util.CustomEvent('upload'),
       /**
        * @description Custom event that fires when a transaction is successfully aborted.
        * @property abortEvent
        * @private
-...
        */
     	createXhrObject:function(transactionId)
+    	{
     		var obj,http;
     		var obj,http,i;
     		try
+    		{
     			// Instantiates XMLHttpRequest in non-IE browsers and assigns to http.
     			http = new XMLHttpRequest();
     			//  Object literal with http and tId properties
     			obj = { conn:http, tId:transactionId };
     			obj = { conn:http, tId:transactionId, xhr: true };
+    		}
     		catch(e)
+    		{
     			for(var i=0; i<this._msxml_progid.length; ++i){
     			for(i=0; i<this._msxml_progid.length; ++i){
     				try
+    				{
     					// Instantiates XMLHttpRequest for IE and assign to http
     					http = new ActiveXObject(this._msxml_progid[i]);
     					//  Object literal with conn and tId properties
     					obj = { conn:http, tId:transactionId };
     					obj = { conn:http, tId:transactionId, xhr: true };
     					break;
+    				}
     				catch(e){}
     				catch(e1){}
+    			}
+    		}
     		finally
-...
        * @static
        * @return {object}
        */
     	getConnectionObject:function(isFileUpload)
     	getConnectionObject:function(t)
+    	{
     		var o;
     		var tId = this._transaction_id;
     		var o, tId = this._transaction_id;
     		try
+    		{
     			if(!isFileUpload){
     			if(!t){
     				o = this.createXhrObject(tId);
+    			}
     			else{
     				o = {};
     				o.tId = tId;
     				o.isUpload = true;
     				o = {tId:tId};
     				if(t==='xdr'){
     					o.conn = this._transport;
     					o.xdr = true;
+    				}
     				else if(t==='upload'){
     					o.upload = true;
+    				}
+    			}
     			if(o){
-...
+    			}
+    		}
     		catch(e){}
     		finally
+    		{
     			return o;
+    		}
     		return o;
     	},
       /**
-...
        */
     	asyncRequest:function(method, uri, callback, postData)
+    	{
     		var o = (this._isFileUpload)?this.getConnectionObject(true):this.getConnectionObject();
     		var args = (callback && callback.argument)?callback.argument:null;
     		var o,t,args = (callback && callback.argument)?callback.argument:null;
     		if(this._isFileUpload){
     			t = 'upload';
+    		}
     		else if(callback.xdr){
     			t = 'xdr';
+    		}
     		o = this.getConnectionObject(t);
     		if(!o){
     			return null;
+    		}
-...
     				uri += ((uri.indexOf('?') == -1)?'?':'&') + "rnd=" + new Date().valueOf().toString();
+    			}
     			o.conn.open(method, uri, true);
     			// Each transaction will automatically include a custom header of
     			// "X-Requested-With: XMLHttpRequest" to identify the request as
     			// having originated from Connection Manager.
-...
     			//If the transaction method is POST and the POST header value is set to true
     			//or a custom value, initalize the Content-Type header to this value.
     			if((method.toUpperCase() == 'POST' && this._use_default_post_header) && this._isFormSubmit === false){
     			if((method.toUpperCase() === 'POST' && this._use_default_post_header) && this._isFormSubmit === false){
     				this.initHeader('Content-Type', this._default_post_header);
+    			}
     			if(o.xdr){
     				this.xdr(o, method, uri, callback, postData);
     				return o;
+    			}
     			o.conn.open(method, uri, true);
     			//Initialize all default and custom HTTP headers,
     			if(this._has_default_headers || this._has_http_headers){
     				this.setHeader(o);
+    			}
     			this.handleReadyState(o, callback);
     			o.conn.send(postData || null);
     			o.conn.send(postData || '');
     			// Reset the HTML form data and state properties as
     			// soon as the data are submitted.
     			if(this._isFormSubmit === true){
-...
        */
     	initCustomEvents:function(o, callback)
+    	{
     		var prop;
     		// Enumerate through callback.customevents members and bind/subscribe
     		// events that match in the _customEvents table.
     		for(var prop in callback.customevents){
     		for(prop in callback.customevents){
     			if(this._customEvents[prop][0]){
     				// Create the custom event
     				o[this._customEvents[prop][0]] = new YAHOO.util.CustomEvent(this._customEvents[prop][1], (callback.scope)?callback.scope:null);
-...
         handleReadyState:function(o, callback)
+        {
     		var oConn = this;
     		var args = (callback && callback.argument)?callback.argument:null;
     		var oConn = this,
     			args = (callback && callback.argument)?callback.argument:null;
     		if(callback && callback.timeout){
     			this._timeOut[o.tId] = window.setTimeout(function(){ oConn.abort(o, callback, true); }, callback.timeout);
-...
        */
         handleTransactionResponse:function(o, callback, isAbort)
+        {
     		var httpStatus, responseObject;
     		var args = (callback && callback.argument)?callback.argument:null;
     		var httpStatus, responseObject,
     			args = (callback && callback.argument)?callback.argument:null,
     			xdrS = (o.r && o.r.statusText === 'xdr:success')?true:false,
     			xdrF = (o.r && o.r.statusText === 'xdr:failure')?true:false,
     			xdrA = isAbort;
     		try
+    		{
     			if(o.conn.status !== undefined && o.conn.status !== 0){
     			if((o.conn.status !== undefined && o.conn.status !== 0) || xdrS){
     				// XDR requests will not have HTTP status defined. The
     				// statusText property will define the response status
     				// set by the Flash transport.
     				httpStatus = o.conn.status;
+    			}
     			else if(xdrF && !xdrA){
     				// Set XDR transaction failure to a status of 0, which
     				// resolves as an HTTP failure, instead of an exception.
     				httpStatus = 0;
+    			}
     			else{
     				httpStatus = 13030;
+    			}
-...
     			httpStatus = 13030;
+    		}
     		if(httpStatus >= 200 && httpStatus < 300 || httpStatus === 1223){
     			responseObject = this.createResponseObject(o, args);
     		if((httpStatus >= 200 && httpStatus < 300) || httpStatus === 1223 || xdrS){
     			responseObject = o.xdr ? o.r : this.createResponseObject(o, args);
     			if(callback && callback.success){
     				if(!callback.scope){
     					callback.success(responseObject);
-...
     				case 12031:
     				case 12152: // Connection closed by server.
     				case 13030: // See above comments for variable status.
     					// XDR transactions will not resolve to this case, since the
     					// response object is already built in the xdr response.
     					responseObject = this.createExceptionObject(o.tId, args, (isAbort?isAbort:false));
     					if(callback && callback.failure){
     						if(!callback.scope){
-...
     					break;
     				default:
     					responseObject = this.createResponseObject(o, args);
     					responseObject = (o.xdr) ? o.response : this.createResponseObject(o, args);
     					if(callback && callback.failure){
     						if(!callback.scope){
     							callback.failure(responseObject);
-...
        */
         createResponseObject:function(o, callbackArg)
+        {
     		var obj = {};
     		var headerObj = {};
     		var obj = {}, headerObj = {},
     			i, headerStr, header, delimitPos;
     		try
+    		{
     			var headerStr = o.conn.getAllResponseHeaders();
     			var header = headerStr.split('\n');
     			for(var i=0; i<header.length; i++){
     				var delimitPos = header[i].indexOf(':');
     			headerStr = o.conn.getAllResponseHeaders();
     			header = headerStr.split('\n');
     			for(i=0; i<header.length; i++){
     				delimitPos = header[i].indexOf(':');
     				if(delimitPos != -1){
     					headerObj[header[i].substring(0,delimitPos)] = header[i].substring(delimitPos+2);
     					headerObj[header[i].substring(0,delimitPos)] = YAHOO.lang.trim(header[i].substring(delimitPos+2));
+    				}
+    			}
+    		}
-...
        */
         createExceptionObject:function(tId, callbackArg, isAbort)
+        {
     		var COMM_CODE = 0;
     		var COMM_ERROR = 'communication failure';
     		var ABORT_CODE = -1;
     		var ABORT_ERROR = 'transaction aborted';
     		var COMM_CODE = 0,
     			COMM_ERROR = 'communication failure',
     			ABORT_CODE = -1,
     			ABORT_ERROR = 'transaction aborted',
     			obj = {};
     		var obj = {};
     		obj.tId = tId;
     		if(isAbort){
     			obj.status = ABORT_CODE;
-...
     	initHeader:function(label, value, isDefault)
+    	{
     		var headerObj = (isDefault)?this._default_headers:this._http_headers;
     		headerObj[label] = value;
     		if(isDefault){
     			this._has_default_headers = true;
+    		}
-...
        */
     	setHeader:function(o)
+    	{
     		var prop;
     		if(this._has_default_headers){
     			for(var prop in this._default_headers){
     			for(prop in this._default_headers){
     				if(YAHOO.lang.hasOwnProperty(this._default_headers, prop)){
     					o.conn.setRequestHeader(prop, this._default_headers[prop]);
+    				}
-...
+    		}
     		if(this._has_http_headers){
     			for(var prop in this._http_headers){
     			for(prop in this._http_headers){
     				if(YAHOO.lang.hasOwnProperty(this._http_headers, prop)){
     					o.conn.setRequestHeader(prop, this._http_headers[prop]);
+    				}
+    			}
     			delete this._http_headers;
     			this._http_headers = {};
     			this._has_http_headers = false;
-...
        * @return {void}
        */
     	resetDefaultHeaders:function(){
     		delete this._default_headers;
     		this._default_headers = {};
     		this._has_default_headers = false;
     	},
       /**
        * @description Method to terminate a transaction, if it has not reached readyState 4.
        * @method abort
        * @public
        * @static
        * @param {object} o The connection object returned by asyncRequest.
        * @param {object} callback  User-defined callback object.
        * @param {string} isTimeout boolean to indicate if abort resulted from a callback timeout.
        * @return {boolean}
        */
     	abort:function(o, callback, isTimeout)
+    	{
     		var abortStatus,
     			args = (callback && callback.argument)?callback.argument:null;
     			o = o || {};
     		if(o.conn){
     			if(o.xhr){
     				if(this.isCallInProgress(o)){
     					// Issue abort request
     					o.conn.abort();
     					window.clearInterval(this._poll[o.tId]);
     					delete this._poll[o.tId];
     					if(isTimeout){
     						window.clearTimeout(this._timeOut[o.tId]);
     						delete this._timeOut[o.tId];
+    					}
     					abortStatus = true;
+    				}
+    			}
     			else if(o.xdr){
     				o.conn.abort(o.tId);
     				abortStatus = true;
+    			}
+    		}
     		else if(o.upload){
     			var frameId = 'yuiIO' + o.tId;
     			var io = document.getElementById(frameId);
     			if(io){
     				// Remove all listeners on the iframe prior to
     				// its destruction.
     				YAHOO.util.Event.removeListener(io, "load");
     				// Destroy the iframe facilitating the transaction.
     				document.body.removeChild(io);
     				if(isTimeout){
     					window.clearTimeout(this._timeOut[o.tId]);
     					delete this._timeOut[o.tId];
+    				}
     				abortStatus = true;
+    			}
+    		}
     		else{
     			abortStatus = false;
+    		}
     		if(abortStatus === true){
     			// Fire global custom event -- abortEvent
     			this.abortEvent.fire(o, args);
     			if(o.abortEvent){
     				// Fire transaction custom event -- abortEvent
     				o.abortEvent.fire(o, args);
+    			}
     			this.handleTransactionResponse(o, callback, true);
+    		}
     		return abortStatus;
     	},
       /**
        * @description Determines if the transaction is still being processed.
        * @method isCallInProgress
        * @public
        * @static
        * @param {object} o The connection object returned by asyncRequest
        * @return {boolean}
        */
     	isCallInProgress:function(o)
+    	{
     		o = o || {};
     		// if the XHR object assigned to the transaction has not been dereferenced,
     		// then check its readyState status.  Otherwise, return false.
     		if(o.xhr && o.conn){
     			return o.conn.readyState !== 4 && o.conn.readyState !== 0;
+    		}
     		else if(o.xdr && o.conn){
     			return o.conn.isCallInProgress(o.tId);
+    		}
     		else if(o.upload === true){
     			return document.getElementById('yuiIO' + o.tId)?true:false;
+    		}
     		else{
     			return false;
+    		}
     	},
       /**
        * @description Dereference the XHR instance and the connection object after the transaction is completed.
        * @method releaseObject
        * @private
        * @static
        * @param {object} o The connection object
        * @return {void}
        */
     	releaseObject:function(o)
+    	{
     		if(o && o.conn){
     			//dereference the XHR instance.
     			o.conn = null;
     			//dereference the connection object.
     			o = null;
+    		}
+    	}
     };
     /**
       * @for Connect
       */
     (function() {
     	var YCM = YAHOO.util.Connect, _fn = {};
        /**
         * @description This method creates and instantiates the Flash transport.
         * @method _swf
         * @private
         * @static
         * @param {string} URI to connection.swf.
         * @return {void}
         */
     	function _swf(uri) {
     		var o = '<object id="YUIConnectionSwf" type="application/x-shockwave-flash" data="' +
     		        uri + '" width="0" height="0">' +
     		     	'<param name="movie" value="' + uri + '">' +
                     '<param name="allowScriptAccess" value="always">' +
     		    	'</object>',
     		    c = document.createElement('div');
     		document.body.appendChild(c);
     		c.innerHTML = o;
+    	}
        /**
         * @description This method calls the public method on the
         * Flash transport to start the XDR transaction.  It is analogous
         * to Connection Manager's asyncRequest method.
         * @method xdr
         * @private
         * @static
         * @param {object} The transaction object.
         * @param {string} HTTP request method.
         * @param {string} URI for the transaction.
         * @param {object} The transaction's callback object.
         * @param {object} The JSON object used as HTTP POST data.
         * @return {void}
         */
     	function _xdr(o, m, u, c, d) {
     		_fn[parseInt(o.tId)] = { 'o':o, 'c':c };
     		if (d) {
     			c.method = m;
     			c.data = d;
+    		}
     		o.conn.send(u, c, o.tId);
+    	}
        /**
         * @description This method instantiates the Flash transport and
         * establishes a static reference to it, used for all XDR requests.
         * @method transport
         * @public
         * @static
         * @param {string} URI to connection.swf.
         * @return {void}
         */
     	function _init(uri) {
     		_swf(uri);
     		YCM._transport = document.getElementById('YUIConnectionSwf');
+    	}
     	function _xdrReady() {
     		YCM.xdrReadyEvent.fire();
+    	}
        /**
         * @description This method fires the global and transaction start
         * events.
         * @method _xdrStart
         * @private
         * @static
         * @param {object} The transaction object.
         * @param {string} The transaction's callback object.
         * @return {void}
         */
     	function _xdrStart(o, cb) {
     		if (o) {
     			// Fire global custom event -- startEvent
     			YCM.startEvent.fire(o, cb.argument);
     			if(o.startEvent){
     				// Fire transaction custom event -- startEvent
     				o.startEvent.fire(o, cb.argument);
+    			}
+    		}
+    	}
        /**
         * @description This method is the initial response handler
         * for XDR transactions.  The Flash transport calls this
         * function and sends the response payload.
         * @method handleXdrResponse
         * @private
         * @static
         * @param {object} The response object sent from the Flash transport.
         * @return {void}
         */
     	function _handleXdrResponse(r) {
     		var o = _fn[r.tId].o,
     			cb = _fn[r.tId].c;
     		if (r.statusText === 'xdr:start') {
     			_xdrStart(o, cb);
     			return;
+    		}
     		r.responseText = decodeURI(r.responseText);
     		o.r = r;
     		if (cb.argument) {
     			o.r.argument = cb.argument;
+    		}
     		this.handleTransactionResponse(o, cb, r.statusText === 'xdr:abort' ? true : false);
     		delete _fn[r.tId];
+    	}
     	// Bind the functions to Connection Manager as static fields.
     	YCM.xdr = _xdr;
     	YCM.swf = _swf;
     	YCM.transport = _init;
     	YCM.xdrReadyEvent = new YAHOO.util.CustomEvent('xdrReady');
     	YCM.xdrReady = _xdrReady;
     	YCM.handleXdrResponse = _handleXdrResponse;
     })();
     /**
       * @for Connect
       */
     (function(){
     	var YCM = YAHOO.util.Connect,
     		YE = YAHOO.util.Event;
        /**
     	* @description Property modified by setForm() to determine if the data
     	* should be submitted as an HTML form.
     	* @property _isFormSubmit
     	* @private
     	* @static
     	* @type boolean
     	*/
     	YCM._isFormSubmit = false;
        /**
     	* @description Property modified by setForm() to determine if a file(s)
     	* upload is expected.
     	* @property _isFileUpload
     	* @private
     	* @static
     	* @type boolean
     	*/
     	YCM._isFileUpload = false;
        /**
     	* @description Property modified by setForm() to set a reference to the HTML
     	* form node if the desired action is file upload.
     	* @property _formNode
     	* @private
     	* @static
     	* @type object
     	*/
     	YCM._formNode = null;
        /**
     	* @description Property modified by setForm() to set the HTML form data
     	* for each transaction.
     	* @property _sFormData
     	* @private
     	* @static
     	* @type string
     	*/
     	YCM._sFormData = null;
        /**
     	* @description Tracks the name-value pair of the "clicked" submit button if multiple submit
     	* buttons are present in an HTML form; and, if YAHOO.util.Event is available.
     	* @property _submitElementValue
     	* @private
     	* @static
     	* @type string
     	*/
     	YCM._submitElementValue = null;
        /**
         * @description Custom event that fires when handleTransactionResponse() determines a
         * response in the HTTP 4xx/5xx range.
         * @property failureEvent
         * @private
         * @static
         * @type CustomEvent
         */
     	YCM.uploadEvent = new YAHOO.util.CustomEvent('upload'),
        /**
     	* @description Determines whether YAHOO.util.Event is available and returns true or false.
     	* If true, an event listener is bound at the document level to trap click events that
     	* resolve to a target type of "Submit".  This listener will enable setForm() to determine
     	* the clicked "Submit" value in a multi-Submit button, HTML form.
     	* @property _hasSubmitListener
     	* @private
     	* @static
     	*/
     	YCM._hasSubmitListener = function() {
     		if(YE){
     			YE.addListener(
     				document,
     				'click',
     				function(e){
     					var obj = YE.getTarget(e),
     						name = obj.nodeName.toLowerCase();
     					if((name === 'input' || name === 'button') && (obj.type && obj.type.toLowerCase() == 'submit')){
     						YCM._submitElementValue = encodeURIComponent(obj.name) + "=" + encodeURIComponent(obj.value);
+    					}
     				});
     			return true;
+    		}
     		return false;
     	}();
       /**
        * @description This method assembles the form label and value pairs and
        * constructs an encoded string.
        * asyncRequest() will automatically initialize the transaction with a
-...
        * @param {boolean} optional enable file upload over SSL in IE only.
        * @return {string} string of the HTML form field name and value pairs..
        */
     	setForm:function(formId, isUpload, secureUri)
     	function _setForm(formId, isUpload, secureUri)
+    	{
     		// reset the HTML form data and state properties
     		var oForm, oElement, oName, oValue, oDisabled,
     			hasSubmit = false,
     			data = [], item = 0,
     			i,len,j,jlen,opt;
     		this.resetFormState();
     		var oForm;
     		if(typeof formId == 'string'){
     			// Determine if the argument is a form id or a form name.
     			// Note form name usage is deprecated, but supported
     			// here for backward compatibility.
     			// Note form name usage is deprecated by supported
     			// here for legacy reasons.
     			oForm = (document.getElementById(formId) || document.forms[formId]);
+    		}
     		else if(typeof formId == 'object'){
-...
     		if(isUpload){
     			// Create iframe in preparation for file upload.
     			var io = this.createFrame(secureUri?secureUri:null);
     			this.createFrame(secureUri?secureUri:null);
     			// Set form reference and file upload properties to true.
     			this._isFormSubmit = true;
     			this._isFileUpload = true;
     			this._formNode = oForm;
     			return;
+    		}
     		var oElement, oName, oValue, oDisabled;
     		var hasSubmit = false;
     		// Iterate over the form elements collection to construct the
     		// label-value pairs.
     		for (var i=0; i<oForm.elements.length; i++){
     			oElement = oForm.elements[i];
     		for (i=0,len=oForm.elements.length; i<len; ++i){
     			oElement  = oForm.elements[i];
     			oDisabled = oElement.disabled;
     			oName = oElement.name;
     			oValue = oElement.value;
     			oName     = oElement.name;
     			// Do not submit fields that are disabled or
     			// do not have a name attribute value.
     			if(!oDisabled && oName)
+    			{
     				oName  = encodeURIComponent(oName)+'=';
     				oValue = encodeURIComponent(oElement.value);
     				switch(oElement.type)
+    				{
     					// Safari, Opera, FF all default opt.value from .text if
     					// value attribute not specified in markup
     					case 'select-one':
     						if (oElement.selectedIndex > -1) {
     							opt = oElement.options[oElement.selectedIndex];
     							data[item++] = oName + encodeURIComponent(
     								(opt.attributes.value && opt.attributes.value.specified) ? opt.value : opt.text);
+    						}
     						break;
     					case 'select-multiple':
     						for(var j=0; j<oElement.options.length; j++){
     							if(oElement.options[j].selected){
     								if(window.ActiveXObject){
     									this._sFormData += encodeURIComponent(oName) + '=' + encodeURIComponent(oElement.options[j].attributes['value'].specified?oElement.options[j].value:oElement.options[j].text) + '&';
     						if (oElement.selectedIndex > -1) {
     							for(j=oElement.selectedIndex, jlen=oElement.options.length; j<jlen; ++j){
     								opt = oElement.options[j];
     								if (opt.selected) {
     									data[item++] = oName + encodeURIComponent(
     										(opt.attributes.value && opt.attributes.value.specified) ? opt.value : opt.text);
+    								}
     								else{
     									this._sFormData += encodeURIComponent(oName) + '=' + encodeURIComponent(oElement.options[j].hasAttribute('value')?oElement.options[j].value:oElement.options[j].text) + '&';
+    								}
+    							}
+    						}
     						break;
     					case 'radio':
     					case 'checkbox':
     						if(oElement.checked){
     							this._sFormData += encodeURIComponent(oName) + '=' + encodeURIComponent(oValue) + '&';
     							data[item++] = oName + oValue;
+    						}
     						break;
     					case 'file':
-...
     					case 'submit':
     						if(hasSubmit === false){
     							if(this._hasSubmitListener && this._submitElementValue){
     								this._sFormData += this._submitElementValue + '&';
     								data[item++] = this._submitElementValue;
+    							}
     							else{
     								this._sFormData += encodeURIComponent(oName) + '=' + encodeURIComponent(oValue) + '&';
+    							}
     							hasSubmit = true;
+    						}
     						break;
     					default:
     						this._sFormData += encodeURIComponent(oName) + '=' + encodeURIComponent(oValue) + '&';
     						data[item++] = oName + oValue;
+    				}
+    			}
+    		}
     		this._isFormSubmit = true;
     		this._sFormData = this._sFormData.substr(0, this._sFormData.length - 1);
     		this._sFormData = data.join('&');
     		this.initHeader('Content-Type', this._default_form_header);
     		return this._sFormData;
     	},
+    	}
       /**
        * @description Resets HTML form properties when an HTML form or HTML form
        * with file upload transaction is sent.
        * @method resetFormState
        * @private
        * @static
        * @return {void}
        */
     	resetFormState:function(){
        /**
         * @description Resets HTML form properties when an HTML form or HTML form
         * with file upload transaction is sent.
         * @method resetFormState
         * @private
         * @static
         * @return {void}
         */
     	function _resetFormState(){
     		this._isFormSubmit = false;
     		this._isFileUpload = false;
     		this._formNode = null;
     		this._sFormData = "";
     	},
+    	}
       /**
        * @description Creates an iframe to be used for form file uploads.  It is remove from the
        * document upon completion of the upload transaction.
        * @method createFrame
        * @private
        * @static
        * @param {string} optional qualified path of iframe resource for SSL in IE.
        * @return {void}
        */
     	createFrame:function(secureUri){
        /**
         * @description Creates an iframe to be used for form file uploads.  It is remove from the
         * document upon completion of the upload transaction.
         * @method createFrame
         * @private
         * @static
         * @param {string} optional qualified path of iframe resource for SSL in IE.
         * @return {void}
         */
     	function _createFrame(secureUri){
     		// IE does not allow the setting of id and name attributes as object
     		// properties via createElement().  A different iframe creation
     		// pattern is required for IE.
     		var frameId = 'yuiIO' + this._transaction_id;
     		var io;
     		if(window.ActiveXObject){
     		var frameId = 'yuiIO' + this._transaction_id,
     			io;
     		if(YAHOO.env.ua.ie){
     			io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
     			// IE will throw a security exception in an SSL environment if the
-...
     			if(typeof secureUri == 'boolean'){
     				io.src = 'javascript:false';
+    			}
     			else if(typeof secureURI == 'string'){
     				// Deprecated
     				io.src = secureUri;
+    			}
+    		}
     		else{
     			io = document.createElement('iframe');
-...
     		io.style.left = '-1000px';
     		document.body.appendChild(io);
     	},
+    	}
       /**
        * @description Parses the POST data and creates hidden form elements
        * for each key-value, and appends them to the HTML form object.
        * @method appendPostData
        * @private
        * @static
        * @param {string} postData The HTTP POST data
        * @return {array} formElements Collection of hidden fields.
        */
     	appendPostData:function(postData)
+    	{
     		var formElements = [];
     		var postMessage = postData.split('&');
     		for(var i=0; i < postMessage.length; i++){
     			var delimitPos = postMessage[i].indexOf('=');
        /**
         * @description Parses the POST data and creates hidden form elements
         * for each key-value, and appends them to the HTML form object.
         * @method appendPostData
         * @private
         * @static
         * @param {string} postData The HTTP POST data
         * @return {array} formElements Collection of hidden fields.
         */
     	function _appendPostData(postData){
     		var formElements = [],
     			postMessage = postData.split('&'),
     			i, delimitPos;
     		for(i=0; i < postMessage.length; i++){
     			delimitPos = postMessage[i].indexOf('=');
     			if(delimitPos != -1){
     				formElements[i] = document.createElement('input');
     				formElements[i].type = 'hidden';
     				formElements[i].name = postMessage[i].substring(0,delimitPos);
     				formElements[i].value = postMessage[i].substring(delimitPos+1);
     				formElements[i].name = decodeURIComponent(postMessage[i].substring(0,delimitPos));
     				formElements[i].value = decodeURIComponent(postMessage[i].substring(delimitPos+1));
     				this._formNode.appendChild(formElements[i]);
+    			}
+    		}
     		return formElements;
     	},
+    	}
       /**
        * @description Uploads HTML form, inclusive of files/attachments, using the
        * iframe created in createFrame to facilitate the transaction.
        * @method uploadFile
        * @private
        * @static
        * @param {int} id The transaction id.
        * @param {object} callback User-defined callback object.
        * @param {string} uri Fully qualified path of resource.
        * @param {string} postData POST data to be submitted in addition to HTML form.
        * @return {void}
        */
     	uploadFile:function(o, callback, uri, postData){
        /**
         * @description Uploads HTML form, inclusive of files/attachments, using the
         * iframe created in createFrame to facilitate the transaction.
         * @method uploadFile
         * @private
         * @static
         * @param {int} id The transaction id.
         * @param {object} callback User-defined callback object.
         * @param {string} uri Fully qualified path of resource.
         * @param {string} postData POST data to be submitted in addition to HTML form.
         * @return {void}
         */
     	function _uploadFile(o, callback, uri, postData){
     		// Each iframe has an id prefix of "yuiIO" followed
     		// by the unique transaction id.
     		var oConn = this;
     		var frameId = 'yuiIO' + o.tId;
     		var uploadEncoding = 'multipart/form-data';
     		var io = document.getElementById(frameId);
     		var args = (callback && callback.argument)?callback.argument:null;
     		var frameId = 'yuiIO' + o.tId,
     		    uploadEncoding = 'multipart/form-data',
     		    io = document.getElementById(frameId),
     		    ie8 = (document.documentMode && document.documentMode === 8) ? true : false,
     		    oConn = this,
     			args = (callback && callback.argument)?callback.argument:null,
                 oElements,i,prop,obj, rawFormAttributes, uploadCallback;
     		// Track original HTML form attribute values.
     		var rawFormAttributes =
+    		{
     		rawFormAttributes = {
     			action:this._formNode.getAttribute('action'),
     			method:this._formNode.getAttribute('method'),
     			target:this._formNode.getAttribute('target')
-...
     		this._formNode.setAttribute('method', 'POST');
     		this._formNode.setAttribute('target', frameId);
     		if(this._formNode.encoding){
     		if(YAHOO.env.ua.ie && !ie8){
     			// IE does not respect property enctype for HTML forms.
     			// Instead it uses the property - "encoding".
     			this._formNode.setAttribute('encoding', uploadEncoding);
-...
+    		}
     		if(postData){
     			var oElements = this.appendPostData(postData);
     			oElements = this.appendPostData(postData);
+    		}
     		// Start file upload.
-...
     		// Remove HTML elements created by appendPostData
     		if(oElements && oElements.length > 0){
     			for(var i=0; i < oElements.length; i++){
     			for(i=0; i < oElements.length; i++){
     				this._formNode.removeChild(oElements[i]);
+    			}
+    		}
     		// Restore HTML form attributes to their original
     		// values prior to file upload.
     		for(var prop in rawFormAttributes){
     		for(prop in rawFormAttributes){
     			if(YAHOO.lang.hasOwnProperty(rawFormAttributes, prop)){
     				if(rawFormAttributes[prop]){
     					this._formNode.setAttribute(prop, rawFormAttributes[prop]);
-...
     		// Create the upload callback handler that fires when the iframe
     		// receives the load event.  Subsequently, the event handler is detached
     		// and the iframe removed from the document.
     		var uploadCallback = function()
+    		{
     		uploadCallback = function() {
     			if(callback && callback.timeout){
     				window.clearTimeout(oConn._timeOut[o.tId]);
     				delete oConn._timeOut[o.tId];
-...
     				o.completeEvent.fire(o, args);
+    			}
     			var obj = {};
     			obj.tId = o.tId;
     			obj.argument = callback.argument;
     			obj = {
     			    tId : o.tId,
     			    argument : callback.argument
                 };
     			try
+    			{
-...
     				o.uploadEvent.fire(obj);
+    			}
     			YAHOO.util.Event.removeListener(io, "load", uploadCallback);
     			YE.removeListener(io, "load", uploadCallback);
     			setTimeout(
     				function(){
-...
     		};
     		// Bind the onload handler to the iframe to detect the file upload response.
     		YAHOO.util.Event.addListener(io, "load", uploadCallback);
     	},
     		YE.addListener(io, "load", uploadCallback);
+    	}
       /**
        * @description Method to terminate a transaction, if it has not reached readyState 4.
        * @method abort
        * @public
        * @static
        * @param {object} o The connection object returned by asyncRequest.
        * @param {object} callback  User-defined callback object.
        * @param {string} isTimeout boolean to indicate if abort resulted from a callback timeout.
        * @return {boolean}
        */
     	abort:function(o, callback, isTimeout)
+    	{
     		var abortStatus;
     		var args = (callback && callback.argument)?callback.argument:null;
     	YCM.setForm = _setForm;
     	YCM.resetFormState = _resetFormState;
     	YCM.createFrame = _createFrame;
     	YCM.appendPostData = _appendPostData;
     	YCM.uploadFile = _uploadFile;
     })();
     		if(o && o.conn){
     			if(this.isCallInProgress(o)){
     				// Issue abort request
     				o.conn.abort();
     				window.clearInterval(this._poll[o.tId]);
     				delete this._poll[o.tId];
     				if(isTimeout){
     					window.clearTimeout(this._timeOut[o.tId]);
     					delete this._timeOut[o.tId];
+    				}
     				abortStatus = true;
+    			}
+    		}
     		else if(o && o.isUpload === true){
     			var frameId = 'yuiIO' + o.tId;
     			var io = document.getElementById(frameId);
     			if(io){
     				// Remove all listeners on the iframe prior to
     				// its destruction.
     				YAHOO.util.Event.removeListener(io, "load");
     				// Destroy the iframe facilitating the transaction.
     				document.body.removeChild(io);
     				if(isTimeout){
     					window.clearTimeout(this._timeOut[o.tId]);
     					delete this._timeOut[o.tId];
+    				}
     				abortStatus = true;
+    			}
+    		}
     		else{
     			abortStatus = false;
+    		}
     		if(abortStatus === true){
     			// Fire global custom event -- abortEvent
     			this.abortEvent.fire(o, args);
     			if(o.abortEvent){
     				// Fire transaction custom event -- abortEvent
     				o.abortEvent.fire(o, args);
+    			}
     			this.handleTransactionResponse(o, callback, true);
+    		}
     		return abortStatus;
     	},
       /**
        * @description Determines if the transaction is still being processed.
        * @method isCallInProgress
        * @public
        * @static
        * @param {object} o The connection object returned by asyncRequest
        * @return {boolean}
        */
     	isCallInProgress:function(o)
+    	{
     		// if the XHR object assigned to the transaction has not been dereferenced,
     		// then check its readyState status.  Otherwise, return false.
     		if(o && o.conn){
     			return o.conn.readyState !== 4 && o.conn.readyState !== 0;
+    		}
     		else if(o && o.isUpload === true){
     			var frameId = 'yuiIO' + o.tId;
     			return document.getElementById(frameId)?true:false;
+    		}
     		else{
     			return false;
+    		}
     	},
       /**
        * @description Dereference the XHR instance and the connection object after the transaction is completed.
        * @method releaseObject
        * @private
        * @static
        * @param {object} o The connection object
        * @return {void}
        */
     	releaseObject:function(o)
+    	{
     		if(o && o.conn){
     			//dereference the XHR instance.
     			o.conn = null;
     			//dereference the connection object.
     			o = null;
+    		}
+    	}
     };
     YAHOO.register("connection", YAHOO.util.Connect, {version: "2.4.1", build: "742"});
     YAHOO.register("connection", YAHOO.util.Connect, {version: "2.8.0r4", build: "2449"});

Also available in: Unified diff