10030 Button.DisableOnClick not working properly

Change-Id: I0514bc4da186360a84d9cdb48140245108847115

1 files changed, 7 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/ui/button/ButtonConnector.java b/client/src/com/vaadin/client/ui/button/ButtonConnector.java
index 546bdecb61..c3aa66b285 100644
--- a/client/src/com/vaadin/client/ui/button/ButtonConnector.java
+++ b/client/src/com/vaadin/client/ui/button/ButtonConnector.java
@@ -156,7 +156,13 @@ public class ButtonConnector extends AbstractComponentConnector implements
     @Override
     public void onClick(ClickEvent event) {
         if (getState().disableOnClick) {
-            getWidget().setEnabled(false);
+            // Simulate getting disabled from the server without waiting for the
+            // round trip. The server-side RPC handler takes care of updating
+            // the server-side state in a similar way to ensure subsequent
+            // changes are properly propagated. Changing state on client is not
+            // generally supported.
+            getState().enabled = false;
+            super.updateEnabledState(false);
             rpc.disableOnClick();
         }