}
}
+ /**
+ * Sets the alternate text for the icon.
+ *
+ * @param alternateText
+ * with the alternate text.
+ */
+ public void setAlternateText(String alternateText) {
+ getElement().setAttribute("alt",
+ alternateText == null ? "" : alternateText);
+ }
+
}
import com.google.gwt.event.dom.client.FocusHandler;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Element;
import com.vaadin.client.EventHelper;
import com.vaadin.client.MouseEventDetailsBuilder;
import com.vaadin.client.communication.StateChangeEvent;
if (getIcon() != null) {
if (getWidget().icon == null) {
getWidget().icon = new Icon(getConnection());
- Element iconElement = getWidget().icon.getElement();
- iconElement.setAttribute("alt", getState().iconAltText);
-
- getWidget().wrapper.insertBefore(iconElement,
+ getWidget().wrapper.insertBefore(
+ getWidget().icon.getElement(),
getWidget().captionElement);
}
getWidget().icon.setUri(getIcon());
+ getWidget().icon.setAlternateText(getState().iconAltText);
} else {
if (getWidget().icon != null) {
getWidget().wrapper.removeChild(getWidget().icon
}
}
+ if (getWidget().icon != null
+ && stateChangeEvent.hasPropertyChanged("iconAltText")) {
+ getWidget().icon.setAlternateText(getState().iconAltText);
+ }
+
getWidget().clickShortcut = getState().clickShortcutKeyCode;
}
--- /dev/null
+<?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://localhost:7171/" />
+<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.button.ButtonUpdateAltText?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>//div[@id='button']//img[@class='v-icon']@alt</td>
+ <td>initial alt text</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonButtonUpdateAltText::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
+ <td>10,14</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>//div[@id='button']//img[@class='v-icon']@alt</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonButtonUpdateAltText::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
+ <td>10,14</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>//div[@id='button']//img[@class='v-icon']@alt</td>
+ <td>alt text</td>
+</tr>
+</tbody></table>
+</body>
+</html>
--- /dev/null
+/*
+ * 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.button;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+
+/**
+ *
+ * @since
+ * @author Vaadin Ltd
+ */
+public class ButtonUpdateAltText extends AbstractTestUI {
+
+ private final ThemeResource ICON = new ThemeResource(
+ "../runo/icons/16/folder.png");
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+ * VaadinRequest)
+ */
+ @Override
+ protected void setup(VaadinRequest request) {
+ final Button btn = new Button();
+ btn.setId("button");
+ btn.setIcon(ICON, "initial alt text");
+ addComponent(btn);
+
+ final CheckBox enable = new CheckBox("Enable alt text", true);
+ enable.setImmediate(true);
+ enable.addValueChangeListener(new Property.ValueChangeListener() {
+
+ @Override
+ public void valueChange(ValueChangeEvent event) {
+ if (enable.booleanValue()) {
+ btn.setIconAlternateText("alt text");
+ } else {
+ btn.setIconAlternateText("");
+ }
+ }
+ });
+ addComponent(enable);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+ */
+ @Override
+ protected String getTestDescription() {
+ return "Button should have a alt text";
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+ */
+ @Override
+ protected Integer getTicketNumber() {
+ return 12333;
+ }
+
+}
projects / vaadin-framework.git / commitdiff