opendev/gerrit
Code Issues Proposed changes

SideBySide2: Stop advertising ",cm" URLs

Browse Source 
If ChangeScreen 2 is the default for this user or this tab then
SideBySide2 is the default handler for any file URLs.  Do not
append ",cm" and just rely on the default handler.

Change-Id: I0662715b7c0b65e0589fc33f9882b02bb60ecae3
This commit is contained in:
Shawn Pearce
2013-11-22 20:54:52 -08:00
parent 2bb7a6e05e
commit 51ec5cd24a
5 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.client.diff;
import com.google.gerrit.client.Dispatcher;
import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.changes.ChangeApi;
import com.google.gerrit.client.changes.ChangeInfo;
@@ -26,7 +27,6 @@ import com.google.gerrit.client.rpc.NativeMap;
import com.google.gerrit.client.rpc.RestApi;
import com.google.gerrit.client.ui.InlineHyperlink;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gwt.core.client.GWT;
@@ -47,7 +47,6 @@ import com.google.gwtexpui.globalkey.client.KeyCommand;
import com.google.gwtexpui.globalkey.client.KeyCommandSet;
import com.google.gwtexpui.safehtml.client.SafeHtml;
import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder;
import com.google.gwtorm.client.KeyUtil;
class Header extends Composite {
interface Binder extends UiBinder<HTMLPanel, Header> {}
@@ -176,15 +175,9 @@ class Header extends Composite {
}
private String url(FileInfo info) {
Change.Id c = patchSetId.getParentKey();
StringBuilder p = new StringBuilder();
p.append("/c/").append(c).append('/');
if (base != null) {
p.append(base.get()).append("..");
}
p.append(patchSetId.get()).append('/').append(KeyUtil.encode(info.path()));
p.append(info.binary() ? ",unified" : ",cm");
return p.toString();
return info.binary()
? Dispatcher.toUnified(base, patchSetId, info.path())
: Dispatcher.toSideBySide(base, patchSetId, info.path());
}
private KeyCommand setupNav(InlineHyperlink link, int key, String help, FileInfo info) {