Author: ivaynberg
Date: Sat Sep 27 01:27:58 2008
New Revision: 699603
URL: http://svn.apache.org/viewvc?rev=699603&view=rev
Log:
rollback wicket-1786
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/detectSVG.js
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html?rev=699603&r1=699602&r2=699603&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.html
Sat Sep 27 01:27:58 2008
@@ -43,17 +43,6 @@
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();
}
</script>
@@ -75,7 +64,6 @@
<input type="text" wicket:id="utcDSTOffset" />
<input type="text" wicket:id="browserWidth" />
<input type="text" wicket:id="browserHeight" />
- <input type="text" wicket:id="SVGsupport" />
</form>
</wicket:panel>
</html>
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java?rev=699603&r1=699602&r2=699603&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
Sat Sep 27 01:27:58 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);
@@ -104,7 +101,6 @@
form.add(new TextField<String>("utcDSTOffset"));
form.add(new TextField<String>("browserWidth"));
form.add(new TextField<String>("browserHeight"));
- form.add(new TextField<String>("SVGsupport"));
add(form);
}
@@ -128,11 +124,6 @@
}
- public void renderHead(IHeaderResponse response)
- {
- response.renderJavascriptReference(new
ResourceReference(this.getClass(), "detectSVG.js"));
- }
-
/**
* Holds properties of the client.
*/
@@ -155,7 +146,6 @@
private String utcDSTOffset;
private String browserWidth;
private String browserHeight;
- private String SVGsupport;
/**
* Gets browserHeight.
@@ -322,7 +312,6 @@
properties.setScreenColorDepth(getInt(screenColorDepth));
properties.setUtcOffset(utcOffset);
properties.setUtcDSTOffset(utcDSTOffset);
- properties.setSVGsupport(SVGsupport);
}
/**
@@ -514,25 +503,5 @@
return intValue;
}
- /**
- * Sets SVGsupport
- *
- * @param SVGsupport
- * SVGsupport
- */
- public void setSVGsupport(String gsupport)
- {
- SVGsupport = gsupport;
- }
-
- /**
- * Gets SVGsupport
- *
- * @return SVGsupport
- */
- public String getSVGsupport()
- {
- return SVGsupport;
- }
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java?rev=699603&r1=699602&r2=699603&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
Sat Sep 27 01:27:58 2008
@@ -93,8 +93,6 @@
private String utcDSTOffset;
private String utcOffset;
- private String SVGsupport;
-
/**
* @return The browser height at the time it was measured
@@ -1052,20 +1050,7 @@
this.utcOffset = utcOffset;
}
- /**
- * @return null if there is no SVG support, otherwise a String like
"<Name>,<Version>" (e.g. "Gecko,2")
- */
- public String getSVGsupport() {
- return SVGsupport;
- }
-
- /**
- * @param svgsupport the SVGsupport to set
- */
- public void setSVGsupport(String svgsupport) {
- SVGsupport = svgsupport;
- }
-
+ @Override
public String toString()
{
StringBuffer b = new StringBuffer();
