Author: chanaka Date: Mon Aug 11 01:54:33 2008 New Revision: 20649 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20649
Log: Firefox 3 UI Fixes Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/commons.js branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/esbregistry.js branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/proxyservices.js branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/root.js branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/statistics.js branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/system.js branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/xmlTree.js Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/commons.js URL: http://wso2.org/svn/browse/wso2/branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/commons.js?rev=20649&r1=20648&r2=20649&view=diff ============================================================================== --- branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/commons.js (original) +++ branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/commons.js Mon Aug 11 01:54:33 2008 @@ -166,7 +166,17 @@ return -1; } else { var namewonsprefix = namewithnsprefix.substring(namewithnsprefix.indexOf(":", 0) + 1, namewithnsprefix.length); - return doc.getElementsByTagName(namewonsprefix)[0]; + try{ + return doc.documentElement; + } catch(e){ + console.info("Error with documentElement",e); + } + try{ + return doc.getElementsByTagName(namewonsprefix)[0]; + } catch(e){ + console.info("Error with getElementsByTagName",e); + } + } } } @@ -407,3 +417,12 @@ } return true; } +function getFFVersion(){ + var versionData = navigator.userAgent || navigator.appVersion; + + var index = versionData.indexOf("Firefox"); + var ffVersion = 0; + if (index == -1) ffVersion = 0; + ffVersion = parseFloat(versionData.substring(index+"Firefox".length+1)); + return ffVersion; +} Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/esbregistry.js URL: http://wso2.org/svn/browse/wso2/branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/esbregistry.js?rev=20649&r1=20648&r2=20649&view=diff ============================================================================== --- branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/esbregistry.js (original) +++ branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/esbregistry.js Mon Aug 11 01:54:33 2008 @@ -66,7 +66,17 @@ var body; if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + try { + body = xhReq.responseXML.getElementsByTagName("Body")[0]; + }catch(e) { + //console.info(e); + } + try { + body = xhReq.responseXML.documentElement.childNodes[1]; + }catch(e) { + //console.info(e); + } + } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } @@ -342,7 +352,7 @@ var body; if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + body = xhReq.responseXML.documentElement.childNodes[1]; } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } @@ -471,7 +481,7 @@ var body; if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + body = xhReq.responseXML.documentElement.childNodes[1]; } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } @@ -510,7 +520,7 @@ var body; if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + body = xhReq.responseXML.documentElement.childNodes[1]; } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } @@ -645,7 +655,7 @@ var body; if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + body = xhReq.responseXML.documentElement.childNodes[1]; } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } @@ -800,12 +810,14 @@ } var body; + if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + + body = xhReq.responseXML.documentElement.childNodes[1]; } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } - + var registryNameTag = body.getElementsByTagName("return")[0]; var registryName; @@ -831,11 +843,11 @@ var body; if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + body = xhReq.responseXML.documentElement.childNodes[1]; } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } - + var registryNameTag = body.getElementsByTagName("return")[0]; var registryName; Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/proxyservices.js URL: http://wso2.org/svn/browse/wso2/branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/proxyservices.js?rev=20649&r1=20648&r2=20649&view=diff ============================================================================== --- branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/proxyservices.js (original) +++ branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/proxyservices.js Mon Aug 11 01:54:33 2008 @@ -160,8 +160,9 @@ ' </ns1:getProxyServiceElement>\n'; var callURL = serverURL + "/" + PROXY_ADMIN + "/" ; - + send("getProxyServiceElement", body_xml, "", callURL, "", false, viewproxyservicecallback); + } function viewproxyservicecallback() { @@ -278,7 +279,6 @@ internalmodel.rolebackproxyname = ""; internalmodel.proxy = createesbelement( "<syn:proxy xmlns:syn='http://ws.apache.org/ns/synapse' int_op='add'/>"); - var proxydiv = document.getElementById("divProxyService"); proxydiv.innerHTML = ""; Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/root.js URL: http://wso2.org/svn/browse/wso2/branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/root.js?rev=20649&r1=20648&r2=20649&view=diff ============================================================================== --- branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/root.js (original) +++ branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/root.js Mon Aug 11 01:54:33 2008 @@ -344,7 +344,17 @@ var body; if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { - body = xhReq.responseXML.getElementsByTagName("Body")[0]; + try { + body = xhReq.responseXML.getElementsByTagName("Body")[0]; + }catch(e) { + //console.info(e); + } + try { + body = xhReq.responseXML.documentElement.childNodes[1]; + }catch(e) { + //console.info(e); + } + } else { body = xhReq.responseXML.getElementsByTagName("soapenv:Body")[0]; } Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/statistics.js URL: http://wso2.org/svn/browse/wso2/branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/statistics.js?rev=20649&r1=20648&r2=20649&view=diff ============================================================================== --- branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/statistics.js (original) +++ branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/statistics.js Mon Aug 11 01:54:33 2008 @@ -36,8 +36,8 @@ var shouldRefesh = 0; function draw(xTicks, dataset) { - var hexColor = MochiKit.Color.Color.fromHexString; - var options = { + var hexColor = MochiKit.Color.Color.fromHexString; + var options = { "IECanvasHTC": "/plotkit/iecanvas.htc", "axisLabelColor": hexColor("#666666"), "backgroundColor":hexColor("#f5f5f5"), @@ -99,10 +99,12 @@ var seqStr ; try { if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) { + serverStr = data.getElementsByTagName("serverData")[0].textContent; psStr = data.getElementsByTagName("proxyServiceData")[0].textContent; epStr = data.getElementsByTagName("endPointData")[0].textContent; seqStr = data.getElementsByTagName("sequenceData")[0].textContent; + } else if (browsername.indexOf(IE_BROWSER_NAME) != -1) { serverStr = data.getElementsByTagName("serverData")[0].text; @@ -230,9 +232,20 @@ if (!onError()) { return; } - var data = getBody(xhReq.responseXML); + //*** Hacking code place to fix FF3 issues ***// + + var xsltFile = "statistics/list_servers.xsl"; var objDiv = document.getElementById("divStatistics"); - callbackhelper("statistics/list_servers.xsl", objDiv); + + + var data = getBody(xhReq.responseXML); + data = getRightData(data); + + processXML(data, xsltFile, objDiv); + showOnlyOneMain(objDiv); + + //** Hacking code ends **// + shouldRefesh = 1; showOnlyOneMain(objDiv, false); } @@ -246,9 +259,17 @@ if (!onError()) { return; } - var data = getBody(xhReq.responseXML); + //*** Hacking code place to fix FF3 issues ***// + var xsltFile = "statistics/list_epr.xsl"; var objDiv = document.getElementById("divStatistics"); - callbackhelper("statistics/list_epr.xsl", objDiv); + var data = getBody(xhReq.responseXML); + data = getRightData(data); + + processXML(data, xsltFile, objDiv); + showOnlyOneMain(objDiv); + + //** Hacking code ends **// + shouldRefesh = 1; showOnlyOneMain(objDiv, false); } @@ -262,11 +283,20 @@ if (!onError()) { return; } - var data = getBody(xhReq.responseXML); + //*** Hacking code place to fix FF3 issues ***// + var xsltFile = "statistics/list_seq.xsl"; var objDiv = document.getElementById("divStatistics"); - callbackhelper("statistics/list_seq.xsl", objDiv); + var data = getBody(xhReq.responseXML); + data = getRightData(data); + + processXML(data, xsltFile, objDiv); + showOnlyOneMain(objDiv); + + //** Hacking code ends **// + shouldRefesh = 1; showOnlyOneMain(objDiv, false); + } @@ -287,9 +317,19 @@ if (!onError()) { return; } - var data = getBody(xhReq.responseXML); + + + //*** Hacking code place to fix FF3 issues ***// + var objDiv = document.getElementById("divStatistics"); - callbackhelper(xslFilepath, objDiv); + var data = getBody(xhReq.responseXML); + data = getRightData(data); + + processXML(data, xslFilepath, objDiv); + showOnlyOneMain(objDiv); + + //** Hacking code ends **// + shouldRefesh = 1; showOnlyOneMain(objDiv, false); } @@ -304,11 +344,20 @@ if (!onError()) { return; } - var data = getBody(xhReq.responseXML); + //*** Hacking code place to fix FF3 issues ***// + var xsltFile = "statistics/list_service_type.xsl"; var objDiv = document.getElementById("divStatistics"); - callbackhelper("statistics/list_service_type.xsl", objDiv); + var data = getBody(xhReq.responseXML); + data = getRightData(data); + + processXML(data, xsltFile, objDiv); + showOnlyOneMain(objDiv); + + //** Hacking code ends **// + shouldRefesh = 1; showOnlyOneMain(objDiv, false); + } function veiwServersStatatistics() { var body_xml = '<ns1:getServerStatisticsesRequest xmlns:ns1="http://org.apache.synapse/xsd";>' + @@ -321,11 +370,20 @@ if (!onError()) { return; } - var data = getBody(xhReq.responseXML); + //*** Hacking code place to fix FF3 issues ***// + var xsltFile = "statistics/serverstatistics.xsl"; var objDiv = document.getElementById("divStatistics"); - callbackhelper("statistics/serverstatistics.xsl", objDiv); + var data = getBody(xhReq.responseXML); + data = getRightData(data); + + processXML(data, xsltFile, objDiv); + showOnlyOneMain(objDiv); + + //** Hacking code ends **// + shouldRefesh = 1; showOnlyOneMain(objDiv, false); + } function clearAllStatistics() { var body_xml = '<ns1:clearAllStatisticsRequest xmlns:ns1="http://org.apache.synapse/xsd";>' + @@ -338,7 +396,7 @@ return; } var data = getBody(xhReq.responseXML); - showStatistics() ; + showStatistics(); } function getServiceSumary(txProtocolName, serverID) { @@ -385,4 +443,23 @@ } - +function getRightData(data) { + var browser_version; + var browser; + if (/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent)) { //test for Firefox/x.x or Firefox x.x (ignoring remaining digits); + var ffversion = new Number(RegExp.$1) // capture x.x portion and store as a number + browser = "FF"; + if (ffversion >= 3) + browser_version = 3; + else if (ffversion >= 2) + browser_version = 2; + else if (ffversion >= 1) + browser_version = 1; + } + else + browser = "IE"; + + + if (browser == "FF" && browser_version == 3 || browser == "IE") data = data.childNodes[0]; + return data; +} \ No newline at end of file Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/system.js URL: http://wso2.org/svn/browse/wso2/branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/system.js?rev=20649&r1=20648&r2=20649&view=diff ============================================================================== --- branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/system.js (original) +++ branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/system.js Mon Aug 11 01:54:33 2008 @@ -64,7 +64,7 @@ return false; } send("getStatus", body_xml, "", callURL, "", false, showHomeCallback); - document.getElementById('content').style.display='block'; + document.getElementById('content').style.display = 'block'; } function showHomeCallback() { @@ -79,11 +79,49 @@ function manageSystem() { var xsltFileName = "system_info.xsl"; - var body_xml = ' <ns1:getServerData xmlns:ns1="http://org.apache.synapse/xsd"/>\n'; - var callURL = serverURL + "/" + SERVER_ADMIN_STRING ; - send("getServerData", body_xml, xsltFileName, callURL, document.getElementById("divManageSystem"), false); + var body_xml = '<ns1:getServerData xmlns:ns1="http://org.apache.synapse/xsd"/>\n'; + var callURL = serverURL + "/" + SERVER_ADMIN_STRING ; //document.getElementById("divManageSystem") + send("getServerData", body_xml, "", callURL, "", false, manageSystemCallback); } +function manageSystemCallback() { + //stopWaitAnimation(); + if (!onError()) { + return; + } + // hack to double click on the home to come (showDivHome = true;) ruwan + showDivHome = false; + //*** Hacking code place to fix FF3 issues ***// + //Detect the Firefox version + var browser_version; + var browser; + if (/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent)) { //test for Firefox/x.x or Firefox x.x (ignoring remaining digits); + var ffversion = new Number(RegExp.$1) // capture x.x portion and store as a number + browser = "FF"; + if (ffversion >= 3) + browser_version = 3; + else if (ffversion >= 2) + browser_version = 2; + else if (ffversion >= 1) + browser_version = 1; + } + else + browser = "IE"; + + var xsltFile = "system_info.xsl"; + var objDiv = document.getElementById("divManageSystem"); + var data = getBody(xhReq.responseXML); + + + if (browser == "FF" && browser_version == 3 || browser == "IE") data = data.childNodes[0]; + //alert(data.childNodes[0].nodeName); + processXML(data, xsltFile, objDiv); + showOnlyOneMain(objDiv); + + //** Hacking code ends **// + + //callbackhelper("system_info.xsl", document.getElementById("divManageSystem")); +} function stoppingRefreshingMethodsHook() { // initializing the showDiv variable clearInterval(showHomeInterval); Modified: branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/xmlTree.js URL: http://wso2.org/svn/browse/wso2/branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/xmlTree.js?rev=20649&r1=20648&r2=20649&view=diff ============================================================================== --- branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/xmlTree.js (original) +++ branches/esb/java/1.7.1/modules/distribution/src/main/www/extensions/core/js/xmlTree.js Mon Aug 11 01:54:33 2008 @@ -27,18 +27,25 @@ closedImg.src = "extensions/core/images/tree_closed.gif"; var finallyUsedDiv; - +var calledTime = 0; function showTreeBranch(objMainDiv, objImg, txProtocolName, serverID) { - if (objMainDiv == null && objImg == null && txProtocolName == null) { + calledTime++; + if (calledTime==6) { // this is used as the callback if (!onError()) { return; } //custom transformation - treeBranchTransformer("statistics/statistics.xsl", finallyUsedDiv); + var xsltFile = "statistics/statistics.xsl"; + + var data = getBody(xhReq.responseXML); + data = getRightData(data); + processXML(data, xsltFile, finallyUsedDiv); + calledTime = 0; return true; + } // create new div obj swapFolder(objImg, objMainDiv, txProtocolName, serverID); @@ -46,16 +53,21 @@ } function showTreeBranchForSynapseService(objMainDiv, objImg, txProtocolName, serverID) { - if (objMainDiv == null && objImg == null && txProtocolName == null) { + calledTime++; + if (calledTime==6) { // this is used as the callback if (!onError()) { return; } //custom transformation - treeBranchTransformer("statistics/statistics.xsl", finallyUsedDiv); + var xsltFile = "statistics/statistics.xsl"; - return true; + var data = getBody(xhReq.responseXML); + data = getRightData(data); + processXML(data, xsltFile, finallyUsedDiv); + calledTime = 0; + return true; } // create new div obj swapFolder(objImg, objMainDiv, txProtocolName, serverID); @@ -64,14 +76,19 @@ function showServerTree(objMainDiv, objImg, serverID) { - if (objMainDiv == null && objImg == null) { + calledTime++; + if (calledTime == 6) { // this is used as the callback if (!onError()) { return; } //custom transformation - treeBranchTransformer("statistics/serverstatistics.xsl", finallyUsedDiv); + var xsltFile = "statistics/serverstatistics.xsl"; + var data = getBody(xhReq.responseXML); + data = getRightData(data); + processXML(data, xsltFile, finallyUsedDiv); + calledTime = 0; return true; } @@ -80,31 +97,42 @@ } function swapServer(objImg, objMainDiv, serverID) { - if (objImg.src.indexOf('tree_closed.gif') > -1) { - objImg.src = openImg.src; - var newObjDiv = document.createElement('div'); - finallyUsedDiv = newObjDiv; - objMainDiv.appendChild(newObjDiv); - showServersInTree(serverID); - } - else { - objImg.src = closedImg.src; + if (objImg != null) { + var imgArr = objImg.src.split("/"); + var imgName = imgArr[imgArr.length - 1]; + + if (imgName == 'tree_closed.gif') { + objImg.src = openImg.src; + var newObjDiv = document.createElement('div'); + finallyUsedDiv = newObjDiv; + objMainDiv.appendChild(newObjDiv); + showServersInTree(serverID); + + } + else { + objImg.src = closedImg.src; //removed the - var genObjDiv = objMainDiv.getElementsByTagName('div')[0]; - objMainDiv.removeChild(genObjDiv); + var genObjDiv = objMainDiv.getElementsByTagName('div')[0]; + objMainDiv.removeChild(genObjDiv); + } } shouldRefesh = 1; } function showTree(objMainDiv, objImg, txProtocolName, serverID, type) { - if (objMainDiv == null && objImg == null && txProtocolName == null) { + calledTime++; + if (calledTime == 6) { // this is used as the callback if (!onError()) { return; } //custom transformation - treeBranchTransformer("statistics/commonstatistics.xsl", finallyUsedDiv); + var xsltFile = "statistics/commonstatistics.xsl"; + var data = getBody(xhReq.responseXML); + data = getRightData(data); + processXML(data, xsltFile, finallyUsedDiv); + calledTime = 0; return true; } @@ -113,38 +141,48 @@ } function swap(objImg, objMainDiv, txProtocolName, serverID, type) { - if (objImg.src.indexOf('tree_closed.gif') > -1) { - objImg.src = openImg.src; - var newObjDiv = document.createElement('div'); - finallyUsedDiv = newObjDiv; - objMainDiv.appendChild(newObjDiv); - showStatisticsIntree(txProtocolName, type); + if (objImg != null) { + var imgArr = objImg.src.split("/"); + var imgName = imgArr[imgArr.length - 1]; + + if (imgName == 'tree_closed.gif') { + objImg.src = openImg.src; + var newObjDiv = document.createElement('div'); + finallyUsedDiv = newObjDiv; + objMainDiv.appendChild(newObjDiv); + showStatisticsIntree(txProtocolName, type); - } - else { - objImg.src = closedImg.src; + } + else { + objImg.src = closedImg.src; //removed the - var genObjDiv = objMainDiv.getElementsByTagName('div')[0]; - objMainDiv.removeChild(genObjDiv); + var genObjDiv = objMainDiv.getElementsByTagName('div')[0]; + objMainDiv.removeChild(genObjDiv); + } } shouldRefesh = 1; } function swapFolder(objImg, objMainDiv, txProtocolName, serverID) { - if (objImg.src.indexOf('tree_closed.gif') > -1) { + if (objImg != null) { + var imgArr = objImg.src.split("/"); + var imgName = imgArr[imgArr.length - 1]; + + if (imgName == 'tree_closed.gif') { + + objImg.src = openImg.src; + var newObjDiv = document.createElement('div'); + finallyUsedDiv = newObjDiv; + objMainDiv.appendChild(newObjDiv); + getServiceSumary(txProtocolName, serverID); - objImg.src = openImg.src; - var newObjDiv = document.createElement('div'); - finallyUsedDiv = newObjDiv; - objMainDiv.appendChild(newObjDiv); - getServiceSumary(txProtocolName, serverID); - - } - else { - objImg.src = closedImg.src; + } + else { + objImg.src = closedImg.src; //removed the - var genObjDiv = objMainDiv.getElementsByTagName('div')[0]; - objMainDiv.removeChild(genObjDiv); + var genObjDiv = objMainDiv.getElementsByTagName('div')[0]; + objMainDiv.removeChild(genObjDiv); + } } shouldRefesh = 1; } _______________________________________________ Esb-java-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
