The Unified and Autonomous Development Platform
Add copy to clipboard link in source view/diff selection popup
robin shen302b0f48c9a9
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.javaindex be57443a67..2671c1f3ce 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java@@ -33,6 +33,7 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.revwalk.RevCommit;import org.unbescape.html.HtmlEscape;+import org.unbescape.javascript.JavaScriptEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;@@ -267,6 +268,46 @@ public class TextDiffPanel extends Panel implements SourceAware {add(callbackBehavior = new AbstractPostAjaxBehavior() {+ private String getMarkedText(CommentPos mark) {+ List<String> lines;+ if (mark.getCommit().equals(getOldCommit().name()))+ lines = change.getOldText().getLines();+ else+ lines = change.getNewText().getLines();+ StringBuilder builder = new StringBuilder();+ if (mark.getRange().getBeginLine() != mark.getRange().getEndLine()) {+ String line = lines.get(mark.getRange().getBeginLine());+ int beginChar = mark.getRange().getBeginChar();+ if (beginChar < line.length())+ builder.append(line.substring(beginChar));+ for (int i=mark.getRange().getBeginLine()+1; i<mark.getRange().getEndLine(); i++) {+ if (builder.length() != 0)+ builder.append("\n");+ builder.append(lines.get(i));+ }+ line = lines.get(mark.getRange().getEndLine());+ int endChar = mark.getRange().getEndChar();+ if (endChar > 0) {+ if (endChar > line.length())+ endChar = line.length();+ if (builder.length() != 0)+ builder.append("\n");+ builder.append(line.substring(0, endChar));+ }+ } else {+ String line = lines.get(mark.getRange().getBeginLine());+ int beginChar = mark.getRange().getBeginChar();+ int endChar = mark.getRange().getEndChar();+ if (beginChar < line.length() && endChar > 0) {+ if (endChar > line.length())+ endChar = line.length();+ builder.append(line.substring(beginChar, endChar));+ }+ }++ return builder.toString();+ }+@Overrideprotected void respond(AjaxRequestTarget target) {IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();@@ -298,8 +339,9 @@ public class TextDiffPanel extends Panel implements SourceAware {params.getParameterValue("param1").toInt(),params.getParameterValue("param2").toInt());CommentPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");- script = String.format("gitplex.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', %s, %s);",+ script = String.format("gitplex.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s, %s);",getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),+ JavaScriptEscape.escapeJavaScript(getMarkedText(mark)),requestModel.getObject()!=null, SecurityUtils.getAccount()!=null);target.appendJavaScript(script);break;diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.javaindex 61e734320e..edefb4c2af 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffResourceReference.java@@ -7,6 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;+import com.gitplex.server.web.assets.js.clipboard.ClipboardResourceReference;import com.gitplex.server.web.assets.js.hover.HoverResourceReference;import com.gitplex.server.web.assets.js.selectionpopover.SelectionPopoverResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;@@ -26,6 +27,7 @@ public class TextDiffResourceReference extends BaseDependentResourceReference {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new SelectionPopoverResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference("codemirror/current/theme/eclipse.css")));dependencies.add(CssHeaderItem.forReference(new CssResourceReference(TextDiffPanel.class, "text-diff.css")));return dependencies;diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.jsindex 693d425e5a..cab0c3b557 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js@@ -469,11 +469,20 @@ gitplex.server.textDiff = {return $tooltip;}, alignment);},- openSelectionPopover: function(containerId, position, mark, markUrl, hasPullRequest, loggedIn) {+ openSelectionPopover: function(containerId, position, mark, markUrl, markedText, hasPullRequest, loggedIn) {var $container = $("#" + containerId);var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");$content.children("a.permanent").attr("href", markUrl);+ $content.append("<a class='copy-marked'><i class='fa fa-clipboard'></i> Copy selected text to clipboard</a>");+ var clipboard = new Clipboard(".copy-marked", {+ text: function(trigger) {+ return markedText;+ }+ });+ clipboard.on("success", function(e) {+ clipboard.destroy();+ });if (hasPullRequest && loggedIn) {$content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");$content.children("a.comment").click(function() {@@ -485,7 +494,7 @@ gitplex.server.textDiff = {mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);});} else if (!loggedIn) {- $content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");+ $content.append("<span class='comment'><i class='fa fa-warning'></i> Login to comment on selection</span>");}$container.selectionPopover("open", {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.javaindex 18329fa81b..427e50bb53 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import com.gitplex.server.web.assets.js.clipboard.ClipboardResourceReference;import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;import com.gitplex.server.web.assets.js.doneevents.DoneEventsResourceReference;@@ -36,6 +37,7 @@ public class SourceViewResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(SourceViewResourceReference.class, "source-view.css")));return dependencies;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.jsindex 5bcdbad8d3..c80d392d1e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js@@ -333,6 +333,16 @@ gitplex.server.sourceView = {var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");$content.children("a.permanent").attr("href", markUrl);+ $content.append("<a class='copy-marked'><i class='fa fa-clipboard'></i> Copy selected text to clipboard</a>");+ var clipboard = new Clipboard(".copy-marked", {+ text: function(trigger) {+ return cm.getSelection("\n");+ }+ });+ clipboard.on("success", function(e) {+ gitplex.server.codemirror.clearSelection(cm);+ clipboard.destroy();+ });if (hasPullRequest && loggedIn) {$content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");$content.children("a.comment").click(function() {@@ -344,7 +354,7 @@ gitplex.server.sourceView = {callback("addComment", mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);});} else if (!loggedIn) {- $content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");+ $content.append("<span class='comment'><i class='fa fa-warning'></i> Login to comment on selection</span>");}$(".source-view>.code").selectionPopover("open", {