From: Argiris K. <be...@us...> - 2006-01-27 23:59:23
|
Update of /cvsroot/magicajax/magicajax/Core/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29601/Core/script Modified Files: AjaxCallObject.js Log Message: -Set version to 0.2.3 -Modified a bit Util.FormElementPattern to fix an issue with Infragistics control (noted by juanvp) -Modified a bit the CreateWaitElement function of AjaxCallObject.js (changes noted by Bruno Feu) Index: AjaxCallObject.js =================================================================== RCS file: /cvsroot/magicajax/magicajax/Core/script/AjaxCallObject.js,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** AjaxCallObject.js 27 Jan 2006 00:28:25 -0000 1.51 --- AjaxCallObject.js 27 Jan 2006 23:59:09 -0000 1.52 *************** *** 295,304 **** { // IE ! theData += target.name + ".x=" + (e.offsetX - target.offsetLeft) + "&" + target.name + ".y=" + (e.offsetY - target.offsetTop); } else { // Firefox ! theData += target.name + ".x=" + (__ClickX - target.offsetLeft) + "&" + target.name + ".y=" + (__ClickY - target.offsetTop); } } --- 295,304 ---- { // IE ! theData = target.name + ".x=" + (e.offsetX - target.offsetLeft) + "&" + target.name + ".y=" + (e.offsetY - target.offsetTop); } else { // Firefox ! theData = target.name + ".x=" + (__ClickX - target.offsetLeft) + "&" + target.name + ".y=" + (__ClickY - target.offsetTop); } } *************** *** 428,432 **** theData += '__AJAXSCOPE=' + ajaxScopeID + '&'; ! if (typeof(additionalData) != "undefined") theData += additionalData + "&"; --- 428,432 ---- theData += '__AJAXSCOPE=' + ajaxScopeID + '&'; ! if (typeof(additionalData) != "undefined" && additionalData != "") theData += additionalData + "&"; *************** *** 548,551 **** --- 548,554 ---- } + if (waitElement) + waitElement.style.visibility = 'hidden'; + // Checking if the data were fully loaded, without being aborted var flag = "'AJAX_LOADING_OK';"; *************** *** 555,561 **** eval(responseText); - if (waitElement) - waitElement.style.visibility = 'hidden'; - return true; } --- 558,561 ---- *************** *** 974,996 **** } function CreateWaitElement() { ! var elem = document.getElementById('__AjaxCall_Wait'); ! if (!elem) { ! elem = document.createElement("div"); ! elem.id = '__AjaxCall_Wait'; ! elem.style.position = 'absolute'; ! elem.style.height = 17; ! elem.border = "1px"; ! elem.style.paddingLeft = "3px"; ! elem.style.paddingRight = "3px"; ! elem.style.fontSize = "11px"; ! elem.style.borderColor = "#ffffff"; ! elem.style.borderSize = "1px"; ! elem.style.backgroundColor = "DimGray"; ! elem.style.color = "#ffffff"; ! elem.innerHTML = 'Loading ...'; ! elem.style.visibility = 'hidden'; ! document.body.insertBefore(elem, document.body.firstChild); ! } ! waitElement = elem; } // end wait element \ No newline at end of file --- 974,995 ---- } function CreateWaitElement() { ! var elem = document.getElementById('__AjaxCall_Wait'); ! if (!elem) { ! elem = document.createElement("div"); ! elem.id = '__AjaxCall_Wait'; ! elem.style.position = 'absolute'; ! elem.style.height = 17; ! elem.style.paddingLeft = "3px"; ! elem.style.paddingRight = "3px"; ! elem.style.fontSize = "11px"; ! elem.style.fontFamily = 'Arial, Verdana, Tahoma'; ! elem.style.border = "#000000 1px solid"; ! elem.style.backgroundColor = "DimGray"; ! elem.style.color = "#ffffff"; ! elem.innerHTML = 'Loading ...'; ! elem.style.visibility = 'hidden'; ! document.body.insertBefore(elem, document.body.firstChild); ! } ! waitElement = elem; } // end wait element \ No newline at end of file |