From c5bcc9677e231f05a975b67d72fe811b19f8b3e3 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 24 Apr 2013 22:52:19 +0000 Subject: [PATCH] minor bug fix, auto scrollbar for smartextarea, smartextarea key events sent only when pickuser is showing git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@74042 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 3 +++ .../shareupdates/client/form/SmartTextArea.java | 13 ++++++++----- .../shareupdates/server/ShareUpdateServiceImpl.java | 1 - src/main/webapp/ShareUpdates.css | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index fe006d9..a7f437d 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,6 +5,9 @@ + + uses + diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/client/form/SmartTextArea.java b/src/main/java/org/gcube/portlets/user/shareupdates/client/form/SmartTextArea.java index 28da4c2..442ba2d 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/client/form/SmartTextArea.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/client/form/SmartTextArea.java @@ -117,11 +117,14 @@ public class SmartTextArea extends ContentEditDiv { pickUserDlg.onKeyUp(event.getKeyCode(), this.getAbsoluteLeft(), this.getAbsoluteTop()+65, getText()); break; } - case Event.ONKEYDOWN: { //avoid the arrow up to move the cursor at the beginning of the textbox and the TAB to move around inputs and enter to go newline - if (event.getKeyCode() == ARROW_UP || event.getKeyCode() == KeyCodes.KEY_TAB || event.getKeyCode() == KeyCodes.KEY_ENTER) { - DOM.eventCancelBubble(event, true); - DOM.eventPreventDefault(event); - return; + case Event.ONKEYDOWN: { + if (pickUserDlg.isShowing()) { + //avoid the arrow up to move the cursor at the beginning of the textbox and the TAB to move around inputs and enter to go newline + if (event.getKeyCode() == ARROW_UP || event.getKeyCode() == KeyCodes.KEY_TAB || event.getKeyCode() == KeyCodes.KEY_ENTER) { + DOM.eventCancelBubble(event, true); + DOM.eventPreventDefault(event); + return; + } } break; } diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java index fe1b742..3eccafd 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java @@ -121,7 +121,6 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar else { withinPortal = true; } - System.out.println("SessionID = " + sessionID); return SessionManager.getInstance().getASLSession(sessionID, user); } diff --git a/src/main/webapp/ShareUpdates.css b/src/main/webapp/ShareUpdates.css index aa194c1..dd01d58 100644 --- a/src/main/webapp/ShareUpdates.css +++ b/src/main/webapp/ShareUpdates.css @@ -142,7 +142,8 @@ a.link:hover { -webkit-border-radius: 4px; border-radius: 4px; letter-spacing: normal; - overflow: hidden; + max-height: 54px; + overflow: auto; } .dark-color {