From 0907394c577c771a26195650f73d4cca0214cd76 Mon Sep 17 00:00:00 2001 From: Taras Hupalo Date: Mon, 29 Sep 2014 13:41:44 +0300 Subject: Removed the waitingForResponse flag from VTabsheet (#14710) Change-Id: Idd918197c2026a3c574cffd0e9595ff9f02eb2d8 --- client/src/com/vaadin/client/ui/VTabsheet.java | 8 +------- client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'client') diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index 745f2bca61..9c3af5c568 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -694,9 +694,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware private final Element deco; - /** For internal use only. May be removed or replaced in the future. */ - public boolean waitingForResponse; - private String currentStyle; /** @@ -704,8 +701,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware */ private boolean canSelectTab(final int tabIndex) { Tab tab = tb.getTab(tabIndex); - if (getApplicationConnection() == null || disabled - || waitingForResponse) { + if (getApplicationConnection() == null || disabled) { return false; } if (!tab.isEnabledOnServer() || tab.isHiddenOnServer()) { @@ -739,8 +735,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware getRpcProxy().setSelected(tabKeys.get(tabIndex).toString()); - waitingForResponse = true; - tb.getTab(tabIndex).focus(); // move keyboard focus to active tab return true; diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java index 8c6afd1c4f..94961a6a50 100644 --- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java +++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java @@ -41,6 +41,7 @@ public class TabsheetConnector extends TabsheetBaseConnector implements final String key = getState().tabs.get(i).key; final boolean selected = key.equals(getState().selected); if (selected) { + getWidget().setActiveTabIndex(i); getWidget().selectTab(i); break; } @@ -92,8 +93,6 @@ public class TabsheetConnector extends TabsheetBaseConnector implements } getWidget().iLayout(); - - getWidget().waitingForResponse = false; } @Override -- cgit v1.2.3