diff options
| author | Henrik Paul <henrik@vaadin.com> | 2015-03-31 14:44:23 +0300 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2015-03-31 14:44:23 +0300 |
| commit | 844b2c6c41d57d4db1238eb6096f225c9fdb8314 (patch) | |
| tree | ffdd57cd35da2df500fbfae5981de381439d1f5c /WebContent | |
| parent | 2080f86e03552c56d52f488e4dcd72282cd64f62 (diff) | |
| parent | 3ab82ace45827365e87f9540fad3dffaed0679b5 (diff) | |
| download | vaadin-framework-844b2c6c41d57d4db1238eb6096f225c9fdb8314.tar.gz vaadin-framework-844b2c6c41d57d4db1238eb6096f225c9fdb8314.zip | |
Merge remote-tracking branch 'origin/master' into grid-7.5
Change-Id: Ife8c6d2a5f6c134a6e28e862f524b6e687199cc8
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 22 | ||||
| -rw-r--r-- | WebContent/statictestfiles/TableInIframeRowClickScrollJumpTest.html | 12 |
2 files changed, 15 insertions, 19 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index c1102f4682..ef60364202 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -87,9 +87,9 @@ </servlet> <servlet> - <!-- This servlet is a separate instance for the sole purpose of testing - #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) because - it modifies the VaadinService timeout parameters --> + <!-- This servlet is a separate instance for the sole purpose of + testing #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) + because it modifies the VaadinService timeout parameters --> <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> </servlet> @@ -115,17 +115,6 @@ <async-supported>true</async-supported> </servlet> - <!-- For testing custom push path with, for example, Weblogic 12.1.2 --> - <servlet> - <servlet-name>VaadinApplicationRunnerWithPushPathTest</servlet-name> - <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> - <init-param> - <param-name>pushPath</param-name> - <param-value>ws</param-value> - </init-param> - <async-supported>true</async-supported> - </servlet> - <servlet-mapping> <servlet-name>Embed App 1</servlet-name> <url-pattern>/embed1/*</url-pattern> @@ -160,11 +149,6 @@ </servlet-mapping> <servlet-mapping> - <servlet-name>VaadinApplicationRunnerWithPushPathTest</servlet-name> - <url-pattern>/run-pushpath/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> <servlet-name>IntegrationTest</servlet-name> <url-pattern>/integration/*</url-pattern> </servlet-mapping> diff --git a/WebContent/statictestfiles/TableInIframeRowClickScrollJumpTest.html b/WebContent/statictestfiles/TableInIframeRowClickScrollJumpTest.html new file mode 100644 index 0000000000..dfddbdb7e5 --- /dev/null +++ b/WebContent/statictestfiles/TableInIframeRowClickScrollJumpTest.html @@ -0,0 +1,12 @@ +<html>
+<head>
+<title>IEJumpTest</title>
+</head>
+<!-- This is for testing Vaadin UI in iFrame (test class TableInIframeRowClickScrollJumpTest, for ticket #15294 -->
+<body>
+ <div style="font-size: 4px">test div</div>
+ <iframe id="test-iframe-0" src="/run/com.vaadin.tests.components.table.TableBlurFocus" width="100%" height="2000px" style="visibility: visible;">
+ </iframe>
+</body>
+
+</html>
\ No newline at end of file |