aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebContent/VAADIN/themes/liferay/panel/panel.css66
-rw-r--r--WebContent/VAADIN/themes/liferay/panel/top-left.pngbin0 -> 226 bytes
-rw-r--r--WebContent/VAADIN/themes/liferay/panel/top-right.pngbin0 -> 1425 bytes
-rw-r--r--WebContent/VAADIN/themes/liferay/styles.css148
-rw-r--r--WebContent/VAADIN/themes/liferay/window/top-left.pngbin0 -> 281 bytes
-rw-r--r--WebContent/VAADIN/themes/liferay/window/top-right.pngbin0 -> 1765 bytes
-rw-r--r--WebContent/VAADIN/themes/liferay/window/window.css65
-rw-r--r--build/VERSION.properties2
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java5
-rw-r--r--tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html21
-rw-r--r--tests/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java40
-rw-r--r--tests/src/com/vaadin/tests/components/datefield/InlineDateFields.java104
-rw-r--r--tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html10
13 files changed, 354 insertions, 107 deletions
diff --git a/WebContent/VAADIN/themes/liferay/panel/panel.css b/WebContent/VAADIN/themes/liferay/panel/panel.css
index 35e3c1063a..bb0bbe5338 100644
--- a/WebContent/VAADIN/themes/liferay/panel/panel.css
+++ b/WebContent/VAADIN/themes/liferay/panel/panel.css
@@ -1,22 +1,16 @@
-.v-panel-caption {
- text-shadow: 1px 1px #fff;
- font-size: 12px;
- color: #222;
- background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
- border: 1px solid #999;
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
- padding: 4px 5px 5px 5px;
+.v-panel {
+ background: transparent url(top-left.png) no-repeat;
}
+.v-panel-caption,
.v-panel-nocaption {
- height: 4px;
- border: 1px solid #999;
- border-bottom: none;
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
+ text-shadow: 1px 1px #fff;
+ font-size: 12px;
+ color: #222;
+ margin-left: 4px;
+ background: transparent url(top-right.png) no-repeat right top;
+ padding: 5px 5px 10px 2px;
+ height: 12px;
}
.v-panel-caption .v-icon {
@@ -25,7 +19,6 @@
.v-panel-content {
border: 1px solid #999;
- border-top: none;
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
@@ -33,8 +26,13 @@
/* Light style Panel */
+.v-panel-light {
+ background: transparent;
+}
+
.v-panel-caption-light,
.v-panel-nocaption-light {
+ margin: 0;
border: none;
background: none;
}
@@ -43,12 +41,42 @@
border-bottom: 1px solid #999;
}
+.v-panel-nocaption-light {
+ padding: 0;
+ height: 0;
+}
+
.v-panel-content-light {
border: none;
}
.v-panel-content-light > div {
background: transparent;
}
-.v-ie6 .v-panel-content-light {
+
+.v-panel-deco {
+ height: 0;
+ overflow: hidden;
+}
+
+/* IE specific rules */
+.v-ie .v-panel {
background: transparent;
-} \ No newline at end of file
+}
+.v-ie .v-panel-caption,
+.v-ie .v-panel-nocaption {
+ border: 1px solid #999;
+ border-bottom: none;
+ background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
+ margin: 0;
+ padding-left: 5px;
+}
+
+.v-ie .v-panel-caption-light,
+.v-ie .v-panel-nocaption-light {
+ border: none;
+ background: transparent;
+}
+
+.v-ie .v-panel-caption-light {
+ border-bottom: 1px solid #999;
+}
diff --git a/WebContent/VAADIN/themes/liferay/panel/top-left.png b/WebContent/VAADIN/themes/liferay/panel/top-left.png
new file mode 100644
index 0000000000..12e0780d42
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/panel/top-left.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/liferay/panel/top-right.png b/WebContent/VAADIN/themes/liferay/panel/top-right.png
new file mode 100644
index 0000000000..08203ae8a2
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/panel/top-right.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 3567877029..eed3379a6a 100644
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -1,5 +1,5 @@
-.v-theme-version:after {content:"6_4_5_dev-20100921";}
-.v-theme-version-6_4_5_dev-20100921 {display: none;}
+.v-theme-version:after {content:"6_4_5_dev-20100926";}
+.v-theme-version-6_4_5_dev-20100926 {display: none;}
/* Automatically compiled css file from subdirectories. */
.v-absolutelayout-wrapper {
@@ -2399,6 +2399,7 @@ div.v-app {
.v-ie8 .v-datefield-popup,
.v-ie8 .v-filterselect-suggestpopup,
.v-ie8 .v-shadow,
+.v-ie8 .v-shadow-window,
.v-ie8 .v-window,
.v-ie8 .v-popupview-popup,
.v-ie8 .v-tooltip,
@@ -2408,6 +2409,10 @@ div.v-app {
margin-top: -16px;
}
+.v-ie6 .v-view {
+ border-top: none;
+}
+
.v-contextmenu {
background: #ccc9c9 url(/html/themes/classic/images/application/menu_bg.png) repeat-x 0 0;
border: 1px solid;
@@ -2741,25 +2746,19 @@ span.v-datefield-calendarpanel-month {
margin: 0;
}
-.v-panel-caption {
- text-shadow: 1px 1px #fff;
- font-size: 12px;
- color: #222;
- background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
- border: 1px solid #999;
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
- padding: 4px 5px 5px 5px;
+.v-panel {
+ background: transparent url(panel/top-left.png) no-repeat;
}
+.v-panel-caption,
.v-panel-nocaption {
- height: 4px;
- border: 1px solid #999;
- border-bottom: none;
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
+ text-shadow: 1px 1px #fff;
+ font-size: 12px;
+ color: #222;
+ margin-left: 4px;
+ background: transparent url(panel/top-right.png) no-repeat right top;
+ padding: 5px 5px 10px 2px;
+ height: 12px;
}
.v-panel-caption .v-icon {
@@ -2768,7 +2767,6 @@ span.v-datefield-calendarpanel-month {
.v-panel-content {
border: 1px solid #999;
- border-top: none;
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
@@ -2776,8 +2774,13 @@ span.v-datefield-calendarpanel-month {
/* Light style Panel */
+.v-panel-light {
+ background: transparent;
+}
+
.v-panel-caption-light,
.v-panel-nocaption-light {
+ margin: 0;
border: none;
background: none;
}
@@ -2786,15 +2789,45 @@ span.v-datefield-calendarpanel-month {
border-bottom: 1px solid #999;
}
+.v-panel-nocaption-light {
+ padding: 0;
+ height: 0;
+}
+
.v-panel-content-light {
border: none;
}
.v-panel-content-light > div {
background: transparent;
}
-.v-ie6 .v-panel-content-light {
+
+.v-panel-deco {
+ height: 0;
+ overflow: hidden;
+}
+
+/* IE specific rules */
+.v-ie .v-panel {
background: transparent;
}
+.v-ie .v-panel-caption,
+.v-ie .v-panel-nocaption {
+ border: 1px solid #999;
+ border-bottom: none;
+ background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
+ margin: 0;
+ padding-left: 5px;
+}
+
+.v-ie .v-panel-caption-light,
+.v-ie .v-panel-nocaption-light {
+ border: none;
+ background: transparent;
+}
+
+.v-ie .v-panel-caption-light {
+ border-bottom: 1px solid #999;
+}
.v-popupview-popup {
background: #d4d4d4 url(/html/themes/classic/images/application/state_default_bg.png) repeat-x 0 0;
@@ -3244,15 +3277,15 @@ select {
}
.v-tabsheet-caption-close {
- background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat -80px -128px;
+ background: transparent url(tabsheet/close.png) no-repeat right top;
+ -background-image: url(tabsheet/close-ie6.png);
cursor: default;
float: right;
- margin: -1px -1px 0;
+ margin: 3px -1px 0;
overflow: hidden;
- padding-left: 2px;
text-indent: -999px;
- width: 10px;
- height: 16px;
+ width: 13px;
+ height: 9px;
}
.v-app input[type="text"],
@@ -3273,6 +3306,7 @@ textarea.v-textarea-prompt {
.v-tree-node {
background: transparent url(tree/arrows_sprites.png) no-repeat -42px 1px;
+ -background: transparent url(tree/arrows_sprites-ie6.png) no-repeat -42px 1px;
}
.v-tree-node span {
@@ -3331,7 +3365,7 @@ textarea.v-textarea-prompt {
}
.v-window {
- background: none;
+ background: transparent;
}
.v-window-wrap {
@@ -3339,26 +3373,33 @@ textarea.v-textarea-prompt {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- background: #fff;
+ background: #fff url(window/top-left.png) no-repeat;
+}
+
+.v-ie6 .v-window-wrap,
+.v-ie7 .v-window-wrap {
+ background-position: 1px 1px;
+}
+
+.v-ie6 .v-window-wrap {
+ border-bottom: none;
+}
+
+.v-ie6 .v-window-footer {
+ border-bottom: 1px solid #c8c9ca;
+ margin-top: -1px;
+ padding-top: 1px;
}
.v-window-outerheader {
- background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
- border-color: #c8c9ca #aeb2b8 #aeb2b8 #c8c9ca;
- border-style: solid;
- border-width: 0 0 1px;
- padding-left: 10px;
height: 16px;
- padding: 6px 32px 6px 10px;
+ margin-left: 9px;
+ padding: 10px 40px 12px 2px;
+ background: transparent url(window/top-right.png) no-repeat right top;
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- margin: 5px;
-}
-
-.v-ie6 .v-window-outerheader,
-.v-ie7 .v-window-outerheader {
- margin-bottom: 0;
}
.v-window-header {
@@ -3371,6 +3412,15 @@ textarea.v-textarea-prompt {
padding: 0 5px 0 5px;
}
+.v-window-footer {
+ height: 5px;
+ overflow: visible;
+}
+
+.v-window div.v-window-footer-noresize {
+ height: 5px;
+}
+
.v-window-closebox {
background: url(window/closebutton_sprites.png) no-repeat scroll 0 0 transparent;
position: absolute;
@@ -3380,11 +3430,6 @@ textarea.v-textarea-prompt {
top: 8px;
}
-.v-ie6 .v-window-closebox,
-.v-ie7 .v-window-closebox {
- top: 4px;
-}
-
.v-window-closebox:hover {
background-position: 0 -24px;
}
@@ -3394,15 +3439,8 @@ textarea.v-textarea-prompt {
}
.v-window-resizebox {
- background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -64px -228px;
- width: 14px;
- height: 16px;
-}
-
-.v-shadow-window {
- padding-bottom: 11px;
-}
-
-.v-ie .v-shadow-window {
- padding-bottom: 0;
+ background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -69px -229px;
+ width: 10px;
+ height: 10px;
+ bottom: 0;
}
diff --git a/WebContent/VAADIN/themes/liferay/window/top-left.png b/WebContent/VAADIN/themes/liferay/window/top-left.png
new file mode 100644
index 0000000000..3beb6bdca9
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/window/top-left.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/liferay/window/top-right.png b/WebContent/VAADIN/themes/liferay/window/top-right.png
new file mode 100644
index 0000000000..dd8d61fdee
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/window/top-right.png
Binary files differ
diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.css
index e4c7aa391a..6b61d880f1 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.css
+++ b/WebContent/VAADIN/themes/liferay/window/window.css
@@ -1,5 +1,5 @@
.v-window {
- background: none;
+ background: transparent;
}
.v-window-wrap {
@@ -7,26 +7,33 @@
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- background: #fff;
+ background: #fff url(top-left.png) no-repeat;
+}
+
+.v-ie6 .v-window-wrap,
+.v-ie7 .v-window-wrap {
+ background-position: 1px 1px;
+}
+
+.v-ie6 .v-window-wrap {
+ border-bottom: none;
+}
+
+.v-ie6 .v-window-footer {
+ border-bottom: 1px solid #c8c9ca;
+ margin-top: -1px;
+ padding-top: 1px;
}
.v-window-outerheader {
- background: #c0c2c5 url(/html/themes/classic/images/application/panel_header_bg.png) repeat-x 0 0;
- border-color: #c8c9ca #aeb2b8 #aeb2b8 #c8c9ca;
- border-style: solid;
- border-width: 0 0 1px;
- padding-left: 10px;
height: 16px;
- padding: 6px 32px 6px 10px;
+ margin-left: 9px;
+ padding: 10px 40px 12px 2px;
+ background: transparent url(top-right.png) no-repeat right top;
+
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- margin: 5px;
-}
-
-.v-ie6 .v-window-outerheader,
-.v-ie7 .v-window-outerheader {
- margin-bottom: 0;
}
.v-window-header {
@@ -39,6 +46,15 @@
padding: 0 5px 0 5px;
}
+.v-window-footer {
+ height: 5px;
+ overflow: visible;
+}
+
+.v-window div.v-window-footer-noresize {
+ height: 5px;
+}
+
.v-window-closebox {
background: url(closebutton_sprites.png) no-repeat scroll 0 0 transparent;
position: absolute;
@@ -48,11 +64,6 @@
top: 8px;
}
-.v-ie6 .v-window-closebox,
-.v-ie7 .v-window-closebox {
- top: 4px;
-}
-
.v-window-closebox:hover {
background-position: 0 -24px;
}
@@ -62,16 +73,8 @@
}
.v-window-resizebox {
- background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -64px -228px;
- width: 14px;
- height: 16px;
-}
-
-.v-shadow-window {
- padding-bottom: 11px;
-}
-
-.v-ie6 .v-shadow-window,
-.v-ie7 .v-shadow-window {
- padding-bottom: 0;
+ background: transparent url(/html/themes/classic/images/aui/icon_sprite.png) no-repeat scroll -69px -229px;
+ width: 10px;
+ height: 10px;
+ bottom: 0;
} \ No newline at end of file
diff --git a/build/VERSION.properties b/build/VERSION.properties
index e2f55f06b1..97453c8cec 100644
--- a/build/VERSION.properties
+++ b/build/VERSION.properties
@@ -1 +1 @@
-version=6.4.5
+version=6.4.6
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
index 7507e9f9fa..63a6776394 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java
@@ -73,7 +73,10 @@ public class VDateFieldCalendar extends VDateField {
if (currentResolution <= RESOLUTION_MONTH) {
calendarPanel.setFocusChangeListener(new FocusChangeListener() {
public void focusChanged(Date date) {
- Date date2 = new Date(calendarPanel.getDate().getTime());
+ Date date2 = new Date();
+ if (calendarPanel.getDate() != null) {
+ date2.setTime(calendarPanel.getDate().getTime());
+ }
/*
* Update the value of calendarPanel
*/
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html b/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
index 77e66ff25c..a46f48fcfc 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
@@ -27,6 +27,27 @@
<td>13,8</td>
</tr>
<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
+ <td>116,6</td>
+</tr>
+<!-- Open twice to avoid IE6 css issues -->
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.combobox.Comboboxes?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Sselectaction-Icon/domChild[0]</td>
+ <td>label=16x16</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VFilterSelect[0]/domChild[1]</td>
+ <td>13,8</td>
+</tr>
+<tr>
<td>screenCapture</td>
<td></td>
<td>icons-16x16-page1</td>
diff --git a/tests/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/tests/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
new file mode 100644
index 0000000000..945b2b605b
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
@@ -0,0 +1,40 @@
+package com.vaadin.tests.components.combobox;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbstractSelect.NewItemHandler;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.TextField;
+
+@SuppressWarnings("serial")
+public class NewItemsESCPress extends TestBase {
+
+ @Override
+ protected void setup() {
+ final TextField addedItems = new TextField("Last added items:");
+ addedItems.setRows(10);
+ addComponent(addedItems);
+
+ final ComboBox box = new ComboBox("New items are allowed");
+ box.setNewItemsAllowed(true);
+ box.setNewItemHandler(new NewItemHandler() {
+ public void addNewItem(String newItemCaption) {
+ String value = (String) addedItems.getValue();
+ addedItems.setValue(value + newItemCaption + "\n" );
+ box.addItem(newItemCaption);
+ }
+ });
+ box.setImmediate(true);
+ addComponent(box);
+ }
+
+ @Override
+ protected String getDescription() {
+ return "Firefox flashes the previously entered value when holding the ESC-key.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 5694;
+ }
+
+}
diff --git a/tests/src/com/vaadin/tests/components/datefield/InlineDateFields.java b/tests/src/com/vaadin/tests/components/datefield/InlineDateFields.java
new file mode 100644
index 0000000000..e0fb41abdd
--- /dev/null
+++ b/tests/src/com/vaadin/tests/components/datefield/InlineDateFields.java
@@ -0,0 +1,104 @@
+package com.vaadin.tests.components.datefield;
+
+import java.sql.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+
+import com.vaadin.tests.components.ComponentTestCase;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.InlineDateField;
+
+@SuppressWarnings("serial")
+public class InlineDateFields extends ComponentTestCase<InlineDateField> {
+
+ private static final Locale[] LOCALES = new Locale[] { Locale.US,
+ Locale.TAIWAN, new Locale("fi", "FI") };
+
+ @Override
+ protected Class<InlineDateField> getTestClass() {
+ return InlineDateField.class;
+ }
+
+ @Override
+ protected void initializeComponents() {
+
+ Locale locale = LOCALES[0];
+
+ InlineDateField pd = createInlineDateField("Undefined width", "-1",
+ locale);
+ pd.setDebugId("Locale-" + locale.toString() + "-undefined-wide");
+ addTestComponent(pd);
+ pd = createInlineDateField("300px width", "300px", locale);
+ pd.setDebugId("Locale-" + locale.toString() + "-300px-wide");
+ addTestComponent(pd);
+ pd = createInlineDateField("Initially empty", "", locale);
+ pd.setValue(null);
+ pd.setDebugId("Locale-" + locale.toString() + "-initially-empty");
+ addTestComponent(pd);
+
+ }
+
+ private InlineDateField createInlineDateField(String caption, String width,
+ Locale locale) {
+ InlineDateField pd = new InlineDateField(caption + "("
+ + locale.toString() + ")");
+ pd.setWidth(width);
+ pd.setValue(new Date(12312312313L));
+ pd.setLocale(locale);
+ pd.setResolution(DateField.RESOLUTION_YEAR);
+
+ return pd;
+ }
+
+ @Override
+ protected String getDescription() {
+ return "A generic test for InlineDateFields in different configurations";
+ }
+
+ @Override
+ protected List<Component> createActions() {
+ List<Component> actions = super.createActions();
+ actions.add(createResolutionSelectAction());
+ actions.add(createLocaleSelectAction());
+ return actions;
+ }
+
+ private Component createResolutionSelectAction() {
+ LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();
+ options.put("Year", DateField.RESOLUTION_YEAR);
+ options.put("Month", DateField.RESOLUTION_MONTH);
+ options.put("Day", DateField.RESOLUTION_DAY);
+ options.put("Hour", DateField.RESOLUTION_HOUR);
+ options.put("Min", DateField.RESOLUTION_MIN);
+ options.put("Sec", DateField.RESOLUTION_SEC);
+ options.put("Msec", DateField.RESOLUTION_MSEC);
+ return createSelectAction("Resolution", options, "Year",
+ new Command<InlineDateField, Integer>() {
+
+ public void execute(InlineDateField c, Integer value) {
+ c.setResolution(value);
+
+ }
+ });
+ }
+
+ private Component createLocaleSelectAction() {
+ LinkedHashMap<String, Locale> options = new LinkedHashMap<String, Locale>();
+ for (Locale locale : LOCALES) {
+ options.put(locale.toString(), locale);
+ }
+ return createSelectAction("Locale", options, LOCALES[0].toString(),
+ new Command<InlineDateField, Locale>() {
+
+ public void execute(InlineDateField c, Locale value) {
+ c.setCaption(c.getCaption().replaceAll(
+ c.getLocale().toString(), value.toString()));
+ c.setLocale(value);
+
+ }
+ });
+ }
+
+}
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
index 16657e27c4..1348168ea5 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
+++ b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
@@ -22,6 +22,16 @@
<td></td>
</tr>
<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.TabsheetScrolling?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>vaadin=runcomvaadintestscomponentstabsheetTabsheetScrolling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
<td></td>