Author: ivaynberg Date: Sat Sep 27 01:26:04 2008 New Revision: 699601 URL: http://svn.apache.org/viewvc?rev=699601&view=rev Log: rollback WICKET-1786
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html?rev=699601&r1=699600&r2=699601&view=diff ============================================================================== --- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html (original) +++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html Sat Sep 27 01:26:04 2008 @@ -43,18 +43,7 @@ document.postback.browserWidth.value = window.innerWidth || document.body.offsetWidth; document.postback.browserHeight.value = window.innerHeight || document.body.offsetHeight; - // SVG detection - var svginfo = detectSVG(); - if(svginfo.support){ - var svgstate = null; - if(svginfo.support=="Builtin") - svgstate=svginfo.builtin + ',' + svginfo.builtinVersion; - else - svgstate=svginfo.plugin + ',' + svginfo.pluginVersion + ',' + svginfo.IID; - document.postback.SVGsupport.value = svgstate; - } - - document.postback.submit(); + document.postback.submit(); } </script> </wicket:head> Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java?rev=699601&r1=699600&r2=699601&view=diff ============================================================================== --- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java (original) +++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java Sat Sep 27 01:26:04 2008 @@ -17,9 +17,6 @@ package org.apache.wicket.markup.html.pages; import org.apache.wicket.IClusterable; -import org.apache.wicket.ResourceReference; -import org.apache.wicket.markup.html.IHeaderContributor; -import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.panel.Panel; @@ -35,7 +32,7 @@ /** * Form for posting JavaScript properties. */ -public class BrowserInfoForm extends Panel implements IHeaderContributor +public class BrowserInfoForm extends Panel { /** log. */ private static final Logger log = LoggerFactory.getLogger(BrowserInfoForm.class); @@ -102,7 +99,6 @@ form.add(new TextField("utcDSTOffset")); form.add(new TextField("browserWidth")); form.add(new TextField("browserHeight")); - form.add(new TextField("SVGsupport")); add(form); } @@ -117,8 +113,8 @@ void warnNotUsingWebClientInfo(ClientInfo clientInfo) { log.warn("using " + getClass().getName() + " makes no sense if you are not using " + - WebClientInfo.class.getName() + " (you are using " + - clientInfo.getClass().getName() + " instead)"); + WebClientInfo.class.getName() + " (you are using " + clientInfo.getClass().getName() + + " instead)"); } protected void afterSubmit() @@ -126,10 +122,6 @@ } - public void renderHead(IHeaderResponse response) { - response.renderJavascriptReference(new ResourceReference(this.getClass(), "detectSVG.js")); - } - /** * Holds properties of the client. */ @@ -152,7 +144,6 @@ private String utcDSTOffset; private String browserWidth; private String browserHeight; - private String SVGsupport; /** * Gets browserHeight. @@ -305,10 +296,10 @@ properties.setNavigatorAppName(navigatorAppName); properties.setNavigatorAppVersion(navigatorAppVersion); properties.setNavigatorAppCodeName(navigatorAppCodeName); - properties.setCookiesEnabled((navigatorCookieEnabled != null) ? navigatorCookieEnabled - .booleanValue() : false); - properties.setJavaEnabled((navigatorJavaEnabled != null) ? navigatorJavaEnabled - .booleanValue() : false); + properties.setCookiesEnabled((navigatorCookieEnabled != null) + ? navigatorCookieEnabled.booleanValue() : false); + properties.setJavaEnabled((navigatorJavaEnabled != null) + ? navigatorJavaEnabled.booleanValue() : false); properties.setNavigatorLanguage(navigatorLanguage); properties.setNavigatorPlatform(navigatorPlatform); properties.setNavigatorUserAgent(navigatorUserAgent); @@ -319,7 +310,6 @@ properties.setScreenColorDepth(getInt(screenColorDepth)); properties.setUtcOffset(utcOffset); properties.setUtcDSTOffset(utcDSTOffset); - properties.setSVGsupport(SVGsupport); } /** @@ -511,23 +501,5 @@ return intValue; } - /** - * Sets SVGsupport - * - * @param SVGsupport - * SVGsupport - */ - public void setSVGsupport(String gsupport) { - SVGsupport = gsupport; - } - - /** - * Gets SVGsupport - * - * @return SVGsupport - */ - public String getSVGsupport() { - return SVGsupport; - } } }