aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2011-11-21 14:18:08 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2011-11-21 14:18:08 +0000
commiteab165bc26754b35c112f40f6ff534b3e5737c54 (patch)
treefe5b1944b17cdb56de3a1acd9e4b34e8c2c70c9e /tests
parentfdc8e9a3445612adb21e620ca9822455663e34ba (diff)
downloadvaadin-framework-eab165bc26754b35c112f40f6ff534b3e5737c54.tar.gz
vaadin-framework-eab165bc26754b35c112f40f6ff534b3e5737c54.zip
renamed html file so that test bench don't think it is a test script
svn changeset:22084/svn branch:6.8
Diffstat (limited to 'tests')
-rw-r--r--tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java2
-rw-r--r--tests/testbench/com/vaadin/tests/dd/html5drop.htm51
2 files changed, 52 insertions, 1 deletions
diff --git a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java
index 5a682de8ce..2cdef65d31 100644
--- a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java
+++ b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java
@@ -42,7 +42,7 @@ public class StartHtml5Drag extends TestBase {
});
addComponent(dropTarget);
- Embedded iframe = new Embedded("", new ClassResource("html5drop.html",
+ Embedded iframe = new Embedded("", new ClassResource("html5drop.htm",
this));
iframe.setType(Embedded.TYPE_BROWSER);
iframe.setWidth(400, Sizeable.UNITS_PIXELS);
diff --git a/tests/testbench/com/vaadin/tests/dd/html5drop.htm b/tests/testbench/com/vaadin/tests/dd/html5drop.htm
new file mode 100644
index 0000000000..ed05fcedea
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/dd/html5drop.htm
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+<script type="text/javascript">
+ if (window.addEventListener) {
+ window.addEventListener('load', init, false); //W3C
+ } else {
+ window.attachEvent('onload', init); //IE
+ }
+
+ function init(event) {
+ var el = document.getElementById("drop");
+ if (el.addEventListener) {
+ el.addEventListener("dragover", dragover, false);
+ el.addEventListener("dragenter", dragenter, false);
+ el.addEventListener("drop", drop, false);
+ } else if (el.attachEvent) {
+ el.attachEvent('ondragover', dragover);
+ el.attachEvent('ondragenter', dragenter);
+ el.attachEvent('ondrop', drop);
+ }
+ }
+
+ function dragover(event) {
+ event.dataTransfer.dropEffect = 'copy';
+ return cancel(event);
+ }
+
+ function drop(event) {
+ document.getElementById("drop").innerHTML = event.dataTransfer.getData('Text');
+ return cancel(event);
+ }
+
+ function dragenter(event) {
+ return cancel(event);
+ }
+
+ function cancel(event) {
+ if (event.preventDefault) {
+ event.preventDefault();
+ }
+ return false;
+ }
+</script>
+</head>
+<body>
+ <div id="drop">or over here</div>
+</body>
+</html> \ No newline at end of file