From 445e86c25a94a83ef1314f6c6e27d46dcb6780dc Mon Sep 17 00:00:00 2001
From: Teemu Pöntelin <teemu@vaadin.com>
Date: Thu, 20 Mar 2014 00:15:45 +0200
Subject: Esc now closes the date popup even if focused on the time selectors
 (#12314)

Change-Id: I68bc7922074c8c03957fbffce8a3d453726e8c1a
---
 client/src/com/vaadin/client/ui/VCalendarPanel.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/src/com/vaadin/client/ui/VCalendarPanel.java b/client/src/com/vaadin/client/ui/VCalendarPanel.java
index d1a94ffb9a..c6832226a4 100644
--- a/client/src/com/vaadin/client/ui/VCalendarPanel.java
+++ b/client/src/com/vaadin/client/ui/VCalendarPanel.java
@@ -1094,12 +1094,18 @@ public class VCalendarPanel extends FocusableFlexTable implements
      *            The keydown/keypress event
      */
     private void handleKeyPress(DomEvent<?> event) {
+        // Special handling for events from time ListBoxes.
         if (time != null
                 && time.getElement().isOrHasChild(
                         (Node) event.getNativeEvent().getEventTarget().cast())) {
             int nativeKeyCode = event.getNativeEvent().getKeyCode();
             if (nativeKeyCode == getSelectKey()) {
-                onSubmit(); // submit happens if enter key hit down on listboxes
+                onSubmit(); // submit if enter key hit down on listboxes
+                event.preventDefault();
+                event.stopPropagation();
+            }
+            if (nativeKeyCode == getCloseKey()) {
+                onCancel(); // cancel if ESC key hit down on listboxes
                 event.preventDefault();
                 event.stopPropagation();
             }
-- 
cgit v1.2.3


From f72a5fb44f256eaeced2cbfb77900ce90f92e4c1 Mon Sep 17 00:00:00 2001
From: Maciej Przepióra <matthew@vaadin.com>
Date: Mon, 24 Mar 2014 22:13:48 +0200
Subject: Return border sizes from border methods in MeasuredSize (#13494)

Back ported from master
Merge: no

Change-Id: I9eee3cb897fcb00beb2b2877dd98337623e2cf5b
---
 client/src/com/vaadin/client/MeasuredSize.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'client')

diff --git a/client/src/com/vaadin/client/MeasuredSize.java b/client/src/com/vaadin/client/MeasuredSize.java
index 51da8570e6..bc6ef789d0 100644
--- a/client/src/com/vaadin/client/MeasuredSize.java
+++ b/client/src/com/vaadin/client/MeasuredSize.java
@@ -153,19 +153,19 @@ public class MeasuredSize {
     }
 
     public int getBorderTop() {
-        return margins[0];
+        return borders[0];
     }
 
     public int getBorderRight() {
-        return margins[1];
+        return borders[1];
     }
 
     public int getBorderBottom() {
-        return margins[2];
+        return borders[2];
     }
 
     public int getBorderLeft() {
-        return margins[3];
+        return borders[3];
     }
 
     public int getPaddingTop() {
-- 
cgit v1.2.3


From ca73546d736dfb41d9b25a32282fff63791bffe1 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Tue, 25 Mar 2014 13:21:27 +0200
Subject: Eliminate more .v-caption leaks in AbstractOrderedLayout (#13346)

Change-Id: I641be48a53c53f584c42ae4f904975f447e9075a
---
 .../client/ui/orderedlayout/AbstractOrderedLayoutConnector.java       | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'client')

diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index ce73627c88..d9299f2621 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -258,6 +258,10 @@ public abstract class AbstractOrderedLayoutConnector extends
         }
         boolean enabled = child.isEnabled();
 
+        if (slot.hasCaption() && null == caption) {
+            slot.setCaptionResizeListener(null);
+        }
+
         slot.setCaption(caption, iconUrlString, styles, error, showError,
                 required, enabled);
 
-- 
cgit v1.2.3