From: Matti Tahvonen Date: Thu, 2 Apr 2009 07:08:06 +0000 (+0000) Subject: fixes #2711, client side enabled flag check for item events (selects + item clicks... X-Git-Tag: 6.7.0.beta1~3034 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5218e96b2838388e2c9b77cf3aad7aecbb43a3c1;p=vaadin-framework.git fixes #2711, client side enabled flag check for item events (selects + item clicks, context menus) svn changeset:7279/svn branch:6.0 --- diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java index 2f7f61d1c7..f7a925ad00 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java @@ -2320,28 +2320,31 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener { */ @Override public void onBrowserEvent(Event event) { - Element targetTdOrTr = getEventTargetTdOrTr(event); - if (targetTdOrTr != null) { - switch (DOM.eventGetType(event)) { - case Event.ONCLICK: - handleClickEvent(event, targetTdOrTr); - if (selectMode > Table.SELECT_MODE_NONE) { - toggleSelection(); - // Note: changing the immediateness of this might - // require changes to "clickEvent" immediateness - // also. - client.updateVariable(paintableId, "selected", - selectedRowKeys.toArray(), immediate); + if (enabled) { + Element targetTdOrTr = getEventTargetTdOrTr(event); + if (targetTdOrTr != null) { + switch (DOM.eventGetType(event)) { + case Event.ONCLICK: + handleClickEvent(event, targetTdOrTr); + if (selectMode > Table.SELECT_MODE_NONE) { + toggleSelection(); + // Note: changing the immediateness of this + // might + // require changes to "clickEvent" immediateness + // also. + client.updateVariable(paintableId, "selected", + selectedRowKeys.toArray(), immediate); + } + break; + case Event.ONDBLCLICK: + handleClickEvent(event, targetTdOrTr); + break; + case Event.ONCONTEXTMENU: + showContextMenu(event); + break; + default: + break; } - break; - case Event.ONDBLCLICK: - handleClickEvent(event, targetTdOrTr); - break; - case Event.ONCONTEXTMENU: - showContextMenu(event); - break; - default: - break; } } super.onBrowserEvent(event);