From fb380fb07b93319a10a52f60d949f67c44890dd7 Mon Sep 17 00:00:00 2001 From: User Date: Wed, 6 Sep 2017 15:40:03 +0800 Subject: [PATCH 1/3] Update BlobPage.java --- src/main/java/com/gitblit/wicket/pages/BlobPage.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java index 1ef8f227b..eea6f56b8 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobPage.java +++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java @@ -57,6 +57,12 @@ public BlobPage(PageParameters params) { throw new RedirectException(TreePage.class, WicketUtils.newRepositoryParameter(repositoryName)); } + //add blob edit link + BookmarkablePageLink editDocLink = new BookmarkablePageLink<>("editDocLink", EditFilePage.class, + WicketUtils.newPathParameter(repositoryName, objectId, blobPath)); + editDocLink.setEnabled(false); + add(editDocLink); + if (StringUtils.isEmpty(blobPath)) { // blob by objectid @@ -142,6 +148,8 @@ public BlobPage(PageParameters params) { add(new Label("blobText", table).setEscapeModelStrings(false)); add(new Image("blobImage").setVisible(false)); fileExtension = extension; + //set blob edit link enable + editDocLink.setEnabled(true); } } else { // plain text @@ -155,6 +163,8 @@ public BlobPage(PageParameters params) { } add(new Label("blobText", table).setEscapeModelStrings(false)); add(new Image("blobImage").setVisible(false)); + //set blob edit link enable + editDocLink.setEnabled(true); } } } From 500a5d1a7440bc91519368e551073ad80be79e65 Mon Sep 17 00:00:00 2001 From: User Date: Wed, 6 Sep 2017 15:41:48 +0800 Subject: [PATCH 2/3] Update BlobPage.html --- src/main/java/com/gitblit/wicket/pages/BlobPage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.html b/src/main/java/com/gitblit/wicket/pages/BlobPage.html index 289c14981..1e6965072 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobPage.html +++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.html @@ -45,7 +45,7 @@ @@ -62,4 +62,4 @@ - \ No newline at end of file + From fc84ab9b07182372e3e95c6c9b15cee3c7b143a3 Mon Sep 17 00:00:00 2001 From: User Date: Wed, 6 Sep 2017 15:46:50 +0800 Subject: [PATCH 3/3] Update editor.dev.js --- src/main/js/editor.dev.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/js/editor.dev.js b/src/main/js/editor.dev.js index bbe67d3cb..6cc31d204 100644 --- a/src/main/js/editor.dev.js +++ b/src/main/js/editor.dev.js @@ -6,6 +6,11 @@ attachDocumentEditor = function (editorElement, commitDialogElement) require("./prosemirror/dist/markdown") var _menu = require("./prosemirror/dist/menu/menu") + var link = window.location.href; + var extIdx = link.lastIndexOf('.'); + var ext = extIdx > 0 && (extIdx > link.length - 8) ? link.substring(extIdx+1) : ""; + //FIXME It work, but is not a good idea. + var isMd=(ext=='md'||ext=='mkd'||ext=='markdown'||ext=='MD'||ext=='MKD'); var content = document.querySelector('#editor'); content.style.display = "none"; @@ -15,7 +20,9 @@ attachDocumentEditor = function (editorElement, commitDialogElement) var textCommands = new _menu.MenuCommandGroup("textCommands"); var insertCommands = new _menu.MenuCommandGroup("insertCommands"); - var menuItems = [gitblitCommands, viewCommands, textCommands, _menu.inlineGroup, _menu.blockGroup, _menu.historyGroup, insertCommands]; + var menuItems = isMd ? + [gitblitCommands, viewCommands, textCommands, _menu.inlineGroup, _menu.blockGroup, _menu.historyGroup, insertCommands] + : [gitblitCommands, viewCommands, _menu.historyGroup]; const updateCmd = Object.create(null); @@ -23,7 +30,7 @@ attachDocumentEditor = function (editorElement, commitDialogElement) label: "GitblitCommit", run: function() { commitDialogElement.modal({show:true}); - editorElement.value = pm.getContent('markdown'); + editorElement.value = isMd ? pm.getContent('markdown') : pm.getContent('text'); }, menu: { group: "gitblitCommands", rank: 10, @@ -214,7 +221,7 @@ attachDocumentEditor = function (editorElement, commitDialogElement) doc: content.value, menuBar: { float:true, content: menuItems}, commands: edit.CommandSet.default.update(updateCmd), - docFormat: "markdown" + docFormat: isMd ? "markdown" : "text" });