details: https://code.openbravo.com/erp/devel/pi/rev/73891434fc3c changeset: 18605:73891434fc3c user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Nov 22 19:45:08 2012 +0100 summary: Related to issue 22371: Reverted previous push since it didn't fix completly the issue
details: https://code.openbravo.com/erp/devel/pi/rev/c151e43463cd changeset: 18606:c151e43463cd user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Nov 22 19:48:20 2012 +0100 summary: Fixed issue 22371: Now OB renders ok in Firefox 17 diffstat: modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 68 +--------- 3 files changed, 9 insertions(+), 71 deletions(-) diffs (111 lines): diff -r d0f351ffdbfb -r c151e43463cd modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js --- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js Fri Nov 16 13:20:03 2012 +0100 +++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js Thu Nov 22 19:48:20 2012 +0100 @@ -18,9 +18,11 @@ return v.present=="true"||v.present.charAt(0)=="$"};isc.getOptionalModule=function(_1){return isc.$b[_1]};isc.$d=window.isc_useSimpleNames;if(isc.$d==null)isc.$d=true;if(window.OpenAjax){isc.$e=isc.versionNumber.replace(/[a-zA-Z_]+/,".0");OpenAjax.registerLibrary("SmartClient","http://smartclient.com/SmartClient",isc.$e,{namespacedMode:!isc.$d,iscVersion:isc.version,buildDate:isc.buildDate,licenseType:isc.licenseType,licenseCompany:isc.licenseCompany,licenseSerialNumber:isc.licenseSerialNumber});OpenAjax.registerGlobals("SmartClient",["isc"])} isc.$f=window.isc_useLongDOMIDs;isc.$g="isc.";isc.addGlobal=function(_1,_2){if(_1.indexOf(isc.$g)==0)_1=_1.substring(4);isc[_1]=_2;if(isc.$d)window[_1]=_2} isc.onLine=true;isc.isOffline=function(){return!isc.onLine};isc.goOffline=function(){isc.onLine=false};isc.goOnline=function(){isc.onLine=true};if(window.addEventListener){window.addEventListener("online",isc.goOnline,false);window.addEventListener("offline",isc.goOffline,false)} -isc.addGlobal("Browser",{isSupported:false});isc.Browser.isOpera=(navigator.appName=="Opera"||navigator.userAgent.indexOf("Opera")!=-1);isc.Browser.isNS=(navigator.appName=="Netscape"&&!isc.Browser.isOpera);isc.Browser.isIE=(navigator.appName=="Microsoft Internet Explorer"&&!isc.Browser.isOpera);isc.Browser.isMSN=(isc.Browser.isIE&&navigator.userAgent.indexOf("MSN")!=-1);isc.Browser.minorVersion=parseFloat(isc.Browser.isIE?navigator.appVersion.substring(navigator.appVersion.indexOf("MSIE")+5):navigator.appVersion);isc.Browser.version=parseInt(isc.Browser.minorVersion);isc.Browser.isIE6=isc.Browser.isIE&&isc.Browser.version<=6;isc.Browser.isMoz=(navigator.userAgent.indexOf("Gecko")!=-1)&&(navigator.userAgent.indexOf("Safari")==-1)&&(navigator.userAgent.indexOf("AppleWebKit")==-1);isc.Browser.isCamino=(isc.Browser.isMoz&&navigator.userAgent.indexOf("Camino/")!=-1);if(isc.Browser.isCamino){isc.Browser.caminoVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Camino/")+7)} +isc.addGlobal("Browser",{isSupported:false});isc.Browser.isOpera=(navigator.appName=="Opera"||navigator.userAgent.indexOf("Opera")!=-1);isc.Browser.isNS=(navigator.appName=="Netscape"&&!isc.Browser.isOpera);isc.Browser.isIE=(navigator.appName=="Microsoft Internet Explorer"&&!isc.Browser.isOpera);isc.Browser.isMSN=(isc.Browser.isIE&&navigator.userAgent.indexOf("MSN")!=-1);isc.Browser.minorVersion=parseFloat(isc.Browser.isIE?navigator.appVersion.substring(navigator.appVersion.indexOf("MSIE")+5):navigator.appVersion); +if(!isc.Browser.isIE)(function(){var needle,pos;if(navigator.appVersion){needle="Version/";pos=navigator.appVersion.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(navigator.appVersion.substring(pos+needle.length));return;}}var ua=navigator.userAgent;needle="Chrome/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}needle="Camino/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}needle="Firefox/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}if(ua.indexOf("Opera/")>=0){needle="Version/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}else{needle="Opera/";pos=ua.indexOf(needle);isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}}})(); +isc.Browser.version=parseInt(isc.Browser.minorVersion);isc.Browser.isIE6=isc.Browser.isIE&&isc.Browser.version<=6;isc.Browser.isMoz=(navigator.userAgent.indexOf("Gecko")!=-1)&&(navigator.userAgent.indexOf("Safari")==-1)&&(navigator.userAgent.indexOf("AppleWebKit")==-1);isc.Browser.isCamino=(isc.Browser.isMoz&&navigator.userAgent.indexOf("Camino/")!=-1);if(isc.Browser.isCamino){isc.Browser.caminoVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Camino/")+7)} isc.Browser.isFirefox=(isc.Browser.isMoz&&navigator.userAgent.indexOf("Firefox/")!=-1);if(isc.Browser.isFirefox){isc.Browser.firefoxVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Firefox/")+8)} -if(isc.Browser.isMoz){isc.Browser.$h=navigator.userAgent.indexOf("Gecko/")+6;isc.Browser.geckoVersion=parseInt(navigator.userAgent.substring(isc.Browser.$h,isc.Browser.$h+8));if(isc.Browser.isFirefox){if(isc.Browser.firefoxVersion.match(/^1\.0/))isc.Browser.geckoVersion=20050915;else if(isc.Browser.firefoxVersion.match(/^2\.0/))isc.Browser.geckoVersion=20071108}} +if(isc.Browser.isMoz){isc.Browser.$h=navigator.userAgent.indexOf("Gecko/")+6;isc.Browser.geckoVersion=parseInt(navigator.userAgent.substring(isc.Browser.$h,isc.Browser.$h+8));if(isc.Browser.isFirefox){if(isc.Browser.firefoxVersion.match(/^1\.0/))isc.Browser.geckoVersion=20050915;else if(isc.Browser.firefoxVersion.match(/^2\.0/))isc.Browser.geckoVersion=20071108}if(isc.Browser.version>=17)isc.Browser.geckoVersion=20121121;} isc.Browser.isStrict=document.compatMode=="CSS1Compat";if(isc.Browser.isStrict&&isc.Browser.isMoz){isc.Browser.$i=document.doctype.publicId;isc.Browser.$j=document.doctype.systemId} isc.Browser.isTransitional=/.*(Transitional|Frameset)/.test((document.all&&document.all[0]&&document.all[0].nodeValue)||(document.doctype&&document.doctype.publicId));isc.Browser.isIE7=isc.Browser.isIE&&isc.Browser.version==7;isc.Browser.isIE8=isc.Browser.isIE&&isc.Browser.version>=8&&document.documentMode==8 isc.Browser.isIE8Strict=isc.Browser.isIE&&(isc.Browser.isStrict&&document.documentMode==8)||document.documentMode>8;isc.Browser.isIE9=isc.Browser.isIE&&isc.Browser.version>=9&&document.documentMode>=9;isc.Browser.isAIR=(navigator.userAgent.indexOf("AdobeAIR")!=-1);isc.Browser.AIRVersion=(isc.Browser.isAIR?navigator.userAgent.substring(navigator.userAgent.indexOf("AdobeAir/")+9):null);isc.Browser.isWebKit=navigator.userAgent.indexOf("WebKit")!=-1;isc.Browser.isSafari=isc.Browser.isAIR||navigator.userAgent.indexOf("Safari")!=-1||navigator.userAgent.indexOf("AppleWebKit")!=-1;isc.Browser.isChrome=isc.Browser.isSafari&&(navigator.userAgent.indexOf("Chrome/")!=-1);if(isc.Browser.isSafari){if(isc.Browser.isAIR){isc.Browser.safariVersion=530}else{if(navigator.userAgent.indexOf("Safari/")!=-1){isc.Browser.rawSafariVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Safari/")+7)}else if(navigator.userAgent.indexOf("AppleWebKit/")!=-1){isc.Browser.rawSafariVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("AppleWebKit/")+12)}else{isc.Browser.rawSafariVersion="530"} diff -r d0f351ffdbfb -r c151e43463cd modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js --- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js Fri Nov 16 13:20:03 2012 +0100 +++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js Thu Nov 22 19:48:20 2012 +0100 @@ -18,9 +18,11 @@ return v.present=="true"||v.present.charAt(0)=="$"};isc.getOptionalModule=function(_1){return isc.$b[_1]};isc.$d=window.isc_useSimpleNames;if(isc.$d==null)isc.$d=true;if(window.OpenAjax){isc.$e=isc.versionNumber.replace(/[a-zA-Z_]+/,".0");OpenAjax.registerLibrary("SmartClient","http://smartclient.com/SmartClient",isc.$e,{namespacedMode:!isc.$d,iscVersion:isc.version,buildDate:isc.buildDate,licenseType:isc.licenseType,licenseCompany:isc.licenseCompany,licenseSerialNumber:isc.licenseSerialNumber});OpenAjax.registerGlobals("SmartClient",["isc"])} isc.$f=window.isc_useLongDOMIDs;isc.$g="isc.";isc.addGlobal=function(_1,_2){if(_1.indexOf(isc.$g)==0)_1=_1.substring(4);isc[_1]=_2;if(isc.$d)window[_1]=_2} isc.onLine=true;isc.isOffline=function(){return!isc.onLine};isc.goOffline=function(){isc.onLine=false};isc.goOnline=function(){isc.onLine=true};if(window.addEventListener){window.addEventListener("online",isc.goOnline,false);window.addEventListener("offline",isc.goOffline,false)} -isc.addGlobal("Browser",{isSupported:false});isc.Browser.isOpera=(navigator.appName=="Opera"||navigator.userAgent.indexOf("Opera")!=-1);isc.Browser.isNS=(navigator.appName=="Netscape"&&!isc.Browser.isOpera);isc.Browser.isIE=(navigator.appName=="Microsoft Internet Explorer"&&!isc.Browser.isOpera);isc.Browser.isMSN=(isc.Browser.isIE&&navigator.userAgent.indexOf("MSN")!=-1);isc.Browser.minorVersion=parseFloat(isc.Browser.isIE?navigator.appVersion.substring(navigator.appVersion.indexOf("MSIE")+5):navigator.appVersion);isc.Browser.version=parseInt(isc.Browser.minorVersion);isc.Browser.isIE6=isc.Browser.isIE&&isc.Browser.version<=6;isc.Browser.isMoz=(navigator.userAgent.indexOf("Gecko")!=-1)&&(navigator.userAgent.indexOf("Safari")==-1)&&(navigator.userAgent.indexOf("AppleWebKit")==-1);isc.Browser.isCamino=(isc.Browser.isMoz&&navigator.userAgent.indexOf("Camino/")!=-1);if(isc.Browser.isCamino){isc.Browser.caminoVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Camino/")+7)} +isc.addGlobal("Browser",{isSupported:false});isc.Browser.isOpera=(navigator.appName=="Opera"||navigator.userAgent.indexOf("Opera")!=-1);isc.Browser.isNS=(navigator.appName=="Netscape"&&!isc.Browser.isOpera);isc.Browser.isIE=(navigator.appName=="Microsoft Internet Explorer"&&!isc.Browser.isOpera);isc.Browser.isMSN=(isc.Browser.isIE&&navigator.userAgent.indexOf("MSN")!=-1);isc.Browser.minorVersion=parseFloat(isc.Browser.isIE?navigator.appVersion.substring(navigator.appVersion.indexOf("MSIE")+5):navigator.appVersion); +if(!isc.Browser.isIE)(function(){var needle,pos;if(navigator.appVersion){needle="Version/";pos=navigator.appVersion.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(navigator.appVersion.substring(pos+needle.length));return;}}var ua=navigator.userAgent;needle="Chrome/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}needle="Camino/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}needle="Firefox/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}if(ua.indexOf("Opera/")>=0){needle="Version/";pos=ua.indexOf(needle);if(pos>=0){isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}else{needle="Opera/";pos=ua.indexOf(needle);isc.Browser.minorVersion=parseFloat(ua.substring(pos+needle.length));return;}}})(); +isc.Browser.version=parseInt(isc.Browser.minorVersion);isc.Browser.isIE6=isc.Browser.isIE&&isc.Browser.version<=6;isc.Browser.isMoz=(navigator.userAgent.indexOf("Gecko")!=-1)&&(navigator.userAgent.indexOf("Safari")==-1)&&(navigator.userAgent.indexOf("AppleWebKit")==-1);isc.Browser.isCamino=(isc.Browser.isMoz&&navigator.userAgent.indexOf("Camino/")!=-1);if(isc.Browser.isCamino){isc.Browser.caminoVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Camino/")+7)} isc.Browser.isFirefox=(isc.Browser.isMoz&&navigator.userAgent.indexOf("Firefox/")!=-1);if(isc.Browser.isFirefox){isc.Browser.firefoxVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Firefox/")+8)} -if(isc.Browser.isMoz){isc.Browser.$h=navigator.userAgent.indexOf("Gecko/")+6;isc.Browser.geckoVersion=parseInt(navigator.userAgent.substring(isc.Browser.$h,isc.Browser.$h+8));if(isc.Browser.isFirefox){if(isc.Browser.firefoxVersion.match(/^1\.0/))isc.Browser.geckoVersion=20050915;else if(isc.Browser.firefoxVersion.match(/^2\.0/))isc.Browser.geckoVersion=20071108}} +if(isc.Browser.isMoz){isc.Browser.$h=navigator.userAgent.indexOf("Gecko/")+6;isc.Browser.geckoVersion=parseInt(navigator.userAgent.substring(isc.Browser.$h,isc.Browser.$h+8));if(isc.Browser.isFirefox){if(isc.Browser.firefoxVersion.match(/^1\.0/))isc.Browser.geckoVersion=20050915;else if(isc.Browser.firefoxVersion.match(/^2\.0/))isc.Browser.geckoVersion=20071108}if(isc.Browser.version>=17)isc.Browser.geckoVersion=20121121;} isc.Browser.isStrict=document.compatMode=="CSS1Compat";if(isc.Browser.isStrict&&isc.Browser.isMoz){isc.Browser.$i=document.doctype.publicId;isc.Browser.$j=document.doctype.systemId} isc.Browser.isTransitional=/.*(Transitional|Frameset)/.test((document.all&&document.all[0]&&document.all[0].nodeValue)||(document.doctype&&document.doctype.publicId));isc.Browser.isIE7=isc.Browser.isIE&&isc.Browser.version==7;isc.Browser.isIE8=isc.Browser.isIE&&isc.Browser.version>=8&&document.documentMode==8 isc.Browser.isIE8Strict=isc.Browser.isIE&&(isc.Browser.isStrict&&document.documentMode==8)||document.documentMode>8;isc.Browser.isIE9=isc.Browser.isIE&&isc.Browser.version>=9&&document.documentMode>=9;isc.Browser.isAIR=(navigator.userAgent.indexOf("AdobeAIR")!=-1);isc.Browser.AIRVersion=(isc.Browser.isAIR?navigator.userAgent.substring(navigator.userAgent.indexOf("AdobeAir/")+9):null);isc.Browser.isWebKit=navigator.userAgent.indexOf("WebKit")!=-1;isc.Browser.isSafari=isc.Browser.isAIR||navigator.userAgent.indexOf("Safari")!=-1||navigator.userAgent.indexOf("AppleWebKit")!=-1;isc.Browser.isChrome=isc.Browser.isSafari&&(navigator.userAgent.indexOf("Chrome/")!=-1);if(isc.Browser.isSafari){if(isc.Browser.isAIR){isc.Browser.safariVersion=530}else{if(navigator.userAgent.indexOf("Safari/")!=-1){isc.Browser.rawSafariVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("Safari/")+7)}else if(navigator.userAgent.indexOf("AppleWebKit/")!=-1){isc.Browser.rawSafariVersion=navigator.userAgent.substring(navigator.userAgent.indexOf("AppleWebKit/")+12)}else{isc.Browser.rawSafariVersion="530"} diff -r d0f351ffdbfb -r c151e43463cd modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js --- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js Fri Nov 16 13:20:03 2012 +0100 +++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js Thu Nov 22 19:48:20 2012 +0100 @@ -777,70 +777,4 @@ } return this._fieldMatchesFilter(fieldValue, filterValue, requestProperties); } -}); - - -// IMPORTANT: The following code has been imported from "SmartClient_v83p_2012-11-21_LGPL" (source\client\browser\Browser.js) -// to allow good Firefox operation from version 17. Issue: https://issues.openbravo.com/view.php?id=22371 -// This code should be removed once Smartclient be upgraded. -if (!isc.Browser.isIE) { - (function () { - var needle, pos; - if (navigator.appVersion) { - // Safari - needle = "Version/"; - pos = navigator.appVersion.indexOf(needle); - if (pos >= 0) { - isc.Browser.minorVersion = parseFloat(navigator.appVersion.substring(pos + needle.length)); - return; - } - } - - var ua = navigator.userAgent; - - needle = "Chrome/"; - pos = ua.indexOf(needle); - if (pos >= 0) { - isc.Browser.minorVersion = parseFloat(ua.substring(pos + needle.length)); - return; - } - - // Handle Camino before Firefox because Camino includes "(like Firefox/x.x.x)" in the UA. - needle = "Camino/"; - pos = ua.indexOf(needle); - if (pos >= 0) { - isc.Browser.minorVersion = parseFloat(ua.substring(pos + needle.length)); - return; - } - - needle = "Firefox/"; - pos = ua.indexOf(needle); - if (pos >= 0) { - isc.Browser.minorVersion = parseFloat(ua.substring(pos + needle.length)); - return; - } - - if (ua.indexOf("Opera/") >= 0) { - needle = "Version/"; - pos = ua.indexOf(needle); - if (pos >= 0) { - isc.Browser.minorVersion = parseFloat(ua.substring(pos + needle.length)); - return; - } else { - // Opera 9.64 - needle = "Opera/"; - pos = ua.indexOf(needle); - isc.Browser.minorVersion = parseFloat(ua.substring(pos + needle.length)); - return; - } - } - - }()); -} - -isc.Browser.version = parseInt(isc.Browser.minorVersion, 10); -if (isc.Browser.isMoz && isc.Browser.version >= 17) { - isc.Browser.geckoVersion = 20121121; -} - -// End of Firefox >= 17 compatibiliy code \ No newline at end of file +}); \ No newline at end of file ------------------------------------------------------------------------------ Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
