summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc@vaadin.com>2013-06-13 16:02:35 +0300
committerVaadin Code Review <review@vaadin.com>2013-06-14 07:54:02 +0000
commit86e1a314913381ddb57f7c041611023c35739a37 (patch)
tree883031a0a15118d553eec6de80240338a074fb66
parent28f72b61480d3b8877ad9e8758878d248001a5d9 (diff)
downloadvaadin-framework-86e1a314913381ddb57f7c041611023c35739a37.tar.gz
vaadin-framework-86e1a314913381ddb57f7c041611023c35739a37.zip
VUIDLBrowser no longer requires shift-click to 'highlight component on server', open recursively changed to 'alt-click', for #12058
Change-Id: If0a359258c5f123a52a27860a8af2c52726e564c
-rw-r--r--client/src/com/vaadin/client/SimpleTree.java2
-rw-r--r--client/src/com/vaadin/client/VUIDLBrowser.java8
2 files changed, 3 insertions, 7 deletions
diff --git a/client/src/com/vaadin/client/SimpleTree.java b/client/src/com/vaadin/client/SimpleTree.java
index 0745a49aa0..289f05022a 100644
--- a/client/src/com/vaadin/client/SimpleTree.java
+++ b/client/src/com/vaadin/client/SimpleTree.java
@@ -79,7 +79,7 @@ public class SimpleTree extends ComplexPanel implements HasDoubleClickHandlers {
if (event.getNativeEvent().getEventTarget().cast() == handle) {
if (children.getStyle().getDisplay().intern() == Display.NONE
.getCssName()) {
- open(event.getNativeEvent().getShiftKey());
+ open(event.getNativeEvent().getAltKey());
} else {
close();
}
diff --git a/client/src/com/vaadin/client/VUIDLBrowser.java b/client/src/com/vaadin/client/VUIDLBrowser.java
index e6f38fb167..ee64a5b7b0 100644
--- a/client/src/com/vaadin/client/VUIDLBrowser.java
+++ b/client/src/com/vaadin/client/VUIDLBrowser.java
@@ -49,9 +49,7 @@ import com.vaadin.client.ui.VWindow;
*/
@Deprecated
public class VUIDLBrowser extends SimpleTree {
- private static final String HELP = "Shift click handle to open recursively. "
- + " Click components to highlight them on client side."
- + " Shift click components to highlight them also on the server side.";
+ private static final String HELP = "Alt-click handle to open recursively. ";
private ApplicationConnection client;
private String highlightedPid;
@@ -107,7 +105,6 @@ public class VUIDLBrowser extends SimpleTree {
protected StateChangeItem() {
setTitle(HELP);
-
addDomHandler(new MouseOutHandler() {
@Override
public void onMouseOut(MouseOutEvent event) {
@@ -120,8 +117,7 @@ public class VUIDLBrowser extends SimpleTree {
protected void select(ClickEvent event) {
ServerConnector connector = getConnector();
- if (connector != null && event != null
- && event.getNativeEvent().getShiftKey()) {
+ if (connector != null && event != null) {
connector.getConnection().highlightConnector(connector);
}