The Unified and Autonomous Development Platform
Prettify markdown editor header
robin shen7a8df5aef2ee
diff --git a/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java b/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.javaindex c1c2ae859a..9dc563e25c 100644--- a/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java+++ b/core/src/main/java/com/gitplex/server/util/markdown/UrlResolveExtension.java@@ -37,32 +37,35 @@ public class UrlResolveExtension implements HtmlRenderer.HtmlRendererExtension {@Overridepublic Set<NodeRenderingHandler<?>> getNodeRenderingHandlers() {- HashSet<NodeRenderingHandler<?>> set = new HashSet<NodeRenderingHandler<?>>();- set.add(new NodeRenderingHandler<Image>(Image.class, new CustomNodeRenderer<Image>() {-- @Override- public void render(Image image, NodeRendererContext context, HtmlWriter html) {- String url = image.getUrl().toString();- ResolvedLink resolvedLink = context.resolveLink(LinkType.IMAGE, url, null);- html.attr("src", resolveUrl(options.get(BASE_URL), url));- html.attr("alt", image.getText());- html.withAttr(resolvedLink);- html.tagVoid("img");- }-- }));- set.add(new NodeRenderingHandler<Link>(Link.class, new CustomNodeRenderer<Link>() {-- @Override- public void render(Link link, NodeRendererContext context, HtmlWriter html) {- String url = link.getUrl().toString();- ResolvedLink resolvedLink = context.resolveLink(LinkType.LINK, url, null);- html.attr("href", resolveUrl(options.get(BASE_URL), url));- html.withAttr(resolvedLink);- html.tag("a").text(link.getText()).closeTag("a");- }-- }));+ Set<NodeRenderingHandler<?>> set = new HashSet<NodeRenderingHandler<?>>();+ String baseUrl = options.get(BASE_URL);+ if (baseUrl != null) {+ set.add(new NodeRenderingHandler<Image>(Image.class, new CustomNodeRenderer<Image>() {++ @Override+ public void render(Image image, NodeRendererContext context, HtmlWriter html) {+ String url = image.getUrl().toString();+ ResolvedLink resolvedLink = context.resolveLink(LinkType.IMAGE, url, null);+ html.attr("src", resolveUrl(baseUrl, url));+ html.attr("alt", image.getText());+ html.withAttr(resolvedLink);+ html.tagVoid("img");+ }++ }));+ set.add(new NodeRenderingHandler<Link>(Link.class, new CustomNodeRenderer<Link>() {++ @Override+ public void render(Link link, NodeRendererContext context, HtmlWriter html) {+ String url = link.getUrl().toString();+ ResolvedLink resolvedLink = context.resolveLink(LinkType.LINK, url, null);+ html.attr("href", resolveUrl(baseUrl, url));+ html.withAttr(resolvedLink);+ html.tag("a").text(link.getText()).closeTag("a");+ }++ }));+ }return set;}diff --git a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.javaindex bd467b5356..94bbdc7e8c 100644--- a/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java+++ b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java@@ -43,8 +43,6 @@ import org.apache.wicket.request.cycle.RequestCycleContext;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;import org.apache.wicket.request.mapper.info.PageComponentInfo;-import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCachingStrategy;-import org.apache.wicket.request.resource.caching.version.LastModifiedResourceVersion;import org.apache.wicket.util.IProvider;import com.gitplex.launcher.bootstrap.Bootstrap;@@ -83,7 +81,7 @@ public class GitPlexWebApplication extends WebApplication {getMarkupSettings().setStripWicketTags(true);getStoreSettings().setFileStoreFolder(Bootstrap.getTempDir());-+BootstrapSettings bootstrapSettings = new BootstrapSettings();bootstrapSettings.setAutoAppendResources(false);de.agilecoders.wicket.core.Bootstrap.install(this, bootstrapSettings);@@ -160,8 +158,6 @@ public class GitPlexWebApplication extends WebApplication {new ResourceBundleReferences(WebModule.class, resourcePackScopes.toArray(new Class<?>[resourcePackScopes.size()])).installInto(this);}- getResourceSettings().setCachingStrategy(new FilenameWithVersionResourceCachingStrategy(new LastModifiedResourceVersion()));-setRequestCycleProvider(new IRequestCycleProvider() {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.js b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.jsindex 74c66864f1..b6dd71e312 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.js+++ b/web/src/main/java/com/gitplex/server/web/behavior/inputassist/input-assist.js@@ -126,8 +126,6 @@ gitplex.server.inputassist = {return false;}});-- callback("input", $input.val());},markErrors: function(inputId, errors) {diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.htmlindex 0dfe00f61d..96e8a7c982 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.html@@ -1,72 +1,64 @@<wicket:panel><div wicket:id="container" class="markdown-editor autofit no-autosize">- <div class="warning alert alert-warning">- <button class="close" data-dismiss="alert"><span>×</span></button>- <div class="message"><i class="fa fa-warning"></i> Below content is restored from an unsaved change</div>- </div>- <div class="head clearfix">- <div class="pull-left normal-mode">- <div class="btn-group">- <a class="do-bold btn btn-default btn-sm" title="Bold"><i class="fa fa-bold"></i></a>- <a class="do-italic btn btn-default btn-sm" title="Italic"><i class="fa fa-italic"></i></a>- <a class="do-header btn btn-default btn-sm" title="Heading"><i class="fa fa-header"></i></a>- </div>- <div class="btn-group">- <a class="do-link btn btn-default btn-sm" title="Link"><i class="fa fa-link"></i></a>- <a class="do-image btn btn-default btn-sm" title="Image"><i class="fa fa-picture-o"></i></a>+ <div class="head">+ <div class="actions clearfix">+ <div class="pull-left normal-mode clearfix">+ <a class="do-bold pull-left" title="Bold"><i class="fa fa-bold"></i></a>+ <a class="do-italic pull-left" title="Italic"><i class="fa fa-italic"></i></a>+ <a class="do-header pull-left" title="Heading"><i class="fa fa-header"></i></a>+ <span class="separator pull-left"></span>+ <a class="do-link pull-left" title="Link"><i class="fa fa-link"></i></a>+ <a class="do-image pull-left" title="Image"><i class="fa fa-picture-o"></i></a>+ <span class="separator pull-left"></span>+ <a class="do-list pull-left" title="Unordered List"><i class="fa fa-list"></i></a>+ <a class="do-orderlist pull-left" title="Ordered List"><i class="fa fa-list-ol"></i></a>+ <a class="do-tasklist pull-left" title="Task List"><i class="fa fa-check-square-o"></i></a>+ <a class="do-code pull-left" title="Code"><i class="fa fa-code"></i></a>+ <a class="do-quote pull-left" title="Quote"><i class="fa fa-quote-left"></i></a>+ <span class="separator pull-left"></span>+ <a class="do-emoji pull-left" title="Show Emojis"><i class="fa fa-smile-o"></i></a>+ <a class="do-mention pull-left" title="Mention Someone"><i class="fa fa-at"></i></a>+ <a class="do-hashtag pull-left" title="Reference Pull Request"><i class="fa fa-hashtag"></i></a></div>- <div class="btn-group">- <a class="do-list btn btn-default btn-sm" title="Unordered List"><i class="fa fa-list"></i></a>- <a class="do-orderlist btn btn-default btn-sm" title="Ordered List"><i class="fa fa-list-ol"></i></a>- <a class="do-tasklist btn btn-default btn-sm" title="Task List"><i class="fa fa-check-square-o"></i></a>- <a class="do-code btn btn-default btn-sm" title="Code"><i class="fa fa-code"></i></a>- <a class="do-quote btn btn-default btn-sm" title="Quote"><i class="fa fa-quote-left"></i></a>- </div>- <div class="btn-group">- <a class="do-emoji btn btn-default btn-sm" title="Show Emojis"><i class="fa fa-smile-o"></i></a>- <a class="do-mention btn btn-default btn-sm" title="Mention Someone"><i class="fa fa-at"></i></a>- <a class="do-hashtag btn btn-default btn-sm" title="Reference Pull Request"><i class="fa fa-hashtag"></i></a>+ <div class="pull-left dropdown compact-mode">+ <a data-toggle="dropdown" type="button"><i class="fa fa-navicon"></i></a>+ <ul class="dropdown-menu" aria-labelledby="dLabel">+ <li><a class="do-bold"><i class="fa fa-bold fa-fw"></i> Bold</a></li>+ <li><a class="do-italic"><i class="fa fa-italic fa-fw"></i> Italic</a></li>+ <li><a class="do-header"><i class="fa fa-header fa-fw"></i> Heading</a></li>+ <li role="separator" class="divider"></li>+ <li><a class="do-link"><i class="fa fa-link fa-fw"></i> Link</a></li>+ <li><a class="do-image"><i class="fa fa-picture-o fa-fw"></i> Image</a></li>+ <li role="separator" class="divider"></li>+ <li><a class="do-list"><i class="fa fa-list fa-fw"></i> Unordered List</a></li>+ <li><a class="do-orderlist"><i class="fa fa-list-ol fa-fw"></i> Ordered List</a></li>+ <li><a class="do-tasklist"><i class="fa fa-check-square-o fa-fw"></i> Task List</a></li>+ <li><a class="do-code"><i class="fa fa-code fa-fw"></i> Code</a></li>+ <li><a class="do-quote"><i class="fa fa-quote-left fa-fw"></i> Quote</a></li>+ <li role="separator" class="divider"></li>+ <li><a class="do-emoji"><i class="fa fa-smile-o fa-fw"></i> Show Emojis</a></li>+ <li><a class="do-mention"><i class="fa fa-at fa-fw"></i> Mention Someone</a></li>+ <li><a class="do-hashtag"><i class="fa fa-hashtag fa-fw"></i> Reference Pull Request</a></li>+ </ul></div>+ <div class="pull-right clearfix">+ <a class="do-fullscreen pull-left" title="Full screen"><i class="fa fa-expand"></i></a>+ <a class="do-help pull-left" title="Help"><i class="fa fa-question"></i></a>+ <span class="separator pull-left"></span>+ <a wicket:id="editLink" class="edit pull-left" title="Edit"><i class="fa fa-font"></i></a>+ <a class="preview pull-left" title="Preview"><i class="fa fa-eye"></i></a>+ <a wicket:id="splitLink" class="split pull-left" title="Split view"><i wicket:id="icon" class="fa fa-columns"></i></a>+ </div>+ </div>+ <div class="warning alert alert-warning">+ <button class="close" data-dismiss="alert"><span>×</span></button>+ <div class="message"><i class="fa fa-warning"></i> Below content is restored from an unsaved change</div></div>- <div class="pull-left dropdown compact-mode">- <button class="btn btn-default btn-sm" data-toggle="dropdown" type="button"><i class="fa fa-navicon"></i></button>- <ul class="dropdown-menu" aria-labelledby="dLabel">- <li><a class="do-bold"><i class="fa fa-bold fa-fw"></i> Bold</a></li>- <li><a class="do-italic"><i class="fa fa-italic fa-fw"></i> Italic</a></li>- <li><a class="do-header"><i class="fa fa-header fa-fw"></i> Heading</a></li>- <li role="separator" class="divider"></li>- <li><a class="do-link"><i class="fa fa-link fa-fw"></i> Link</a></li>- <li><a class="do-image"><i class="fa fa-picture-o fa-fw"></i> Image</a></li>- <li role="separator" class="divider"></li>- <li><a class="do-list"><i class="fa fa-list fa-fw"></i> Unordered List</a></li>- <li><a class="do-orderlist"><i class="fa fa-list-ol fa-fw"></i> Ordered List</a></li>- <li><a class="do-tasklist"><i class="fa fa-check-square-o fa-fw"></i> Task List</a></li>- <li><a class="do-code"><i class="fa fa-code fa-fw"></i> Code</a></li>- <li><a class="do-quote"><i class="fa fa-quote-left fa-fw"></i> Quote</a></li>- <li role="separator" class="divider"></li>- <li><a class="do-emoji"><i class="fa fa-smile-o fa-fw"></i> Show Emojis</a></li>- <li><a class="do-mention"><i class="fa fa-at fa-fw"></i> Mention Someone</a></li>- <li><a class="do-hashtag"><i class="fa fa-hashtag fa-fw"></i> Reference Pull Request</a></li>- </ul>+ <div class="emojis"></div>+ <div class="help">+ <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">GitHub flavored markdown</a> is accepted.+ <span wicket:id="canAttachFile">You may drop file/image to the input box, or paste image from clipboard</span></div>- <div class="pull-right">- <div class="btn-group">- <a class="do-fullscreen btn btn-default btn-sm" title="Full screen"><i class="fa fa-expand"></i></a>- </div>- <div class="btn-group">- <a class="do-help btn btn-default btn-sm" title="Help"><i class="fa fa-question"></i></a>- </div>- <div class="btn-group">- <a wicket:id="editLink" class="edit btn btn-default btn-sm" title="Edit"><i class="fa fa-font"></i></a>- <a class="preview btn btn-default btn-sm" title="Preview"><i class="fa fa-eye"></i></a>- <a wicket:id="splitLink" class="split btn btn-default btn-sm" title="Split view"><i wicket:id="icon" class="fa fa-columns"></i></a>- </div>- </div>- </div>- <div class="emojis"></div>- <div class="help">- <a href="https://guides.github.com/features/mastering-markdown/" target="_blank">GitHub flavored markdown</a> is accepted.- <span wicket:id="canAttachFile">You may drop file/image to the input box, or paste image from clipboard</span></div><div class="body clearfix"><div wicket:id="edit" class="edit">diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.cssindex fb7ee2a173..bb8f99330a 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css@@ -1,6 +1,9 @@.markdown-editor.compact-mode .normal-mode, .markdown-editor.normal-mode .compact-mode {display: none;}+body.fullscreen {+ overflow: hidden;+}.markdown-editor.fullscreen {position: absolute;left: 0;@@ -14,22 +17,43 @@transform: rotate(270deg);}-.markdown-editor>.warning {- margin-bottom: 8px;+.markdown-editor>.head>.warning {+ margin-bottom: 0;padding-top: 8px;padding-bottom: 8px;display: none;}+.markdown-editor>.head>.warning, .markdown-editor>.head>.help, .markdown-editor>.head>.emojis {+ margin: 4px;+}.markdown-editor>.head {- padding-bottom: 8px;+ border: 1px solid #CCC;+ border-bottom: none;+ border-radius: 4px 4px 0 0;+ padding: 4px;+}+.markdown-editor>.head>.actions>div>a {+ color: #777;+ padding: 2px;+ border: 1px solid white;+ border-radius: 2px;+ display: block;+ width: 24px;+ text-align: center;+ margin-right: 4px;}-.markdown-editor>.head .pull-left .btn-group {+.markdown-editor>.head>.actions .separator {+ display: block;+ border-left: 1px solid #CCC;margin-right: 4px;+ height: 24px;}-.markdown-editor>.head .pull-right .btn-group {- margin-left: 4px;+.markdown-editor>.head>.actions>div>a:hover, .markdown-editor>.head>.actions>div>a.active {+ background: #EEE;+ border: 1px solid #CCC;}-.markdown-editor>.head .dropdown .active:BEFORE {++.markdown-editor>.head>.actions .dropdown .active:BEFORE {font-family: "FontAwesome";content: "\f00c";position: absolute;@@ -42,24 +66,23 @@bottom: -3px;}-.markdown-editor>.emojis {- margin-bottom: 8px;+.markdown-editor>.head>.emojis {display: none;}-.markdown-editor>.emojis.loaded {+.markdown-editor>.head>.emojis.loaded {font-size: 12px;line-height: 24px;height: 200px;overflow: auto;}-.markdown-editor>.emojis.loading {+.markdown-editor>.head>.emojis.loading {font-size: 16px;color: #888;}-.markdown-editor>.emojis .emoji {+.markdown-editor>.head>.emojis .emoji {margin-right: 12px;}-.markdown-editor>.emojis .emoji img {+.markdown-editor>.head>.emojis .emoji img {width: 16px;height: 16px;}@@ -67,15 +90,14 @@opacity: 0.5;}-.markdown-editor>.help {- margin-bottom: 8px;+.markdown-editor>.head>.help {display: none;}.markdown-editor>.body>.preview>.markdown-rendered {- border: 1px solid #BBB;+ border: 1px solid #CCC;padding: 8px;- border-radius: 4px;+ border-radius: 0 0 4px 4px;background: white;}@@ -120,8 +142,8 @@}.markdown-editor>.body>.edit>textarea {- border: 1px solid #BBB;- border-radius: 4px;+ border: 1px solid #CCC;+ border-radius: 0 0 4px 4px;overflow: auto;width: 100%;display: block;@@ -134,16 +156,16 @@color: #999;}.markdown-editor.normal-mode.split-mode>.body>.edit>textarea {- border-radius: 4px 0 0 4px;+ border-radius: 0 0 0 4px;}.markdown-editor.normal-mode.split-mode>.body>.preview>.markdown-rendered {border-left: none;- border-radius: 0 4px 4px 0;+ border-radius: 0 0 4px 0;}.markdown-editor.compact-mode.split-mode>.body>.preview {margin-top: 8px;border-left: none;- border-radius: 0 4px 4px 0;+ border-radius: 0 0 4px 0;}.atwho-view .emoji {@@ -181,7 +203,7 @@}.insert-url input.url {- width: 480px;+ width: 470px;margin-right: 7px;}.insert-url .attachments {diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.jsindex 267578021b..0ecdbcdacb 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js@@ -18,9 +18,6 @@ gitplex.server.markdown = {var $container = $("#" + containerId);var $head = $container.children(".head");var $body = $container.children(".body");- var $emojis = $container.children(".emojis");- var $help = $container.children(".help");- var $warning = $container.children(".warning");var $edit = $body.children(".edit");var $input = $edit.children("textarea");var $preview = $body.children(".preview");@@ -32,12 +29,6 @@ gitplex.server.markdown = {height = $container.height();height -= $head.outerHeight();- if ($warning.is(":visible"))- height -= $warning.outerHeight(true);- if ($emojis.is(":visible"))- height -= $emojis.outerHeight(true);- if ($help.is(":visible"))- height -= $help.outerHeight(true);if ($container.hasClass("compact-mode")) {height = height/2;}@@ -54,9 +45,9 @@ gitplex.server.markdown = {var $editLink = $head.find(".edit");var $previewLink = $head.find(".preview");var $splitLink = $head.find(".split");- var $emojis = $container.children(".emojis");- var $help = $container.children(".help");- var $warning = $container.children(".warning");+ var $emojis = $head.children(".emojis");+ var $help = $head.children(".help");+ var $warning = $head.children(".warning");var $edit = $body.children(".edit");var $input = $edit.children("textarea");var $preview = $body.children(".preview");@@ -69,7 +60,6 @@ gitplex.server.markdown = {$editLink.click(function() {$container.removeClass("preview-mode").removeClass("split-mode").addClass("edit-mode");- $head.find(".pull-left .btn").removeAttr("disabled");$input.focus();$editLink.addClass("active");$previewLink.removeClass("active");@@ -79,7 +69,6 @@ gitplex.server.markdown = {});$previewLink.click(function() {$container.removeClass("edit-mode").removeClass("split-mode").addClass("preview-mode");- $head.find(".pull-left .btn").attr("disabled", "disabled");var caret = $input.caret();if ($input.val().substring(0, caret).trim().length == 0) {@@ -104,7 +93,6 @@ gitplex.server.markdown = {});$splitLink.click(function() {$container.removeClass("edit-mode").removeClass("preview-mode").addClass("split-mode");- $head.find(".pull-left .btn").removeAttr("disabled");$input.focus();@@ -466,6 +454,7 @@ gitplex.server.markdown = {$head.find(".do-fullscreen").click(function() {var $replacement = getReplacement();if ($container.hasClass("fullscreen")) {+ $("body").removeClass("fullscreen");$container.removeClass("fullscreen");var $placeholder = $("#" + containerId + "-placeholder");@@ -499,7 +488,7 @@ gitplex.server.markdown = {$resizeHandles.hide();var $placeholder = $("<div id='" + containerId + "-placeholder'></div>");$placeholder.insertAfter($replacement);- $("body").append($replacement);+ $("body").append($replacement).addClass("fullscreen");$(this).addClass("active");$(window).resize();}@@ -774,7 +763,7 @@ gitplex.server.markdown = {var $container = $("#" + containerId);var $head = $container.children(".head");var $body = $container.children(".body");- var $warning = $container.children(".warning");+ var $warning = $head.children(".warning");var $rendered = $body.find(">.preview>.markdown-rendered");var $input = $body.find(">.edit>textarea");var $resizeHandles = $container.find(".ui-resizable-handle");@@ -795,16 +784,6 @@ gitplex.server.markdown = {gitplex.server.markdown.fireInputEvent($input);}}-- /*- * Caret may moves to end of input when auto-saved value is restored, or loaded via Firefox. For better- * usage experience, we force it to change to begin of input while preserving previous focus- */- var prevActive = document.activeElement;- $input.caret(0);- if (prevActive)- $(prevActive).focus();- $input.scrollTop(0);},onRendered: function(containerId, html) {var $preview = $("#" + containerId + ">.body>.preview");@@ -870,7 +849,7 @@ gitplex.server.markdown = {var $body = $container.children(".body");var $edit = $body.children(".edit");var $input = $edit.children("textarea");- var $emojis = $container.children(".emojis");+ var $emojis = $head.children(".emojis");var $resizeHandles = $container.find(".ui-resizable-handle");var contentHtml = "";diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.cssindex f9ed1747c0..5399227f0f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css@@ -6,12 +6,8 @@}.blob-edit .markdown-editor>.head {- padding: 8px;-}-.blob-edit .markdown-editor>.emojis, .blob-edit .markdown-editor>.help {- padding-left: 8px;- padding-right: 8px;-}+ border: none;+}.blob-edit .markdown-editor>.body>.edit>textarea,.blob-edit .markdown-editor>.body>.preview>.markdown-rendered {border-radius: 0 !important;@@ -27,7 +23,4 @@.blob-edit .markdown-editor>.body>.preview>.markdown-rendered {border-bottom: none;border-left: none;-}-.blob-edit .markdown-editor>.warning {- margin: 8px 8px 0 8px;-}+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.javaindex 670b50d057..e4a08aa034 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java@@ -75,6 +75,7 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.CommentPos;import com.gitplex.server.model.support.CompareContext;import com.gitplex.server.model.support.TextRange;+import com.gitplex.server.search.SearchManager;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;@@ -150,13 +151,19 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searcsuper(id, context);Blob blob = context.getDepot().getBlob(context.getBlobIdent());- Preconditions.checkArgument(blob.getText() != null);String blobName = context.getBlobIdent().getName();SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);if (extractor != null) {try {- symbols.addAll(extractor.extract(null, blob.getText().getContent()));+ SearchManager searchManager = GitPlex.getInstance(SearchManager.class);+ List<Symbol> cachedSymbols = searchManager.getSymbols(context.getDepot(), blob.getBlobId(),+ blob.getIdent().path);+ if (cachedSymbols != null)+ symbols.addAll(cachedSymbols);+ else {+ symbols.addAll(extractor.extract(null, blob.getText().getContent()));+ }} catch (ExtractException e) {logger.debug("Error extracting symbols from blob: " + context.getBlobIdent(), e);}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.htmlindex 11136a3784..169036d492 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html@@ -9,7 +9,7 @@<td wicket:id="content" class="content"></td></tr></table>- <div wicket:id="addComment" class="add-comment">+ <div wicket:id="addComment" class="add-comment no-autofocus"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="input" placeholder="Leave a comment"></div>diff --git a/web/src/main/java/com/gitplex/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.javanew file mode 100644index 0000000000..f253ec3381--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java@@ -0,0 +1,30 @@+package com.gitplex.server.web.util.resourcebundle;++import java.util.List;++import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.IReferenceHeaderItem;+import org.apache.wicket.resource.bundles.ConcatResourceBundleReference;++@SuppressWarnings("serial")+public class CachedDependenciesConcatResourceBundleReference<T extends HeaderItem & IReferenceHeaderItem>+ extends ConcatResourceBundleReference<T> {++ private List<HeaderItem> dependencies;++ public CachedDependenciesConcatResourceBundleReference(Class<?> scope, String name, List<T> resources) {+ super(scope, name, resources);+ }++ @Override+ public List<HeaderItem> getDependencies() {+ if (dependencies == null) {+ synchronized (this) {+ if (dependencies == null)+ dependencies = super.getDependencies();+ }+ }+ return dependencies;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.javaindex 370a3b3148..d3d16dfb1d 100644--- a/web/src/main/java/com/gitplex/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java@@ -7,7 +7,6 @@ import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.resource.ITextResourceCompressor;import org.apache.wicket.resource.bundles.ConcatBundleResource;-import org.apache.wicket.resource.bundles.ConcatResourceBundleReference;import org.apache.wicket.util.io.ByteArrayOutputStream;import org.apache.wicket.util.io.IOUtils;import org.apache.wicket.util.resource.IResourceStream;@@ -15,7 +14,7 @@ import org.apache.wicket.util.resource.ResourceStreamNotFoundException;@SuppressWarnings("serial")public class JavaScriptConcatResourceBundleReference- extends ConcatResourceBundleReference<JavaScriptReferenceHeaderItem> {+ extends CachedDependenciesConcatResourceBundleReference<JavaScriptReferenceHeaderItem> {public JavaScriptConcatResourceBundleReference(Class<?> scope, String name, List<JavaScriptReferenceHeaderItem> resources) {super(scope, name, resources);diff --git a/web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundleReferences.java b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundleReferences.javaindex 072e7aed09..43ba866182 100644--- a/web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundleReferences.java+++ b/web/src/main/java/com/gitplex/server/web/util/resourcebundle/ResourceBundleReferences.java@@ -115,11 +115,15 @@ public class ResourceBundleReferences {}}- if (!javaScriptResourceReferences.isEmpty())- javaScriptBundleReferences.add(new JavaScriptConcatResourceBundleReference(scope, name + ".js", javaScriptResourceReferences));+ if (!javaScriptResourceReferences.isEmpty()) {+ javaScriptBundleReferences.add(new JavaScriptConcatResourceBundleReference(+ scope, name + ".js", javaScriptResourceReferences));+ }- if (!cssResourceReferences.isEmpty())- cssBundleReferences.add(new ConcatResourceBundleReference<CssReferenceHeaderItem>(scope, name + ".css", cssResourceReferences));+ if (!cssResourceReferences.isEmpty()) {+ cssBundleReferences.add(new CachedDependenciesConcatResourceBundleReference<CssReferenceHeaderItem>(+ scope, name + ".css", cssResourceReferences));+ }}private Set<ResourceReference> includeSoleDependencies(Set<ResourceReference> dependents) {