Skip to content

Commit

Permalink
Fixed css properties not changed after code editor changes #358
Browse files Browse the repository at this point in the history
Show server response as message on page save error.
  • Loading branch information
givanz committed Jun 23, 2024
1 parent 06eb349 commit 63d80f7
Showing 1 changed file with 39 additions and 8 deletions.
47 changes: 39 additions & 8 deletions libs/builder/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,8 @@ Vvveb.Builder = {
let pos;
let target;

highlightBox.style.display = "none";

if (self.selectedEl) {
pos = offset(self.selectedEl);
target = self.selectedEl;
Expand Down Expand Up @@ -2036,6 +2038,7 @@ Vvveb.Builder = {
doc.querySelectorAll("[contenteditable]").forEach(e => e.removeAttribute("contenteditable"));
doc.querySelectorAll("[spellcheckker]").forEach(e => e.removeAttribute("spellcheckker"));
doc.querySelectorAll('script[src^="chrome-extension://"]').forEach(e => e.remove());
doc.querySelectorAll('script[src^="moz-extension://"]').forEach(e => e.remove());

// scroll page to top to avoid saving the page in a different state
// like saving with sticky classes set for navbar etc
Expand Down Expand Up @@ -2184,7 +2187,7 @@ Vvveb.Builder = {
body: nestedFormData(data)
})
.then((response) => {
if (!response.ok) { throw new Error(response) }
if (!response.ok) { return Promise.reject(response); }
return response.text();
})
.then((data) => {
Expand All @@ -2194,7 +2197,13 @@ Vvveb.Builder = {
})
.catch((err) => {
if (error) error(err);
displayToast("bg-danger", "Error", "Error saving!");
let message = error.statusText ?? "Error saving!";
displayToast("bg-danger", "Error", message);

err.text().then( errorMessage => {
let message = errorMessage.substr(0, 200);
displayToast("bg-danger", "Error", message);
})
});
},

Expand Down Expand Up @@ -2416,8 +2425,13 @@ Vvveb.Gui = {
}, (error) => {
document.querySelector(".loading", btn).classList.toggle("d-none");
document.querySelector(".button-text", btn).classList.toggle("d-none");

displayToast("bg-danger", "Error", "Error saving!");
let message = error.statusText ?? "Error saving!";
displayToast("bg-danger", "Error", message);

error.text().then( errorMessage => {
let message = errorMessage.substr(0, 200);
displayToast("bg-danger", "Error", message);
})
});
},

Expand Down Expand Up @@ -2637,9 +2651,11 @@ Vvveb.StyleManager = {
cssContainer:false,
mobileWidth: '320px',
tabletWidth: '768px',
doc:false,

init: function(doc) {
if (doc) {
this.doc = doc;

let style = false;
let _style = false;
Expand Down Expand Up @@ -2802,6 +2818,9 @@ Vvveb.StyleManager = {
//this.cssContainer.innerHTML = css;

//return element;
//refresh container element to avoid issues with changes from code editor
this.cssContainer = this.doc.getElementById("vvvebjs-styles");

let css = "";
for (media in this.styles) {
if (media === "tablet" || media === "mobile") {
Expand Down Expand Up @@ -3503,7 +3522,7 @@ Vvveb.FileManager = {

fetch(deleteUrl, {method: "POST", body: new URLSearchParams({file:page.file})})
.then((response) => {
if (!response.ok) { throw new Error(response) }
if (!response.ok) { return Promise.reject(response); }
return response.text()
})
.then((data) => {
Expand All @@ -3518,7 +3537,13 @@ Vvveb.FileManager = {
})
.catch(error => {
console.log(error.statusText);
displayToast("bg-danger", "Error", "Error deleting page!");
let message = error.statusText ?? "Error deleting page!";
displayToast("bg-danger", "Error", message);

err.text().then( errorMessage => {
let message = errorMessage.substr(0, 200);
displayToast("bg-danger", "Error", message);
})
});

element.remove();
Expand All @@ -3541,7 +3566,7 @@ Vvveb.FileManager = {

fetch(renameUrl, {method: "POST", body: new URLSearchParams({file:page.file, newfile:newfile, duplicate})})
.then((response) => {
if (!response.ok) { throw new Error(response) }
if (!response.ok) { return Promise.reject(response); }
return response.text()
})
.then((data) => {
Expand Down Expand Up @@ -3573,7 +3598,13 @@ Vvveb.FileManager = {
})
.catch(error => {
console.log(error);
displayToast("bg-danger", "Error", "Error renaming page!");
let message = error.statusText ?? "Error renaming page!";
displayToast("bg-danger", "Error", message);

err.text().then( errorMessage => {
let message = errorMessage.substr(0, 200);
displayToast("bg-danger", "Error", message);
})
});
}
}
Expand Down

0 comments on commit 63d80f7

Please sign in to comment.