We may have to look through are js files too, They also may be using WSRequest util to detect the browser and according to Jonathans comments this will not work.
Thanks, Keith. [EMAIL PROTECTED] wrote: > Author: jonathan > Date: Tue Jul 8 13:05:53 2008 > New Revision: 18997 > URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18997 > > Log: > MASHUP-878 fix. Firefox 3 getElementsByTagName now behaves more like IE, in > that it requires a namespace prefix ("ns:return") instead of just a local > name ("return"). Unfortunately browser detection can't distinguish FF2 and > FF3, so the code now dyamically checks whether "ns:return" works and if not > it falls back to "return". > > Modified: > trunk/mashup/java/modules/www/editor.jsp > trunk/mashup/java/modules/www/js/mashup-main.js > trunk/mashup/java/modules/www/js/mashup-utils.js > trunk/mashup/java/modules/www/mashup.jsp > trunk/mashup/java/modules/www/search.jsp > trunk/mashup/java/modules/www/stub_gen.jsp > trunk/mashup/java/modules/www/taskbar.jsp > trunk/mashup/java/modules/www/user.jsp > > Modified: trunk/mashup/java/modules/www/editor.jsp > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/editor.jsp?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/editor.jsp (original) > +++ trunk/mashup/java/modules/www/editor.jsp Tue Jul 8 13:05:53 2008 > @@ -162,17 +162,15 @@ > var lblInfo = document.getElementById(params[0]); > var isRedirect = params[1]; > > - var saveSuccess; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - saveSuccess = > - > this.req.responseXML.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > - } else { > - saveSuccess = > - > this.req.responseXML.getElementsByTagName("return")[0].firstChild.nodeValue; > - } > + var response = returnElement.firstChild.nodeValue; > > + var saveSuccess = response; > > var currentTime = new Date(); > var hours = currentTime.getHours(); > > Modified: trunk/mashup/java/modules/www/js/mashup-main.js > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/js/mashup-main.js?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/js/mashup-main.js (original) > +++ trunk/mashup/java/modules/www/js/mashup-main.js Tue Jul 8 13:05:53 2008 > @@ -220,14 +220,13 @@ > */ > populateServiceEditor : function() { > > - var serviceData; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - serviceData = > this.req.responseXML.getElementsByTagName("ns:return")[0]; > - } else { > - serviceData = > this.req.responseXML.getElementsByTagName("return")[0]; > - } > + var serviceData = returnElement; > > WSO2.MashupUtils.showServiceEditor(serviceData); > }, > > Modified: trunk/mashup/java/modules/www/js/mashup-utils.js > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/js/mashup-utils.js?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/js/mashup-utils.js (original) > +++ trunk/mashup/java/modules/www/js/mashup-utils.js Tue Jul 8 13:05:53 2008 > @@ -66,15 +66,16 @@ > */ > WSO2.MashupUtils.generateMashupFromXml = function(xmlDataContent) { > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - var mashupId = > xmlDataContent.getElementsByTagName("ns:serviceId")[0].firstChild.nodeValue; > - var mashupTitle = > xmlDataContent.getElementsByTagName("ns:name")[0].firstChild.nodeValue; > - var mashupDesc = > xmlDataContent.getElementsByTagName("ns:description")[0].firstChild.nodeValue; > - var mashupEprs = xmlDataContent.getElementsByTagName("ns:eprs"); > - var mashupOperartions = > xmlDataContent.getElementsByTagName("ns:operations"); > - var mashupStatus = > xmlDataContent.getElementsByTagName("ns:active")[0].firstChild.nodeValue; > - var mashupServiceType = > xmlDataContent.getElementsByTagName("ns:serviceType")[0].firstChild.nodeValue; > + var mashupId, mashupTitle, mashupDesc, mashupEprs, mashupOperartions, > mashupStatus, mashupServiceType; > + > + if (xmlDataContent.getElementsByTagName("ns:serviceId").length > 0) { > + mashupId = > xmlDataContent.getElementsByTagName("ns:serviceId")[0].firstChild.nodeValue; > + mashupTitle = > xmlDataContent.getElementsByTagName("ns:name")[0].firstChild.nodeValue; > + mashupDesc = > xmlDataContent.getElementsByTagName("ns:description")[0].firstChild.nodeValue; > + mashupEprs = xmlDataContent.getElementsByTagName("ns:eprs"); > + mashupOperartions = > xmlDataContent.getElementsByTagName("ns:operations"); > + mashupStatus = > xmlDataContent.getElementsByTagName("ns:active")[0].firstChild.nodeValue; > + mashupServiceType = > xmlDataContent.getElementsByTagName("ns:serviceType")[0].firstChild.nodeValue; > } else { > mashupId = > xmlDataContent.getElementsByTagName("serviceId")[0].firstChild.nodeValue; > mashupTitle = > xmlDataContent.getElementsByTagName("name")[0].firstChild.nodeValue; > @@ -82,11 +83,9 @@ > mashupEprs = xmlDataContent.getElementsByTagName("eprs"); > mashupOperartions = > xmlDataContent.getElementsByTagName("operations"); > mashupStatus = > xmlDataContent.getElementsByTagName("active")[0].firstChild.nodeValue; > - mashupServiceType = > - > xmlDataContent.getElementsByTagName("serviceType")[0].firstChild.nodeValue; > + mashupServiceType = > xmlDataContent.getElementsByTagName("serviceType")[0].firstChild.nodeValue; > } > > - > return new wso2.mashup.Mashup(mashupId, mashupTitle, mashupDesc, > mashupEprs, mashupOperartions, mashupStatus, mashupServiceType); > }; > > @@ -218,16 +217,13 @@ > destUsername, destPassword, > overwriteExisting, migrateTags) { > function submitServiceCallback() { > > - var response ; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - response = > - > this.req.responseXML.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > - } else { > - response = > - > this.req.responseXML.getElementsByTagName("return")[0].firstChild.nodeValue; > - } > + var response = returnElement.firstChild.nodeValue; > > // If share succeeds, close initiation dialog and show one with > links to target and a close option. > if (response == "true") { > @@ -431,16 +427,14 @@ > WSO2.MashupUtils.makeServiceNameValidationRequest = function(userName) { > > function submitServiceCallback() { > - var response ; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - response = > - > this.req.responseXML.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > - } else { > - response = > - > this.req.responseXML.getElementsByTagName("return")[0].firstChild.nodeValue; > - } > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > + > + var response = returnElement.firstChild.nodeValue; > > if (response == "OK") { > //Redirecting to the actual editor > > Modified: trunk/mashup/java/modules/www/mashup.jsp > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/mashup.jsp?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/mashup.jsp (original) > +++ trunk/mashup/java/modules/www/mashup.jsp Tue Jul 8 13:05:53 2008 > @@ -119,15 +119,13 @@ > } > > function editServiceDocumentationCallback() { > - var response; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - response = > - > this.req.responseXML.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > - } else { > - response = > this.req.responseXML.getElementsByTagName("return")[0].firstChild.nodeValue; > - } > + var response = returnElement.firstChild.nodeValue; > > if (response == "true") { > document.getElementById(this.params[1] + "_value").innerHTML = > this.params[0]; > @@ -281,15 +279,13 @@ > } > > function enableTransportCallback(){ > - var response; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - response = > - > this.req.responseXML.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > - } else { > - response = > this.req.responseXML.getElementsByTagName("return")[0].firstChild.nodeValue; > - } > + var response = returnElement.firstChild.nodeValue; > > if (response == "true") { > var element = document.getElementById(this.params[0]); > @@ -310,15 +306,13 @@ > } > > function disableTransportCallback(){ > - var response; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - response = > - > this.req.responseXML.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > - } else { > - response = > this.req.responseXML.getElementsByTagName("return")[0].firstChild.nodeValue; > - } > + var response = returnElement.firstChild.nodeValue; > > if (response == "true") { > var element = document.getElementById(this.params[0]); > > Modified: trunk/mashup/java/modules/www/search.jsp > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/search.jsp?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/search.jsp (original) > +++ trunk/mashup/java/modules/www/search.jsp Tue Jul 8 13:05:53 2008 > @@ -478,18 +478,16 @@ > } > > function getUserNamesCallback() { > - var xmlBodyContent; > var userNameElement = 4; > var fullNameElement = 0; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - xmlBodyContent = > - this.req.responseXML.getElementsByTagName("ns:return")[0]; > - } else { > - xmlBodyContent = > - this.req.responseXML.getElementsByTagName("return")[0]; > - } > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > + > + var xmlBodyContent = returnElement; > > var nameList = document.getElementById(autoSuggestField + > "-nameList"); > nameList.innerHTML = ""; > > Modified: trunk/mashup/java/modules/www/stub_gen.jsp > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/stub_gen.jsp?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/stub_gen.jsp (original) > +++ trunk/mashup/java/modules/www/stub_gen.jsp Tue Jul 8 13:05:53 2008 > @@ -69,14 +69,20 @@ > }; > > function handleSuccess(o) { > + var returnElementList = > o.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > o.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > + > + var response = returnElement.firstChild; > + > var browser = WSRequest.util._getBrowser(); > > if (browser == "ie" || browser == "ie7") { > - document.getElementById("js-stub").value = > - > o.responseXML.documentElement.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > + document.getElementById("js-stub").value = > response.nodeValue; > } else { > - document.getElementById("js-stub").value = > - o.responseXML.documentElement.firstChild.textContent; > + document.getElementById("js-stub").value = > response.textContent; > } > > } > > Modified: trunk/mashup/java/modules/www/taskbar.jsp > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/taskbar.jsp?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/taskbar.jsp (original) > +++ trunk/mashup/java/modules/www/taskbar.jsp Tue Jul 8 13:05:53 2008 > @@ -87,16 +87,13 @@ > } > > function redeployServiceCallback() { > - var response ; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - response = > - > this.req.responseXML.getElementsByTagName("ns:return")[0].firstChild.nodeValue; > - } else { > - response = > - > this.req.responseXML.getElementsByTagName("return")[0].firstChild.nodeValue; > - } > + var response = returnElement.firstChild.nodeValue; > > if (response == "true") { > alert("Successfully redeployed the service"); > @@ -151,16 +148,13 @@ > } > > function listServiceDataCallback() { > - var xmlBodyContent; > + var returnElementList = > this.req.responseXML.getElementsByTagName("ns:return"); > + // Older browsers might not recognize namespaces (e.g. FF2) > + if (returnElementList.length == 0) > + returnElementList = > this.req.responseXML.getElementsByTagName("return"); > + var returnElement = returnElementList[0]; > > - var browser = WSRequest.util._getBrowser(); > - if (browser == "ie" || browser == "ie7") { > - xmlBodyContent = > - this.req.responseXML.getElementsByTagName("ns:return")[0]; > - } else { > - xmlBodyContent = > - this.req.responseXML.getElementsByTagName("return")[0]; > - } > + var xmlBodyContent = returnElement; > > var serviceMashupObject = > WSO2.MashupUtils.generateMashupFromXml(xmlBodyContent); > > > Modified: trunk/mashup/java/modules/www/user.jsp > URL: > http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/user.jsp?rev=18997&r1=18996&r2=18997&view=diff > ============================================================================== > --- trunk/mashup/java/modules/www/user.jsp (original) > +++ trunk/mashup/java/modules/www/user.jsp Tue Jul 8 13:05:53 2008 > @@ -467,17 +467,5 @@ > <%@ include file="footer.jsp" %> > </div> > </div> > -<!-- the div for the message box. This name is not supposed to be used for > any other div in the admin application--> > -<div id="alertMessageBox" style="display:none;position:absolute;z-index: > 600;"> > - <!--the message area--> > - <p id="alertMessageBoxMessageArea"></p> > - <!-- the button area--> > - <p id="alertButton" align="right"> > - <input id="alertBoxButton" type="button" > - value=" OK " > - > onclick="document.getElementById('alertMessageBox').style.display='none';return > false;"/> > - </p> > -</div> > -<!-- end of the message box div --> > </body> > </html> > > _______________________________________________ > Mashup-dev mailing list > [email protected] > http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev > _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
