opendev/gerrit
Code Issues Proposed changes

Merge "SideBySide2: Fix minor key help layout issues"

Browse Source
This commit is contained in:
Edwin Kempin
2013-11-21 09:41:53 +00:00
committed by Gerrit Code Review
parent 9cdcfeb61b 7df9f20242
commit 686aadbacf
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
View File

@@ -131,7 +131,6 @@ public class SideBySide2 extends Screen {
private KeyCommandSet keysNavigation; private KeyCommandSet keysNavigation;
private KeyCommandSet keysAction; private KeyCommandSet keysAction;
private KeyCommandSet keysComment; private KeyCommandSet keysComment;
private KeyCommandSet keysOpenByEnter;
private List<HandlerRegistration> handlers; private List<HandlerRegistration> handlers;
public SideBySide2( public SideBySide2(
@@ -351,6 +350,8 @@ public class SideBySide2 extends Screen {
new NoOpKeyCommand(0, 'p', PatchUtil.C.chunkPrev2())); new NoOpKeyCommand(0, 'p', PatchUtil.C.chunkPrev2()));
keysAction = new KeyCommandSet(Gerrit.C.sectionActions()); keysAction = new KeyCommandSet(Gerrit.C.sectionActions());
keysAction.add(new NoOpKeyCommand(0, KeyCodes.KEY_ENTER,
PatchUtil.C.expandComment()));
keysAction.add(new NoOpKeyCommand(0, 'o', PatchUtil.C.expandComment())); keysAction.add(new NoOpKeyCommand(0, 'o', PatchUtil.C.expandComment()));
keysAction.add(new NoOpKeyCommand( keysAction.add(new NoOpKeyCommand(
KeyCommand.M_SHIFT, 'o', PatchUtil.C.expandAllCommentsOnCurrentLine())); KeyCommand.M_SHIFT, 'o', PatchUtil.C.expandAllCommentsOnCurrentLine()));
@@ -367,10 +368,6 @@ public class SideBySide2 extends Screen {
} }
}); });
keysOpenByEnter = new KeyCommandSet(Gerrit.C.sectionNavigation());
keysOpenByEnter.add(new NoOpKeyCommand(0, KeyCodes.KEY_ENTER,
PatchUtil.C.expandComment()));
if (Gerrit.isSignedIn()) { if (Gerrit.isSignedIn()) {
keysAction.add(new NoOpKeyCommand(0, 'c', PatchUtil.C.commentInsert())); keysAction.add(new NoOpKeyCommand(0, 'c', PatchUtil.C.commentInsert()));
keysComment = new KeyCommandSet(PatchUtil.C.commentEditorSet()); keysComment = new KeyCommandSet(PatchUtil.C.commentEditorSet());
@@ -383,11 +380,10 @@ public class SideBySide2 extends Screen {
} }
removeKeyHandlerRegs(); removeKeyHandlerRegs();
handlers.add(GlobalKey.add(this, keysNavigation)); handlers.add(GlobalKey.add(this, keysNavigation));
handlers.add(GlobalKey.add(this, keysAction));
handlers.add(GlobalKey.add(this, keysOpenByEnter));
if (keysComment != null) { if (keysComment != null) {
handlers.add(GlobalKey.add(this, keysComment)); handlers.add(GlobalKey.add(this, keysComment));
} }
handlers.add(GlobalKey.add(this, keysAction));
} }
private GerritCallback<NativeMap<JsArray<CommentInfo>>> getCommentCallback( private GerritCallback<NativeMap<JsArray<CommentInfo>>> getCommentCallback(