Skip to content

Commit

Permalink
Select box adjust size on window resize.
Browse files Browse the repository at this point in the history
Added view page link to file manager.
Fixed rename file url.
  • Loading branch information
givanz committed Jun 10, 2024
1 parent 6f1dcbd commit ec44917
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 23 deletions.
2 changes: 1 addition & 1 deletion demo/landing
Submodule landing updated 69 files
+1 −0 about.html
+1 −0 blank-breadcrumb.html
+1 −0 blank.html
+1 −0 blocks/contact-form/contact-form-1.html
+1 −0 blocks/contact-form/contact-form-appointment.html
+1 −0 blocks/contact-form/contact-form-reservation.html
+1 −0 cart/cart.html
+1 −0 cart/compare.html
+7 −8 checkout/checkout.html
+1 −0 checkout/confirm.html
+1 −0 checkout/order.html
+2 −0 contact.html
+1 −0 content/archive.html
+1 −0 content/category.html
+1 −0 content/index.html
+1 −0 content/page.html
+1 −0 content/post-image-header.html
+1 −0 content/post-image-hero.html
+1 −0 content/post.html
+1 −0 content/tag.html
+1 −0 content/user.html
+1 −0 css/custom.css
+1 −0 download.html
+1 −0 error404.html
+1 −0 error500.html
+1 −0 index-blog.html
+1 −0 index-excerpts.html
+1 −0 index-landing.html
+2 −0 index-nav-hero.html
+1 −0 index-no-sidebar.html
+2 −0 index-slider.html
+1 −0 index.coming-soon.html
+2 −0 index.html
+1 −0 index.maintenance.html
+11 −2 js/checkout.js
+1 −0 portfolio.html
+1 −0 pricing.html
+1 −0 product/category.html
+1 −0 product/index.html
+1 −0 product/manufacturer.html
+1 −0 product/product.html
+1 −0 product/vendor.html
+1 −0 search/index.html
+1 −0 services.html
+1 −0 src/_includes/html-head.html
+1 −0 src/blocks/contact-form/contact-form-1.html
+2 −1 src/blocks/contact-form/contact-form-appointment.html
+2 −1 src/blocks/contact-form/contact-form-reservation.html
+3 −3 src/checkout/_payment.html
+3 −3 src/checkout/_shipping.html
+1 −0 src/contact.html
+1 −0 src/sections/contact-form/contact-form-6.html
+1 −0 user/address.html
+1 −0 user/address/edit.html
+1 −0 user/comments.html
+1 −0 user/downloads.html
+1 −0 user/edit.html
+1 −0 user/index.html
+1 −0 user/login.html
+1 −0 user/order-tracking.html
+1 −0 user/order.html
+1 −0 user/orders.html
+1 −0 user/orders/order.html
+1 −0 user/profile.html
+1 −0 user/reset.html
+1 −0 user/reset/reset.html
+1 −0 user/return-form.html
+1 −0 user/signup.html
+1 −0 user/wishlist.html
3 changes: 2 additions & 1 deletion editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -1358,8 +1358,9 @@ <h6 class="header">{%=header%}</h6>
<span>{%=title%}</span>
<div class="file-actions">
<button href="#" class="delete btn btn-outline-danger" title="Delete"><i class="la la-trash"></i></button>
<a href="{%=url%}" target="_blank" class="view btn btn-outline-primary" title="View page"><i class="la la la-external-link-alt"></i></a>
<button href="#" class="rename btn btn-outline-primary" title="Rename"><i class="la la-pen"></i></button>
<button href="#" class="duplicate btn btn-outline-primary" title="Clone"><i class="icon-copy-outline"></i></button>
<button href="#" class="duplicate btn btn-outline-primary" title="Duplicate"><i class="icon-copy-outline"></i></button>
</div>
</label> <input type="checkbox" id="{%=name%}" />
<!-- <ol></ol> -->
Expand Down
45 changes: 24 additions & 21 deletions libs/builder/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,6 @@ Vvveb.Components = {
element = selectedElement = Vvveb.Builder.selectedEl;
let value = event.detail.value, input = event.detail.input, origEvent = event.detail.origEvent;

//console.log("propertyChange", event, value, input, origEvent);

if (property.child) element = element.querySelector(property.child);
if (property.parent) element = element.parent(property.parent);

Expand Down Expand Up @@ -1084,24 +1082,24 @@ Vvveb.Builder = {
});

