archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

fix: Markdown editor labels are broken (OD-2559)

Browse Source
This commit is contained in:
Robin Shen 2025-09-25 20:03:26 +08:00
parent 6158adefe2
commit a77172ef43
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
View File

@ -90,12 +90,12 @@ onedev.server.markdown = {
$head.find(".dropdown>a").dropdown(); $head.find(".dropdown>a").dropdown();
if ($suggestion.attr("disabled") == "disabled") { if ($suggestion.attr("disabled") == "disabled") {
$suggestion.attr("title", onedev.server.markdown.translations["commented-code-outdated"]); $suggestion.attr("data-tippy-content", onedev.server.markdown.translations["commented-code-outdated"]);
} else { } else {
if (onedev.server.util.isMac()) if (onedev.server.util.isMac())
$suggestion.attr("title", onedev.server.markdown.translations["suggest-changes"] + " (cmd-g)"); $suggestion.attr("data-tippy-content", onedev.server.markdown.translations["suggest-changes"] + " (cmd-g)");
else else
$suggestion.attr("title", onedev.server.markdown.translations["suggest-changes"] + " (ctrl-g)"); $suggestion.attr("data-tippy-content", onedev.server.markdown.translations["suggest-changes"] + " (ctrl-g)");
$suggestion.click(function() { $suggestion.click(function() {
var content = $(this).data("content"); var content = $(this).data("content");
@ -941,9 +941,10 @@ onedev.server.markdown = {
var $action = $actionMenu.find(selector); var $action = $actionMenu.find(selector);
if ($actionMenu.closest(".floating").length != 0) if ($actionMenu.closest(".floating").length != 0)
$action.append("<span class='float-right ml-4 text-monospace font-size-sm'>" + prefix + key + "</span>"); $action.append("<span class='float-right ml-4 text-monospace font-size-sm'>" + prefix + key + "</span>");
else else
$action.attr("title", $action.attr("title") + " (" + prefix + key + ")"); $action.attr("data-tippy-content", $action.data("tippy-content") + " (" + prefix + key + ")");
} }
}, },
onLoad: function(containerId) { onLoad: function(containerId) {
var $container = $("#" + containerId); var $container = $("#" + containerId);
@ -1305,17 +1306,21 @@ onedev.server.markdown = {
var contentHtml = ""; var contentHtml = "";
for (var i in emojis) { for (var i in emojis) {
var emoji = emojis[i]; var emoji = emojis[i];
contentHtml += "<a class='emoji' title='" + emoji.name + "'>" + emoji.unicode + "</a> "; contentHtml += "<a class='emoji' data-tippy-content='" + emoji.name + "'>" + emoji.unicode + "</a> ";
} }
$emojis.html(contentHtml); $emojis.html(contentHtml);
$emojis.removeClass("loading"); $emojis.removeClass("loading");
$emojis.addClass("loaded"); $emojis.addClass("loaded");
tippy($emojis[0].querySelectorAll('.emoji'), {
delay: [500, 0],
placement: 'auto'
});
$emojis.find(".emoji").click(function() { $emojis.find(".emoji").click(function() {
if (!$edit.is(":visible")) if (!$edit.is(":visible"))
return; return;
$input.focus(); $input.focus();
var prefix = onedev.server.markdown.getAtWhoPrefix($input); var prefix = onedev.server.markdown.getAtWhoPrefix($input);
document.execCommand("insertText", false, prefix + ":" + $(this).attr("title") + ": "); document.execCommand("insertText", false, prefix + ":" + $(this).data("tippy-content") + ": ");
onedev.server.markdown.fireInputEvent($input); onedev.server.markdown.fireInputEvent($input);
}); });
}, },