Skip to content

Commit fa2d148

Browse files
committed
Removed adjustList, list height is set from css now.
Fixed On opening Editor right side panel show JS error #156 Fixed clicking on save or Save As button keep loader spinning #157
1 parent fc9138f commit fa2d148

File tree

2 files changed

+42
-52
lines changed

2 files changed

+42
-52
lines changed

public/js/vvvebjs/builder.js

+41-51
Original file line numberDiff line numberDiff line change
@@ -867,13 +867,7 @@ Vvveb.Builder = {
867867

868868
self.highlightEnabled = true;
869869

870-
self.leftPanelWidth = document.getElementById("left-panel").width;
871-
872-
self.adjustListsHeight();
873-
874-
window.addEventListener("scroll resize", function(event) {
875-
self.adjustListsHeight();
876-
});
870+
self.leftPanelWidth = document.getElementById("left-panel").clientWidth;
877871
},
878872

879873
/* controls */
@@ -1064,32 +1058,6 @@ Vvveb.Builder = {
10641058
});
10651059
},
10661060

1067-
adjustListsHeight: function () {
1068-
let left = document.querySelectorAll("#left-panel .drag-elements-sidepane > div:not(.block-preview), #left-panel .component-properties > .tab-content");
1069-
let right = document.querySelectorAll("#right-panel .drag-elements-sidepane > div:not(.block-preview), #right-panel .component-properties > .tab-content");
1070-
let wHeight = window.outerHeight;
1071-
let maxOffset = 0;
1072-
1073-
function adjust(elements) {
1074-
elements.forEach(function (e,i) {
1075-
e.style.height = "";
1076-
let offset = Math.floor(e.getBoundingClientRect()["top"]);
1077-
if (offset >= wHeight) return;
1078-
maxOffset = Math.max(maxOffset, offset);
1079-
let height = wHeight - maxOffset;
1080-
if (!offset) {
1081-
height += parseInt(e.dataset.offset ?? 0);
1082-
}
1083-
e.style.height = height + "px";
1084-
});
1085-
}
1086-
1087-
adjust(left);
1088-
maxOffset = 0;
1089-
adjust(right);
1090-
},
1091-
1092-
10931061
loadUrl : function(url, callback) {
10941062
let self = this;
10951063
document.getElementById("select-box").style.display = "none";
@@ -1492,7 +1460,7 @@ Vvveb.Builder = {
14921460
try {
14931461
if ((pos.top < (y - halfHeight)) || (pos.left < (x - halfWidth))) {
14941462
if (noChildren[parentTagName]) {
1495-
self.dragElement.after(parent);
1463+
parent.after(self.dragElement);
14961464
} else {
14971465
if (parent == self.dragElement.parenNode) {
14981466
parent.appendChild(self.dragElement);
@@ -2229,7 +2197,7 @@ Vvveb.Builder = {
22292197
})
22302198
.catch((err) => {
22312199
if (error) error(err);
2232-
let message = error?.statusText ?? "Error saving!";
2200+
let message = err?.statusText ?? "Error saving!";
22332201
displayToast("bg-danger", "Error", message);
22342202

22352203
if (err.hasOwnProperty('text')) err.text().then( errorMessage => {
@@ -2415,7 +2383,7 @@ Vvveb.Gui = {
24152383

24162384
//show modal with html content
24172385
save : function () {
2418-
document.getElementById('textarea-modal textarea').val(Vvveb.Builder.getHtml());
2386+
document.getElementById('textarea-modal textarea').value = Vvveb.Builder.getHtml();
24192387
document.getElementById('textarea-modal').modal();
24202388
},
24212389

@@ -2432,10 +2400,22 @@ Vvveb.Gui = {
24322400
page = page ? page : "new-template";
24332401
page += ".html";
24342402

2435-
document.querySelector("#save-offcanvas [data-v-filename]").text(filename);
2436-
document.querySelector("#save-offcanvas input[data-v-filename]").val(filename);
2437-
document.querySelector("#save-offcanvas [data-v-basename]").val(page);
2438-
document.querySelector("#save-offcanvas [data-v-theme-folders]").val(folder);
2403+
let safeOffcanvas = document.querySelector("#save-offcanvas");
2404+
let element;
2405+
2406+
if (element = safeOffcanvas.querySelector("[data-v-filename]")) {
2407+
element.textContent = filename;
2408+
}
2409+
if (element = safeOffcanvas.querySelector("input[data-v-filename]")) {
2410+
element.value = filename;
2411+
}
2412+
if (element = safeOffcanvas.querySelector("[data-v-basename]")) {
2413+
element.value = page;
2414+
}
2415+
if (element = safeOffcanvas.querySelector("[data-v-theme-folders]")) {
2416+
element.value = folder;
2417+
}
2418+
24392419
Vvveb.ChangeManager.render();
24402420
},
24412421

@@ -2451,8 +2431,8 @@ Vvveb.Gui = {
24512431
}
24522432
}
24532433

2454-
btn.querySelector(".loading").classList.toggle("d-none");
2455-
btn.querySelector(".button-text").classList.toggle("d-none");
2434+
btn.querySelector(".loading").classList.remove("d-none");
2435+
btn.querySelector(".button-text").classList.add("d-none");
24562436

24572437
return Vvveb.Builder.saveAjax({file}, saveUrl, (data) => {
24582438
//use toast to show save status
@@ -2469,14 +2449,14 @@ Vvveb.Gui = {
24692449
const offcanvas = document.getElementById('save-offcanvas');
24702450
if (offcanvas) {
24712451
let instance = bootstrap.Offcanvas.getInstance(offcanvas);
2472-
if (instance) instance.style.display = "none";
2452+
if (instance) instance.hide();
24732453
}
24742454

2475-
document.querySelector(".loading", btn).classList.toggle("d-none");
2476-
document.querySelector(".button-text", btn).classList.toggle("d-none");
2455+
btn.querySelector(".loading").classList.add("d-none");
2456+
btn.querySelector(".button-text").classList.remove("d-none");
24772457
}, (error) => {
2478-
document.querySelector(".loading", btn).classList.toggle("d-none");
2479-
document.querySelector(".button-text", btn).classList.toggle("d-none");
2458+
btn.querySelector(".loading").classList.add("d-none");
2459+
btn.querySelector(".button-text").classList.remove("d-none");
24802460
let message = error?.statusText ?? "Error saving!";
24812461
displayToast("bg-danger", "Error", message);
24822462
});
@@ -2639,7 +2619,6 @@ Vvveb.Gui = {
26392619
visible = true;
26402620
}
26412621

2642-
Vvveb.Builder.adjustListsHeight();
26432622
return visible;
26442623
},
26452624

@@ -2666,7 +2645,6 @@ Vvveb.Gui = {
26662645
bsTab.show();
26672646
}
26682647

2669-
Vvveb.Builder.adjustListsHeight();
26702648
},
26712649

26722650
toggleTreeList: function () {
@@ -2676,6 +2654,18 @@ Vvveb.Gui = {
26762654
document.getElementById("toggle-tree-list").classList.remove("active");
26772655
}
26782656
},
2657+
2658+
zoomChange: function () {
2659+
let wrapper = document.getElementById("iframe-wrapper");
2660+
let scale = "";
2661+
let height = "";
2662+
if (this.value != "100") {
2663+
scale = "scale(" + this.value + "%)";
2664+
height = ((100 / this.value) * 100) + "%";
2665+
}
2666+
wrapper.style.transform = scale;
2667+
wrapper.style.height = height;
2668+
}
26792669
}
26802670

26812671
Vvveb.StyleManager = {
@@ -2926,11 +2916,11 @@ Vvveb.ContentManager = {
29262916
},
29272917

29282918
setText: function(element, text) {
2929-
return element.text(text);
2919+
return element.textContent = text;
29302920
},
29312921

29322922
getText: function(element) {
2933-
return element.text();
2923+
return element.textContent;
29342924
},
29352925
};
29362926

0 commit comments

Comments
 (0)