Skip to content

Commit 3502304

Browse files
committed
fix: fix and format sidebar
1 parent ef2495c commit 3502304

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

wiki/public/js/editor.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const editorContainer = document.getElementById("wiki-editor");
66
const previewContainer = $("#preview-container");
77
const previewToggleBtn = $("#toggle-btn");
88
const wikiTitleInput = $(".wiki-title-input");
9-
const editWikiBtn = $(".edit-wiki-btn");
9+
const editWikiBtn = $(".edit-wiki-btn, .sidebar-edit-mode-btn");
1010
const saveWikiPageBtn = document.querySelector(
1111
'[data-wiki-button="saveWikiPage"]',
1212
);
@@ -45,6 +45,7 @@ previewToggleBtn.on("click", function () {
4545
markdown: editor.getValue(),
4646
},
4747
callback: (r) => {
48+
console.log(r.message);
4849
previewContainer.html(`<h1>${wikiTitleInput.val()}</h1>` + r.message);
4950
},
5051
});

wiki/public/js/render_wiki.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import HtmlDiff from "htmldiff-js";
22

33
function setSortable() {
4+
if (window.innerWidth < 768) {
5+
return;
6+
}
47
new Sortable(this, {
58
group: {
69
name: "qux",
710
put: ["qux"],
811
pull: ["qux"],
912
},
1013
swapThreshold: 0.7,
11-
filter: ["draggable", "true"],
14+
filter: ".draggable",
1215
onEnd: function (e) {
1316
frappe.utils.debounce(() => {
1417
frappe.call({
@@ -48,7 +51,7 @@ function toggleEditor() {
4851
$(".wiki-footer").toggleClass("hide");
4952
$(".page-toc").toggleClass("hide");
5053
$(".remove-sidebar-item").toggleClass("hide");
51-
$(".sidebar-item, .sidebar-group").attr("draggable", "true");
54+
$(".sidebar-item, .sidebar-group").toggleClass("draggable");
5255
$(".drop-icon").toggleClass("hide");
5356
$(".add-sidebar-page").toggleClass("hide");
5457
$(".add-sidebar-group, .sidebar-view-mode-btn").toggleClass("hide");
@@ -237,6 +240,8 @@ window.RenderWiki = class RenderWiki extends Wiki {
237240
}
238241

239242
set_edit_mode() {
243+
$(".sidebar-item, .sidebar-group").addClass("draggable");
244+
240245
$(".web-sidebar ul").each(setSortable);
241246

242247
frappe.call({
@@ -509,7 +514,7 @@ window.RenderWiki = class RenderWiki extends Wiki {
509514
get_wiki_sidebar_html(title) {
510515
return $(`
511516
<li class="sidebar-group" data-type="Wiki Sidebar"
512-
data-name="new-sidebar" data-new=1 data-title="${title}" draggable="false">
517+
data-name="new-sidebar" data-new=1 data-title="${title}">
513518
<div class="collapsible">
514519
<span class="text-sm">${title}</span>
515520
<span class='add-sidebar-page'>

0 commit comments

Comments
 (0)