Skip to content

Commit 42aaf6d

Browse files
committed
Fixed css properties not changed after code editor changes.
Show server response as message on page save error.
1 parent ffa4f96 commit 42aaf6d

File tree

1 file changed

+34
-10
lines changed

1 file changed

+34
-10
lines changed

public/js/vvvebjs/builder.js

+34-10
Original file line numberDiff line numberDiff line change
@@ -2093,6 +2093,7 @@ Vvveb.Builder = {
20932093
doc.querySelectorAll("[contenteditable]").forEach(e => e.removeAttribute("contenteditable"));
20942094
doc.querySelectorAll("[spellcheckker]").forEach(e => e.removeAttribute("spellcheckker"));
20952095
doc.querySelectorAll('script[src^="chrome-extension://"]').forEach(e => e.remove());
2096+
doc.querySelectorAll('script[src^="moz-extension://"]').forEach(e => e.remove());
20962097

20972098
// scroll page to top to avoid saving the page in a different state
20982099
// like saving with sticky classes set for navbar etc
@@ -2223,8 +2224,8 @@ Vvveb.Builder = {
22232224
body: nestedFormData(data)
22242225
})
22252226
.then((response) => {
2226-
if (!response.ok) { throw new Error(response) }
2227-
return response.json()
2227+
if (!response.ok) { return Promise.reject(response); }
2228+
return response.json();
22282229
})
22292230
.then((data) => {
22302231
if (callback) callback(data);
@@ -2233,7 +2234,13 @@ Vvveb.Builder = {
22332234
})
22342235
.catch((err) => {
22352236
if (error) error(err);
2236-
displayToast("bg-danger", "Error", "Error saving!");
2237+
let message = error.statusText ?? "Error saving!";
2238+
displayToast("bg-danger", "Error", message);
2239+
2240+
err.text().then( errorMessage => {
2241+
let message = errorMessage.substr(0, 200);
2242+
displayToast("bg-danger", "Error", message);
2243+
})
22372244
});
22382245
},
22392246

@@ -2475,8 +2482,8 @@ Vvveb.Gui = {
24752482
}, (error) => {
24762483
document.querySelector(".loading", btn).classList.toggle("d-none");
24772484
document.querySelector(".button-text", btn).classList.toggle("d-none");
2478-
2479-
displayToast("bg-danger", "Error", "Error saving!");
2485+
let message = error.statusText ?? "Error saving!";
2486+
displayToast("bg-danger", "Error", message);
24802487
});
24812488
},
24822489

@@ -2677,9 +2684,11 @@ Vvveb.StyleManager = {
26772684
cssContainer:false,
26782685
mobileWidth: '320px',
26792686
tabletWidth: '768px',
2687+
doc:false,
26802688

26812689
init: function(doc) {
26822690
if (doc) {
2691+
this.doc = doc;
26832692

26842693
let style = false;
26852694
let _style = false;
@@ -2844,6 +2853,9 @@ Vvveb.StyleManager = {
28442853
//this.cssContainer.innerHTML = css;
28452854

28462855
//return element;
2856+
//refresh container element to avoid issues with changes from code editor
2857+
this.cssContainer = this.doc.getElementById("vvvebjs-styles");
2858+
28472859
let css = "";
28482860
for (media in this.styles) {
28492861
if (media === "tablet" || media === "mobile") {
@@ -3556,7 +3568,7 @@ Vvveb.FileManager = {
35563568

35573569
fetch(deleteFileUrl, {method: "POST", body: new URLSearchParams({file:page.file,post_id})})
35583570
.then((response) => {
3559-
if (!response.ok) { throw new Error(response) }
3571+
if (!response.ok) { return Promise.reject(response); }
35603572
return response.json()
35613573
})
35623574
.then((data) => {
@@ -3570,8 +3582,14 @@ Vvveb.FileManager = {
35703582
displayToast(bg, "Delete", data.message ?? data);
35713583
})
35723584
.catch(error => {
3573-
console.log(error.statusText);
3574-
displayToast("bg-danger", "Error", "Error deleting page!");
3585+
console.log(error);
3586+
let message = error.statusText ?? "Error deleting page!";
3587+
displayToast("bg-danger", "Error", message);
3588+
3589+
err.text().then( errorMessage => {
3590+
let message = errorMessage.substr(0, 200);
3591+
displayToast("bg-danger", "Error", message);
3592+
})
35753593
});
35763594

35773595
element.remove();
@@ -3606,7 +3624,7 @@ Vvveb.FileManager = {
36063624

36073625
fetch(renameFileUrl, {method: "POST", body: new URLSearchParams({file:page.file, newfile:newfile, name, duplicate, post_id})})
36083626
.then((response) => {
3609-
if (!response.ok) { throw new Error(response) }
3627+
if (!response.ok) { return Promise.reject(response); }
36103628
return response.json()
36113629
})
36123630
.then((data) => {
@@ -3640,7 +3658,13 @@ Vvveb.FileManager = {
36403658
})
36413659
.catch(error => {
36423660
console.log(error);
3643-
displayToast("bg-danger", "Error", "Error renaming page!");
3661+
let message = error.statusText ?? "Error renaming page!";
3662+
displayToast("bg-danger", "Error", message);
3663+
3664+
err.text().then( errorMessage => {
3665+
let message = errorMessage.substr(0, 200);
3666+
displayToast("bg-danger", "Error", message);
3667+
})
36443668
});
36453669
}
36463670
}

0 commit comments

Comments
 (0)