summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuho Nurminen <juho@vaadin.com>2013-10-01 15:14:28 +0300
committerVaadin Code Review <review@vaadin.com>2013-10-01 13:45:13 +0000
commitffb33be8a15f3e82ca095901ca4fd2713eb229e6 (patch)
treed6cc22c1e2724396b39b84d4091bd8d7cb82ba26
parent478acb8e9aa7505cc6eacf219e87202191810a39 (diff)
downloadvaadin-framework-ffb33be8a15f3e82ca095901ca4fd2713eb229e6.tar.gz
vaadin-framework-ffb33be8a15f3e82ca095901ca4fd2713eb229e6.zip
Update slider client-side state object on value change (#12676)
Change-Id: Ief93d845e5498388072e05a0faff7ef2d29f1c77
-rw-r--r--client/src/com/vaadin/client/ui/slider/SliderConnector.java1
-rw-r--r--uitest/src/com/vaadin/tests/components/slider/SliderDisable.java81
2 files changed, 82 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/slider/SliderConnector.java b/client/src/com/vaadin/client/ui/slider/SliderConnector.java
index e6e3e0467d..71462d69f0 100644
--- a/client/src/com/vaadin/client/ui/slider/SliderConnector.java
+++ b/client/src/com/vaadin/client/ui/slider/SliderConnector.java
@@ -52,6 +52,7 @@ public class SliderConnector extends AbstractFieldConnector implements
@Override
public void onValueChange(ValueChangeEvent<Double> event) {
+ getState().value = event.getValue();
rpc.valueChanged(event.getValue());
}
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java b/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
new file mode 100644
index 0000000000..ea29a1657c
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.slider;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.VerticalLayout;
+
+public class SliderDisable extends AbstractTestUI {
+
+ public static class SliderDisableTest extends MultiBrowserTest {
+ @Test
+ public void disableSlider() throws IOException {
+ openTestURL();
+ WebElement element = vaadinElement("/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]");
+ new Actions(driver).dragAndDropBy(element, 112, 0).perform();
+ compareScreen("enabled");
+ vaadinElementById("disableButton").click();
+ compareScreen("disabled");
+ }
+ }
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ VerticalLayout content = new VerticalLayout();
+ content.setMargin(true);
+ content.setSpacing(true);
+
+ final Slider slider = new Slider(0, 5);
+ slider.setWidth(200, Unit.PIXELS);
+ slider.setValue(1.0D);
+
+ Button disableButton = new Button("Disable slider");
+ disableButton.setId("disableButton");
+ disableButton.addClickListener(new ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ slider.setEnabled(false);
+ }
+ });
+
+ content.addComponent(slider);
+ content.addComponent(disableButton);
+ setContent(content);
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "The apparent value of the slider should not change when the slider is disabled";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 12676;
+ }
+
+}