diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-27 13:38:13 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-27 13:38:13 +0300 |
| commit | 5964acd1e7ea2a00681fc49525f4f10e5dfa06fe (patch) | |
| tree | dc0c01c12664e567c75d9165eb80457a8a7e5c85 /server/src/com/vaadin/ui/Button.java | |
| parent | 2af52b6102051fd9289778c35a1a74c58d51bf02 (diff) | |
| parent | 9a32e217f2cb89887b2a46934b992ff32e880ba1 (diff) | |
| download | vaadin-framework-5964acd1e7ea2a00681fc49525f4f10e5dfa06fe.tar.gz vaadin-framework-5964acd1e7ea2a00681fc49525f4f10e5dfa06fe.zip | |
Merge remote-tracking branch 'origin/6.8'
Conflicts:
server/src/com/vaadin/ui/Select.java
Diffstat (limited to 'server/src/com/vaadin/ui/Button.java')
| -rw-r--r-- | server/src/com/vaadin/ui/Button.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java index 8546d8f830..68b9f1392f 100644 --- a/server/src/com/vaadin/ui/Button.java +++ b/server/src/com/vaadin/ui/Button.java @@ -472,6 +472,10 @@ public class Button extends AbstractComponent implements * Determines if a button is automatically disabled when clicked. If this is * set to true the button will be automatically disabled when clicked, * typically to prevent (accidental) extra clicks on a button. + * <p> + * Note that this is only used when the click comes from the user, not when + * calling {@link #click()}. + * </p> * * @param disableOnClick * true to disable button when it is clicked, false otherwise |