diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-12 16:36:04 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-12 16:36:04 +0300 |
| commit | 4ceccdc68f1eb3ffcb7b20e20b81877764a9c729 (patch) | |
| tree | b983309f14ef52917d347f2ec21f7a91408c8ed4 | |
| parent | 30fb43e8f437d674a750dcbc5626bd251cb5c609 (diff) | |
| parent | abdc1ee5c270658b9f361cace015ff27cc448a68 (diff) | |
| download | vaadin-framework-4ceccdc68f1eb3ffcb7b20e20b81877764a9c729.tar.gz vaadin-framework-4ceccdc68f1eb3ffcb7b20e20b81877764a9c729.zip | |
Merge commit 'abdc1'
Conflicts:
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java
| -rw-r--r-- | WebContent/release-notes.html | 18 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java | 6 | ||||
| -rw-r--r-- | tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html | 67 |
3 files changed, 87 insertions, 4 deletions
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index 1b56b7fb9c..6f2eb8c2cc 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -76,7 +76,7 @@ purpose of receiving feedback about the changes. </p> - <p>The major changes in this second alpha phase are: + <p>The major changes in this second alpha phase are:</p> <ul> <li>Complete overhaul of the client-server communication architecture @@ -354,15 +354,25 @@ </p> <p> - Vaadin supports the following <b>browsers</b>: + Vaadin supports the following <b>desktop browsers</b>: </p> <ul> - <li>Mozilla Firefox 11</li> + <li>Mozilla Firefox 12</li> <li>Internet Explorer 8-9</li> <li>Safari 5</li> <li>Opera 11</li> - <li>Google Chrome 18</li> + <li>Google Chrome 19</li> + </ul> + + <p> + Additionally, Vaadin supports the built-in browsers in the following + <b>mobile operating systems</b>: + </p> + + <ul> + <li>iOS 4-5</li> + <li>Android 2-4</li> </ul> <h2 id="vaadinontheweb">Vaadin on the Web</h2> diff --git a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java index aac0920f66..330214d500 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java +++ b/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java @@ -18,6 +18,7 @@ import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ContainerResizedListener; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VConsole; +import com.vaadin.terminal.gwt.client.VTooltip; import com.vaadin.terminal.gwt.client.ui.Field; import com.vaadin.terminal.gwt.client.ui.SimpleFocusablePanel; import com.vaadin.terminal.gwt.client.ui.VLazyExecutor; @@ -113,6 +114,8 @@ public class VSlider extends SimpleFocusablePanel implements Field, feedbackPopup.addStyleName(CLASSNAME + "-feedback"); feedbackPopup.setWidget(feedback); + + sinkEvents(VTooltip.TOOLTIP_EVENTS); } void setFeedbackValue(double value) { @@ -288,6 +291,9 @@ public class VSlider extends SimpleFocusablePanel implements Field, event.preventDefault(); // avoid simulated events event.stopPropagation(); } + if (client != null) { + client.handleTooltipEvent(event, this); + } } private void processMouseWheelEvent(final Event event) { diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html b/tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html new file mode 100644 index 0000000000..4e8296050f --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://arturwin.office.itmill.com:9999/" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.slider.SliderTest?debug&restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::PID_Smenu#item0</td> + <td>24,2</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::Root/VOverlay[0]/VMenuBar[0]#item1</td> + <td>35,12</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::Root/VOverlay[1]/VMenuBar[0]#item1</td> + <td>74,3</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::Root/VOverlay[2]/VMenuBar[0]#item2</td> + <td>30,6</td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::PID_StestComponent/domChild[2]/domChild[0]</td> + <td>0,0</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>This is a semi-long text that might wrap.</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td> + <td>40,16</td> +</tr> +<tr> + <td>waitForElementNotPresent</td> + <td>vaadin=runcomvaadintestscomponentssliderSliderTest::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> |