Merge remote-tracking branch 'origin/master' into grid

Change-Id: Ibe1a7badae6dfa8ca33b56c400c7dcb3d7a7aeda

7 files changed, 26 insertions, 44 deletions

diff --git a/client/src/com/vaadin/client/DeferredWorker.java b/client/src/com/vaadin/client/DeferredWorker.java
index 53f7c79fe6..1eea26bf27 100644
--- a/client/src/com/vaadin/client/DeferredWorker.java
+++ b/client/src/com/vaadin/client/DeferredWorker.java
@@ -20,6 +20,9 @@ package com.vaadin.client;
  * scheduled to be executed in the near future and that the framework should
  * wait for this work to complete before assuming the UI has reached a steady
  * state.
+ * 
+ * @since 7.3
+ * @author Vaadin Ltd
  */
 public interface DeferredWorker {
     /**
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index e37b044826..306f26b1af 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -476,7 +476,7 @@ public class Util {
     /**
      * Defers the execution of {@link #runWebkitOverflowAutoFix(Element)}
      * 
-     * @since
+     * @since 7.2.6
      * @param elem
      *            with overflow auto
      */
@@ -963,7 +963,7 @@ public class Util {
      * necessary in cases where IE "forgets" to update child elements when they
      * resize.
      *
-     * @since
+     * @since 7.3
      * @param e
      *            The element to perform the hack on
      */
@@ -1438,7 +1438,7 @@ public class Util {
      *            performed. This may be "forward" or "backward", or "none" if
      *            the direction is unknown or irrelevant.
      * 
-     * @since
+     * @since 7.3
      */
     public native static void setSelectionRange(Element elem, int pos,
             int length, String direction)
@@ -1455,7 +1455,7 @@ public class Util {
      * string representation.<br/>
      * Eg. 50%, 123px, ...
      *
-     * @since
+     * @since 7.2.6
      * @author Vaadin Ltd
      */
     @SuppressWarnings("serial")
@@ -1474,7 +1474,6 @@ public class Util {
         /**
          * Gets the unit value by its type.
          *
-         * @since
          * @param type
          *            the type of the unit as found in the style.
          * @return the unit value.
@@ -1532,7 +1531,6 @@ public class Util {
         /**
          * Creates a {@link CssSize} using a value and its measurement unit.
          *
-         * @since
          * @param value
          *            the value.
          * @param unit
@@ -1594,7 +1592,6 @@ public class Util {
         /**
          * Check whether the two sizes are equals.
          *
-         * @since
          * @param cssSize1
          *            the first size to compare.
          * @param cssSize2
diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java
index 230c9e6639..b323812c8c 100644
--- a/client/src/com/vaadin/client/ui/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/VFilterSelect.java
@@ -421,7 +421,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
         /**
          * Select the first item of the suggestions list popup.
          * 
-         * @since
+         * @since 7.2.6
          */
         public void selectFirstItem() {
             debug("VFS.SP: selectFirstItem()");
@@ -431,7 +431,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
         /**
          * Select the last item of the suggestions list popup.
          * 
-         * @since
+         * @since 7.2.6
          */
         public void selectLastItem() {
             debug("VFS.SP: selectLastItem()");
@@ -1031,6 +1031,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
          * menu currently displays the last page with less items then the
          * maximum visibility (in which case the scroll is not active, but the
          * scroll is active for any other page in general).
+         * 
+         * @since 7.2.6
          */
         @Override
         public boolean isScrollActive() {
diff --git a/client/src/com/vaadin/client/ui/VNotification.java b/client/src/com/vaadin/client/ui/VNotification.java
index 3cc1afd5ba..1df58bb38f 100644
--- a/client/src/com/vaadin/client/ui/VNotification.java
+++ b/client/src/com/vaadin/client/ui/VNotification.java
@@ -393,7 +393,7 @@ public class VNotification extends VOverlay {
         int type = DOM.eventGetType(event);
         // "modal"
         if (infiniteDelay || temporaryStyle == STYLE_SYSTEM) {
-            if (type == Event.ONCLICK) {
+            if (type == Event.ONCLICK || type == Event.ONTOUCHEND) {
                 if (DOM.isOrHasChild(getElement(), DOM.eventGetTarget(event))) {
                     hide();
                     return false;
@@ -512,7 +512,7 @@ public class VNotification extends VOverlay {
         notification.setWaiAriaRole(null);
         notification.setDelay(delayMsec);
 
-        if (BrowserInfo.get().isTouchDevice()) {
+        if (!notification.infiniteDelay && BrowserInfo.get().isTouchDevice()) {
             new Timer() {
                 @Override
                 public void run() {
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index c1e83ef08b..cb90823a7f 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -8118,7 +8118,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
     }
 
     /**
-     * @since
+     * @since 7.2.6
      */
     public void onUnregister() {
         if (addCloseHandler != null) {
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index aff1848647..745f2bca61 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -76,10 +76,7 @@ import com.vaadin.shared.ui.tabsheet.TabState;
 import com.vaadin.shared.ui.tabsheet.TabsheetServerRpc;
 import com.vaadin.shared.ui.tabsheet.TabsheetState;
 
-public class VTabsheet extends VTabsheetBase implements Focusable,
-        SubPartAware,
-        // TODO: These listeners are due to be removed in 7.3
-        FocusHandler, BlurHandler, KeyDownHandler {
+public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware {
 
     private static class VCloseEvent {
         private Tab tab;
@@ -1362,7 +1359,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
         /**
          * Delegate method for the onFocus event occurring on Tab.
          *
-         * @since
+         * @since 7.2.6
          * @param newFocusTab
          *            the new focused tab.
          * @see #onBlur(Tab)
@@ -1532,21 +1529,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
 
     }
 
-    @Override
-    public void onBlur(BlurEvent event) {
-        selectionHandler.onBlur(event);
-    }
-
-    @Override
-    public void onFocus(FocusEvent event) {
-        selectionHandler.onFocus(event);
-    }
-
-    @Override
-    public void onKeyDown(KeyDownEvent event) {
-        selectionHandler.onKeyDown(event);
-    }
-
     /*
      * The tabs selection handler instance.
      */
@@ -1570,11 +1552,9 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
          */
         public void registerTab(Tab tab) {
 
-            // TODO: change VTabsheet.this to this in 7.3
-            tab.addBlurHandler(VTabsheet.this);
-            tab.addFocusHandler(VTabsheet.this);
-            tab.addKeyDownHandler(VTabsheet.this);
-
+            tab.addBlurHandler(this);
+            tab.addFocusHandler(this);
+            tab.addKeyDownHandler(this);
             tab.addClickHandler(this);
             tab.addMouseDownHandler(this);
         }
diff --git a/client/src/com/vaadin/client/ui/menubar/MenuBar.java b/client/src/com/vaadin/client/ui/menubar/MenuBar.java
index 726defafd5..833fb5a38a 100644
--- a/client/src/com/vaadin/client/ui/menubar/MenuBar.java
+++ b/client/src/com/vaadin/client/ui/menubar/MenuBar.java
@@ -331,7 +331,7 @@ public class MenuBar extends Widget implements PopupListener {
     /**
      * Gets the first item from the menu or null if no items.
      * 
-     * @since
+     * @since 7.2.6
      * @return the first item from the menu or null if no items.
      */
     public MenuItem getFirstItem() {
@@ -341,7 +341,7 @@ public class MenuBar extends Widget implements PopupListener {
     /**
      * Gest the last item from the menu or null if no items.
      * 
-     * @since
+     * @since 7.2.6
      * @return the last item from the menu or null if no items.
      */
     public MenuItem getLastItem() {
@@ -352,7 +352,7 @@ public class MenuBar extends Widget implements PopupListener {
     /**
      * Gets the index of the selected item.
      * 
-     * @since
+     * @since 7.2.6
      * @return the index of the selected item.
      */
     public int getSelectedIndex() {
@@ -532,7 +532,7 @@ public class MenuBar extends Widget implements PopupListener {
     /**
      * Scroll the selected item into view.
      * 
-     * @since
+     * @since 7.2.6
      */
     public void scrollSelectionIntoView() {
         scrollItemIntoView(selectedItem);
@@ -541,7 +541,7 @@ public class MenuBar extends Widget implements PopupListener {
     /**
      * Sets the menu scroll enabled or disabled.
      * 
-     * @since
+     * @since 7.2.6
      * @param enabled
      *            the enabled state of the scroll.
      */
@@ -565,7 +565,7 @@ public class MenuBar extends Widget implements PopupListener {
     /**
      * Gets whether the scroll is activate for this menu.
      * 
-     * @since
+     * @since 7.2.6
      * @return true if the scroll is active, otherwise false.
      */
     public boolean isScrollActive() {
@@ -580,7 +580,7 @@ public class MenuBar extends Widget implements PopupListener {
     /**
      * Gets the preferred height of the menu.
      * 
-     * @since
+     * @since 7.2.6
      */
     protected int getPreferredHeight() {
         return table.getOffsetHeight();