selectBoxPosition = function(event) {

if (self.selectedEl) {
let pos = offset(self.selectedEl);

SelectBox.style.top = (pos.top - (self.frameDoc.scrollTop ?? 0) - self.selectPadding) + "px";
SelectBox.style.left = (pos.left - (self.frameDoc.scrollLeft ?? 0) - self.selectPadding) + "px";
}
let pos;
let target;

if (self.selectedEl) {
pos = offset(self.selectedEl);
target = self.selectedEl;
} else
if (self.highlightEl) {
let pos = offset(self.highlightEl);

highlightBox.style.top = (pos.top - (self.frameDoc.scrollTop ?? 0) - self.selectPadding) + "px";
highlightBox.style.left = (pos.left - (self.frameDoc.scrollLeft ?? 0) - self.selectPadding) + "px";

//addSectionBox.style.display = "none";
pos = offset(self.highlightEl);
target = self.highlightEl;
}

};
SelectBox.style.top = (pos.top - (self.frameDoc.scrollTop ?? 0) - self.selectPadding) + "px";
SelectBox.style.left = (pos.left - (self.frameDoc.scrollLeft ?? 0) - self.selectPadding) + "px";

SelectBox.style.width = ((target.offsetWidth ?? target.clientWidth) + self.selectPadding * 2) + "px";
SelectBox.style.height = ((target.offsetHeight ?? target.clientHeight) + self.selectPadding * 2) + "px";
}

window.FrameWindow.addEventListener("scroll", selectBoxPosition);
window.FrameWindow.addEventListener("resize", selectBoxPosition);
Expand Down Expand Up @@ -2807,7 +2805,7 @@ Vvveb.StyleManager = {
let css = "";
for (media in this.styles) {
if (media === "tablet" || media === "mobile") {
css += `@media screen and (max-width: ${(media === 'tablet') ? this.tabletWidth : this.mobileWidth}){\n`
css += `@media screen and (max-width: ${(media === 'tablet') ? this.tabletWidth : this.mobileWidth}){\n\n`
}
for (selector in this.styles[media]) {
css += `${selector} {\n`;
Expand Down Expand Up @@ -3422,6 +3420,8 @@ Vvveb.FileManager = {
this.tree.addEventListener("click", function (e) {
let element = event.target.closest("a");
if (element) {
e.stopImmediatePropagation();
if (element.classList.contains('view')) return;
e.preventDefault();
return false;
}
Expand All @@ -3431,6 +3431,7 @@ Vvveb.FileManager = {
let element = event.target.closest(".delete");
if (element) {
Vvveb.FileManager.deletePage(element.closest("li"), e);
e.stopImmediatePropagation();
e.preventDefault();
return false;
}
Expand All @@ -3440,6 +3441,7 @@ Vvveb.FileManager = {
let element = event.target.closest(".rename");
if (element) {
Vvveb.FileManager.renamePage(element.closest("li"), e, false);
e.stopImmediatePropagation();
e.preventDefault();
return false;
}
Expand All @@ -3449,6 +3451,7 @@ Vvveb.FileManager = {
let element = event.target.closest(".duplicate");
if (element) {
Vvveb.FileManager.renamePage(element.closest("li"), e, true);
e.stopImmediatePropagation();
e.preventDefault();
return false;
}
Expand Down Expand Up @@ -3498,7 +3501,7 @@ Vvveb.FileManager = {

if (page) {

fetch(deleteUrl, {method: "POST", body: JSON.stringify({file:page.file})})
fetch(deleteUrl, {method: "POST", body: new URLSearchParams({file:page.file})})
.then((response) => {
if (!response.ok) { throw new Error(response) }
return response.text()
Expand Down Expand Up @@ -3536,7 +3539,7 @@ Vvveb.FileManager = {

if (page) {

fetch(deleteUrl, {method: "POST", body: JSON.stringify({file:page.file, newfile:newfile, duplicate})})
fetch(renameUrl, {method: "POST", body: new URLSearchParams({file:page.file, newfile:newfile, duplicate})})
.then((response) => {
if (!response.ok) { throw new Error(response) }
return response.text()
Expand Down Expand Up @@ -3569,8 +3572,8 @@ Vvveb.FileManager = {
}
})
.catch(error => {
console.log(error.statusText);
displayToast("bg-danger", "Error", "Error deleting page!");
console.log(error);
displayToast("bg-danger", "Error", "Error renaming page!");
});
}
}
Expand Down

0 comments on commit ec44917

Please sign in to comment.