Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

jQuery code rewrite to vanilla js

givanzf17c553db5aa
diff --git a/public/js/admin.js b/public/js/admin.js
index 72ffac7..3b3dac1 100755
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -23,6 +23,7 @@ import {Router} from './common/router.js';
import {Themes} from './admin/controller/themes.js';
import {Plugins} from './admin/controller/plugins.js';
import {Table} from './admin/controller/table.js';
+import {Cache} from './admin/controller/cache.js';
import {HeartBeat} from './admin/heartbeat.js';
if (window.Vvveb === undefined) window.Vvveb = {};
@@ -30,10 +31,9 @@ if (window.Vvveb === undefined) window.Vvveb = {};
window.themes = Themes;
window.plugins = Plugins;
window.table = Table;
+window.cache = Cache;
-jQuery(document).ready(function() {
- Router.init();
-});
+Router.init();
class AjaxStack {
constructor() {
@@ -55,7 +55,7 @@ class AjaxStack {
let call = this.stack.shift();
let ajax = call();
- ajax.done(function() {
+ ajax.then(function() {
self.execute();
});
}
@@ -70,16 +70,25 @@ function ucFirst(str) {
return str[0].toUpperCase() + str.slice(1);
}
-function displayToast(bg, title, message, id = "bottom-toast") {
- $("#" + id + " .toast-body .message").html(message);
- $("#" + id + " .toast-header").removeClass(["bg-danger", "bg-success"]).addClass(bg).
- find("strong").text(title);
- /*
- $("#" + id + " .toast").addClass("showing");
- delay(() => $("#" + id + " .toast").addClass("show").removeClass("showing"), 500);
- delay(() => $("#" + id + " .toast").removeClass("show"), 5000);*/
- let toast = new bootstrap.Toast(document.getElementById(id), {animation:false});
- toast.show()
+function displayToast(bg, title, message, position = 'bottom', id = "bottom-toast") {
+ let toast = document.getElementById(id);
+
+ let header = toast.querySelector(".toast-header");
+ toast.classList.remove("bottom-0", "top-0");
+ toast.classList.add(position + "-0");
+ toast.querySelector(".toast-body .message").innerHTML = message;
+ header.classList.remove("bg-danger", "bg-success");
+ header.classList.add(bg);
+ header.querySelector("strong").textContent = title;
+
+ let bsToast = new bootstrap.Toast(toast, {animation:false});
+ bsToast.show()
}
window.displayToast = displayToast;
+
+function generateElements(html) {
+ const template = document.createElement('template');
+ template.innerHTML = html.trim();
+ return template.content.children;
+}
diff --git a/public/js/admin/admin.js b/public/js/admin/admin.js
index 2df9ab4..d841530 100755
--- a/public/js/admin/admin.js
+++ b/public/js/admin/admin.js
@@ -2,10 +2,12 @@ import {Router} from './common/router.js';
import {Themes} from './admin/controller/themes.js';
import {Plugins} from './admin/controller/plugins.js';
import {Table} from './admin/controller/table.js';
+import {Cache} from './admin/controller/cache.js';
import {HeartBeat} from './admin/heartbeat.js';
window.themes = Themes;
window.plugins = Plugins;
+window.cache = Cache;
window.table = {};
if (window.Vvveb === undefined) window.Vvveb = {};
diff --git a/public/js/admin/controller/backup.js b/public/js/admin/controller/backup.js
index e2d521d..df0da9d 100755
--- a/public/js/admin/controller/backup.js
+++ b/public/js/admin/controller/backup.js
@@ -1,34 +1,42 @@
class BackupController {
action(url, btn) {
- var next = url;
- $("#progress").removeClass("d-none");
+ let next = url;
+ document.getElementById("progress").classList.remove("d-none");
function disableBtn() {
- $('.loading', btn).removeClass('d-none');
- $('.button-text', btn).addClass('d-none');
+ btn.querySelector('.loading').classList.remove('d-none');
+ btn.querySelector('.button-text').classList.add('d-none');
}
function enableBtn() {
- $('.loading', btn).addClass('d-none');
- $('.button-text', btn).removeClass('d-none');
-
+ btn.querySelector('.loading').classList.add('d-none');
+ btn.querySelector('.button-text').classList.remove('d-none');
}
- var request = function () {
- return $.ajax({
- url: next,
- type: 'post',
- //data: $('input[name^=\'backup\']:checked'),
- dataType: 'json',
- beforeSend: function () {
- disableBtn();
- },
- success: function (json) {
-
+ disableBtn();
+
+ let request = function () {
+ return fetch(next, {method: "POST", headers: {
+ "X-Requested-With": "XMLHttpRequest",
+ }})
+ .then((response) => {
+ next = false;
+ if (!response.ok) {
+ return Promise.reject(response);
+ }
+ if (!response.ok) {
+ let message = response.statusText + " " + response.body();
+ throw new Error(message);
+ }
+ return response.json()
+ })
+ .then((json) => {
+ document.getElementById('progress-status').innerHTML = '';
+
if (json['error']) {
- $('#progress-bar').addClass('bg-danger');
- $('#progress-status').html('<div class="text-danger">' + json['error'] + '</div>');
+ document.getElementById('progress-bar').classList.add('bg-danger');
+ document.getElementById('progress-status').innerHTML = '<div class="text-danger">' + json['error'] + '</div>';
enableBtn();
}
@@ -36,30 +44,30 @@ class BackupController {
let percent = (json['position']) * 100 / json['count'];
if (json['success']) {
- $('#progress-bar').css('width', '100%').addClass('bg-success');
- $('#progress-status').html('<div class="text-success">' + json['success'] + '</div>');
+ document.getElementById('progress-bar').style.width = "100%";//.classList.add('bg-success');
+ document.getElementById('progress-status').innerHTML = '<div class="text-success">' + json['success'] + '</div>';
enableBtn();
}
if (json['table']) {
- $('#progress-status').html(json['table']);
+ document.getElementById('progress-status').innerHTML = json['table'];
}
if (json['file']) {
- $('#progress-file').html(json['file']);
+ document.getElementById('progress-file').innerHTML = json['file'];
}
if (json['position']) {
- $('#progress-position').html(json['position']);
+ document.getElementById('progress-position').innerHTML = json['position'];
}
if (json['count']) {
- $('#progress-count').html(json['count']);
+ document.getElementById('progress-count').innerHTML = json['count'];
}
if (json['page']) {
- $('#progress-page').html(json['page']);
+ document.getElementById('progress-page').innerHTML = json['page'];
}
@@ -69,9 +77,9 @@ class BackupController {
ajaxStack.add(request);
} else {
percent = 100;
- $('#progress-bar').addClass('bg-success');
+ document.getElementById('progress-bar').classList.add('bg-success');
enableBtn();
- $('#progress-bar').css('width', '100%');
+ document.getElementById('progress-bar').style.width = '100%';
if (json['success']) {
window.location.href += '&success=' + json['success'];
@@ -80,14 +88,30 @@ class BackupController {
}
}
- $('#progress-bar').css('width', percent + '%');
- },
- error: function (xhr, ajaxOptions, thrownError) {
- console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
- $('#progress-bar').addClass('bg-danger');
- enableBtn();
- }
- });
+ document.getElementById('progress-bar').style.width = percent + '%';
+ })/*.then((json) => {
+ if (next) {
+ ajaxStack.add(request);
+ }
+ })*/
+ .catch(error => {
+ let message = error.clone().text();
+
+ if (typeof error.json === "function") {
+ error.json().then(jsonError => {
+ message = jsonError;
+ }).catch(genericError => {
+ message = error.statusText + " " + message;
+ });
+ }
+
+ console.log(error);
+ document.getElementById('progress-success').innerHTML = '';
+ document.getElementById('progress-message').innerHTML = '<div class="text-danger">' + message + '</div>';
+ //console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
+ document.getElementById('progress-bar').classList.add('bg-danger');
+ enableBtn();
+ });
};
ajaxStack.add(request);
diff --git a/public/js/admin/controller/cache.js b/public/js/admin/controller/cache.js
new file mode 100644
index 0000000..2abf7f2
--- /dev/null
+++ b/public/js/admin/controller/cache.js
@@ -0,0 +1,30 @@
+class CacheController {
+
+ clear(e) {
+ let link = e.currentTarget;
+ //let url = window.location.pathname + '?module=tools/cache&action=delete';
+ let url = link.href;
+
+ fetch(url)
+ .then((response) => {
+ if (!response.ok) { throw new Error(response) }
+ return response.text()
+ })
+ .then((data) => {
+ let message = data.querySelector(".notifications .alert [data-v-notification-text]").innerHTML;
+ displayToast("bg-success", "Cache", message, "top");
+ })
+ .catch(error => {
+ let message = data.querySelector(".notifications .alert [data-v-notification-text]").innerHTML;
+ displayToast("bg-danger", "Cache", message, "top");
+ //displayToast("bg-danger", "Error", "Error saving!");
+ });
+
+ e.preventDefault();
+ return false;
+ }
+
+}
+
+let Cache = new CacheController();
+export {Cache};
diff --git a/public/js/admin/controller/plugins.js b/public/js/admin/controller/plugins.js
index 8e3175a..89d3241 100755
--- a/public/js/admin/controller/plugins.js
+++ b/public/js/admin/controller/plugins.js
@@ -9,14 +9,14 @@ class PluginsController {
element.classList.add("loading");
- $(".loading", element).toggleClass("d-none");
- $(".button-text", element).toggleClass("d-none");
+ element.querySelector('.loading').toggleClass("d-none");
+ element.querySelector('.button-text').toggleClass("d-none");
PluginsModel.install(market, slug, function (data) {
setTimeout(function () {
element.classList.remove("loading");
- $(".loading", element).toggleClass("d-none");
- $(".button-text", element).toggleClass("d-none");
+ element.querySelector('.loading').toggleClass("d-none");
+ element.querySelector('.button-text').toggleClass("d-none");
}, 5000);
});
@@ -24,20 +24,19 @@ class PluginsController {
}
importModal(e) {
- $("#importModal").modal('show');
- //console.log($("#import-form").serialize());
+ document.getElementById("importModal").modal('show');
e.preventDefault();
}
importTheme(e) {
- $("#import-iframe").show();
- $("#import-form").submit();
- $("#import-options").hide();
- $(e.target).hide();
+ document.getElementById("import-iframe").show();
+ document.getElementById("import-form").submit();
+ document.getElementById("import-options").style.display = "none";
+ e.target.style.display = "none";
}
import(e) {
- console.log($("#import-form").serialize());
+ console.log(document.getElementById("import-form").serialize());
}
activate(e) {
@@ -53,7 +52,7 @@ class PluginsController {
}, 5000);
});
- $("#importModal").modal('show');
+ document.getElementById("importModal").modal('show');
e.preventDefault();
}
diff --git a/public/js/admin/controller/table.js b/public/js/admin/controller/table.js
index b978f12..f2aac1a 100755
--- a/public/js/admin/controller/table.js
+++ b/public/js/admin/controller/table.js
@@ -1,22 +1,23 @@
class TableController {
selectRow(e) {
- let selectedCount = $('.checkbox input[type=\'checkbox\']:checked').length;
- console.log(selectedCount);
- if (selectedCount > 0) {
- $('.bulk-actions').fadeIn();
+ let selectedCount = document.querySelectorAll('.checkbox input[type=\'checkbox\']:checked');
+
+ if (selectedCount) {
+ document.querySelector('.bulk-actions').style.display = "block";
} else {
- $('.bulk-actions').fadeOut();
+ document.querySelector('.bulk-actions').style.display = "none";
}
}
bulkSelect(e) {
- $('.checkbox input[type=\'checkbox\']').prop('checked', this.checked);
+ let bulkCheckbox = this;
+ document.querySelectorAll('.checkbox input[type=\'checkbox\']').forEach(e => e.checked = bulkCheckbox.checked);
- if (this.checked) {
- $('.bulk-actions').fadeIn();
+ if (bulkCheckbox.checked) {
+ document.querySelector('.bulk-actions').style.display = "block";
} else {
- $('.bulk-actions').fadeOut();
+ document.querySelector('.bulk-actions').style.display = "none";
}
}
}
diff --git a/public/js/admin/controller/themes.js b/public/js/admin/controller/themes.js
index 771e81a..0b3ca28 100755
--- a/public/js/admin/controller/themes.js
+++ b/public/js/admin/controller/themes.js
@@ -9,14 +9,14 @@ class ThemesController {
element.classList.add("loading");
- $(".loading", element).toggleClass("d-none");
- $(".button-text", element).toggleClass("d-none");
+ element.querySelector('.loading').toggleClass("d-none");
+ element.querySelector('.button-text').toggleClass("d-none");
ThemesModel.install(market, slug, function () {
setTimeout(function () {
element.classList.remove("loading");
- $(".loading", element).toggleClass("d-none");
- $(".button-text", element).toggleClass("d-none");
+ element.querySelector('.loading').toggleClass("d-none");
+ element.querySelector('.button-text').toggleClass("d-none");
}, 5000);
});
@@ -25,20 +25,19 @@ class ThemesController {
}
importModal(e) {
- $("#importModal").modal('show');
- //console.log($("#import-form").serialize());
+ document.getElementById("importModal").modal('show');
e.preventDefault();
}
importTheme(e) {
- $("#import-iframe").show();
- $("#import-form").submit();
- $("#import-options").hide();
- $(e.target).hide();
+ document.getElementById("import-iframe").style.display = "";
+ document.getElementById("import-form").submit();
+ document.getElementById("import-options").style.display = "none";
+ e.target.style.display = "none";
}
import(e) {
- console.log($("#import-form").serialize());
+ console.log(document.getElementById("import-form").serialize());
}
activate(e) {
@@ -54,7 +53,7 @@ class ThemesController {
}, 5000);
});
- $("#importModal").modal('show');
+ document.getElementById("importModal").modal('show');
e.preventDefault();
}
diff --git a/public/js/admin/controller/update.js b/public/js/admin/controller/update.js
index ca5eb67..9495a96 100755
--- a/public/js/admin/controller/update.js
+++ b/public/js/admin/controller/update.js
@@ -1,35 +1,42 @@
class UpdateController {
action(url, btn) {
- var next = url;
- $("#progress").removeClass("d-none");
+ let next = url;
+ document.getElementById("progress").classList.remove("d-none");
function disableBtn() {
- $('.loading', btn).removeClass('d-none');
- $('.button-text', btn).addClass('d-none');
+ btn.querySelector('.loading').classList.remove('d-none');
+ btn.querySelector('.button-text').classList.add('d-none');
}
function enableBtn() {
- $('.loading', btn).addClass('d-none');
- $('.button-text', btn).removeClass('d-none');
-
+ btn.querySelector('.loading').classList.add('d-none');
+ btn.querySelector('.button-text').classList.remove('d-none');
}
- var request = function () {
- return $.ajax({
- url: next,
- type: 'post',
- //data: $('input[name^=\'backup\']:checked'),
- dataType: 'json',
- beforeSend: function () {
- disableBtn();
- },
- success: function (json) {
- $('#progress-message').html('');
+ disableBtn();
+
+ let request = function () {
+ return fetch(next, {method: "POST", headers: {
+ "X-Requested-With": "XMLHttpRequest",
+ }})
+ .then((response) => {
+ next = false;
+ if (!response.ok) {
+ return Promise.reject(response);
+ }
+ if (!response.ok) {
+ let message = response.statusText + " " + response.body();
+ throw new Error(message);
+ }
+ return response.json()
+ })
+ .then((json) => {
+ document.getElementById('progress-message').innerHTML = '';
if (json['error']) {
- $('#progress-bar').addClass('bg-danger');
- $('#progress-error').html('<div class="text-danger">' + json['error'] + '</div>');
+ document.getElementById('progress-bar').classList.add('bg-danger');
+ document.getElementById('progress-error').innerHTML = '<div class="text-danger">' + json['error'] + '</div>';
enableBtn();
}
@@ -37,30 +44,31 @@ class UpdateController {
let percent = (json['position']) * 100 / json['count'];
if (json['success']) {
- //$('#progress-bar').css('width', '100%').addClass('bg-success');
- $('#progress-success').html('<div class="text-success">' + json['success'] + '</div>');
+ //document.getElementById('progress-bar').style.width = '100%';.classList.add('bg-success');
+ document.getElementById('progress-success').innerHTML = '<div class="text-success">' + json['success'] + '</div>';
enableBtn();
}
if (json['info']) {
- $('#progress-message').html(json['info']);
+ document.getElementById('progress-message').innerHTML = json['info'];
}
if (json['step']) {
- $('#progress-status').html(json['step']);
+ document.getElementById('progress-status').innerHTML = json['step'];
}
if (json['url'] && json['step'] && !json['error']) {
next = json['url'];
-
+
ajaxStack.add(request);
+
} else {
percent = 100;
- $('#progress-bar').addClass('bg-success');
+ document.getElementById('progress-bar').classList.add('bg-success');
enableBtn();
- $('#progress-bar').css('width', '100%');
+ document.getElementById('progress-bar').style.width = '100%';
return;
if (json['success']) {
@@ -72,13 +80,29 @@ class UpdateController {
}
}
- $('#progress-bar').css('width', percent + '%');
- },
- error: function (xhr, ajaxOptions, thrownError) {
- console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
- $('#progress-bar').addClass('bg-danger');
- enableBtn();
+ document.getElementById('progress-bar').style.width = percent + '%';
+ })/*.then((json) => {
+ if (next) {
+ ajaxStack.add(request);
}
+ })*/
+ .catch(error => {
+ let message = error.clone().text();
+
+ if (typeof error.json === "function") {
+ error.json().then(jsonError => {
+ message = jsonError;
+ }).catch(genericError => {
+ message = error.statusText + " " + message;
+ });
+ }
+
+ console.log(error);
+ document.getElementById('progress-success').innerHTML = '';
+ document.getElementById('progress-message').innerHTML = '<div class="text-danger">' + message + '</div>';
+ //console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
+ document.getElementById('progress-bar').classList.add('bg-danger');
+ enableBtn();
});
};
@@ -99,4 +123,4 @@ class UpdateController {
let Update = new UpdateController();
export {Update};
-window.Update = Update;
\ No newline at end of file
+window.Update = Update;
diff --git a/public/js/admin/functions.js b/public/js/admin/functions.js
index 5a35072..d980ff4 100644
--- a/public/js/admin/functions.js
+++ b/public/js/admin/functions.js
@@ -3,36 +3,37 @@ function addTemplate(id, name, parent) {
// id = attribute-template
// name = product_attribute
// parent = attribute
- let template = $("#" + id).clone();
- $('[type="date"]', template).attr("value", date());
- $('[type="datetime-local"]', template).attr("value", datetime());
- $("input,select", template).removeAttr("disabled");
+ let template = document.getElementById(id).cloneNode(true);
+ template.querySelectorAll('[type="date"]', template).forEach(e => e.setAttribute("value", date()));
+ template.querySelectorAll('[type="datetime-local"]').forEach(e => e.setAttribute("value", datetime()));
+ template.querySelectorAll("input,select").forEach(e => e.removeAttribute("disabled"));
- template =template[0].outerHTML;
+ template =template.outerHTML;
let newId = Math.floor(Math.random() * 10000);
template = template.replaceAll(name + '[0]', name + '[' + newId + ']').
replaceAll(name + '[#]', name + '[' + newId + ']').
replaceAll(name + '#', name + newId ).
replace('d-none', '').
replace('id="' + id + '"', '');
- let element = $(template);
- $("#" + parent + " tbody").append(element);
+
+ let element = generateElements(template)[0];
+ document.querySelector("#" + parent + " tbody").append(element);
return element;
}
function removeRow(element, elementName = false) {
- let row = $(element).parents("tr");
+ let row = element.closest("tr");
if (elementName) {
- let form = $(element).parents("form");
- form.append('<input type="hidden" name="delete[' + elementName + '][]" value="' + row.data("id") + '">');
+ let form = element.closest("form");
+ form.append(generateElements('<input type="hidden" name="delete[' + elementName + '][]" value="' + row.data("id") + '">')[0]);
}
return row.remove();
}
function clearFeaturedMedia(id = "featured-image") {
- $("#" + id + "-input").val("");
- $("#" + id + "-thumb").attr("src","img/placeholder.svg");
+ document.getElementById(id + "-input").value = "";
+ document.getElementById(id + "-thumb").setAttribute("src","img/placeholder.svg");
}
const slugify = (str) => {
@@ -48,41 +49,46 @@ const slugify = (str) => {
function addTab(element, event) {
- let nav = $(element).parents(".nav");
- let content = $(".tab-content", $(element).parents(".row"));
+ let nav = element.closest(".nav");
+ let content = element.closest(".row").querySelector(".tab-content");
- let navTemplate = $(".tab-nav-template", nav);
- let contentTemplate = $(".tab-content-template", content);
+ let navTemplate = nav.querySelector(".tab-nav-template");
+ let contentTemplate = content.querySelector(".tab-content-template");
let newId = Math.floor(Math.random() * 10000);
- navTemplate = navTemplate.clone().removeClass(["tab-nav-template", "d-none"]);
- contentTemplate = contentTemplate.clone().removeClass(["tab-content-template", "d-none"]);
+ navTemplate = navTemplate.cloneNode(true);
+ navTemplate.classList.remove("tab-nav-template", "d-none");
+ contentTemplate = contentTemplate.cloneNode(true);
+ contentTemplate.classList.remove("tab-content-template", "d-none");
- $("a", navTemplate).attr("href", "#tab-" + newId);
- contentTemplate.attr("id", "tab-" + newId);
+ navTemplate.querySelector("a").setAttribute("href", "#tab-" + newId);
+ contentTemplate.setAttribute("id", "tab-" + newId);
- contentTemplate = contentTemplate[0].outerHTML;
+ contentTemplate = contentTemplate.outerHTML;
contentTemplate = contentTemplate.replaceAll('[0]', '[' + newId + ']');
nav.append(navTemplate);
- content.append(contentTemplate);
+ content.append(generateElements(contentTemplate)[0]);
- $("#tab-" + newId +" .product_option_id").change();
- $("a", navTemplate)[0].click();
+ document.querySelectorAll("#tab-" + newId +" .product_option_id").forEach(e => {
+ e.dispatchEvent(new Event("change"));
+ });
+ navTemplate.querySelector("a").click();
}
function removeTab(element, elementName) {
- let link = $(element).parents("a");
- let nav = $(element).parents(".nav");
+ let link = element.closest("a");
+ let nav = element.closest(".nav");
if (elementName) {
- let form = $(element).parents("form");
- form.append('<input type="hidden" name="delete[' + elementName + '][]" value="' + link.data("id") + '">');
+ let form = element.closest("form");
+ form.append('<input type="hidden" name="delete[' + elementName + '][]" value="' + link.id + '">');
}
-
- $("a:first", nav).tab('show');
- $(link.attr("href")).remove();
- return link.remove();
+
+ const bsTab = bootstrap.Tab.getOrCreateInstance(nav.querySelector(".nav-item:not(.d-none) a"));
+ bsTab.show();
+ document.querySelector(link.getAttribute("href")).remove();
+ return link.parentNode.remove();
return false;
}
@@ -109,37 +115,37 @@ function addRow(element) {
// id = attribute-template
// name = product_attribute
// parent = attribute
- let table = $(element).parents("table");
- let template = $("tr.template", table).clone().removeClass(["template", "d-none"]);
+ let table = element.closest("table");
+ let template = table.querySelector("tr.template").cloneNode(true);
+ template.classList.remove("template", "d-none");
let newId = Math.floor(Math.random() * 10000);
-
- $("input,select", template).removeAttr("disabled");
- template = template[0].outerHTML;
+ template.querySelectorAll("input,select", template).forEach(e => e.removeAttribute("disabled"));
+ template = template.outerHTML;
template = template.replaceAll('[0]', '[' + newId + ']').
- replaceAll('[#]', '[' + newId + ']');
- //let element = $(template);
- $("tbody", table).append(template);
+ replaceAll('[#]', '[' + newId + ']');
+
+ table.querySelector("tbody").append(generateElements(template)[0]);
return element;
}
let optionValues = [];
function optionTypeChange(element) {
- let tab = $(element).parents(".tab-pane:first");
+ let tab = element.closest(".tab-pane");
let optionValueId = element.value;
let option = productOption[element.value];
let optionType = option['type'];
- $("a[href='#" + tab.attr("id") + "'] span").text(option['name']);
- tab.attr("data-type", optionType);
+ document.querySelectorAll("a[href='#" + tab.getAttribute("id") + "'] span").forEach(e => e.textContent = option['name']);
+ tab.setAttribute("data-type", optionType);
if (optionType == 'radio' || optionType == 'checkbox' || optionType == 'select') {
- $(".default", tab).addClass("d-none");
- $(".values", tab).removeClass("d-none");
+ tab.querySelectorAll(".default").forEach(e => e.classList.add("d-none"));
+ tab.querySelectorAll(".values").forEach(e => e.classList.remove("d-none"));
} else {
- $(".default", tab).removeClass("d-none");
- $(".values", tab).addClass("d-none");
+ tab.querySelectorAll(".default").forEach(e => e.classList.remove("d-none"));
+ tab.querySelectorAll(".values").forEach(e => e.classList.add("d-none"));
}
function setValues(values){
@@ -147,13 +153,22 @@ function optionTypeChange(element) {
for (id in values) {
options += "<option value='"+ id +"'>" + values[id] + "</option>";
}
- $(".values select.option_value", tab).html(options);
+ tab.querySelector(".values select.option_value", tab).innerHTML = options;
}
if (!optionValues[optionValueId]) {
- $.ajax(window.location.pathname + '?module=product/product&action=optionValuesAutocomplete&option_id=' + optionValueId).done(function (values) {
+ fetch(window.location.pathname + '?module=product/product&action=optionValuesAutocomplete&option_id=' + optionValueId)
+ .then((response) => {
+ if (!response.ok) { throw new Error(response) }
+ return response.json()
+ })
+ .then((values) => {
optionValues[optionValueId] = values;
- setValues(values);
+ setValues(values);
+ })
+ .catch(error => {
+ console.log(error.statusText);
+ displayToast("bg-danger", "Error", "Error saving!");
});
} else {
setValues(optionValues[optionValueId]);
@@ -161,57 +176,77 @@ function optionTypeChange(element) {
}
// Date
-let datepicker = function () {
- $(this).daterangepicker({
- singleDatePicker: true,
- autoApply: true,
- autoUpdateInput: false,
- locale: {
- format: 'YYYY-MM-DD'
- }
- }, function (start, end) {
- $(this.element).val(start.format('YYYY-MM-DD'));
- });
+let datepicker = function (e) {
+ let element = e.target.closest('input.date, input[type="date"]');
+ if (element && !element.daterangepicker) {
+ element.daterangepicker =
+ new DateRangePicker(element, {
+ singleDatePicker: true,
+ autoApply: true,
+ autoUpdateInput: false,
+ locale: {
+ format: 'YYYY-MM-DD'
+ }
+ }, function (start, end) {
+ this.element.value = start.format('YYYY-MM-DD');
+ });
+ }
}
-$(document).on('focus', 'input.date', datepicker);
-$(document).on('focus', 'input[type="date"]', datepicker);
+document.addEventListener('focusin', datepicker);
// Time
-let timepicker = function () {
- $(this).daterangepicker({
- singleDatePicker: true,
- datePicker: false,
- autoApply: true,
- autoUpdateInput: false,
- timePicker: true,
- timePicker24Hour: true,
- locale: {
- format: 'HH:mm'
- }
- }, function (start, end) {
- $(this.element).val(start.format('HH:mm'));
- }).on('show.daterangepicker', function (ev, picker) {
- picker.container.find('.calendar-table').hide();
- });
+let timepicker = function (e) {
+ let element = e.target.closest('input.time');
+ if (element && !element.daterangepicker) {
+ element.daterangepicker =
+ new DateRangePicker(element, {
+ singleDatePicker: true,
+ datePicker: false,
+ autoApply: true,
+ autoUpdateInput: false,
+ timePicker: true,
+ timePicker24Hour: true,
+ locale: {
+ format: 'HH:mm'
+ }
+ }, function (start, end) {
+ this.element.value = start.format('HH:mm');
+ });
+
+ element.addEventListener('show.daterangepicker', function (ev, picker) {
+ picker.container.querySelectorAll('.calendar-table').forEach(e => e.style.display = "none");
+ });
+ }
}
-$(document).on('focus', 'input.time', timepicker);
+document.addEventListener('focusin', timepicker);
// Date Time
-let datetimepicker = function () {
- $(this).daterangepicker({
- singleDatePicker: true,
- autoApply: true,
- autoUpdateInput: false,
- timePicker: true,
- timePicker24Hour: true,
- locale: {
- format: 'YYYY-MM-DD HH:mm'
- }
- }, function (start, end) {
- $(this.element).val(start.format('YYYY-MM-DD HH:mm'));
- });
+let datetimepicker = function (e) {
+ let element = e.target.closest('input.datetime');
+ if (element && !element.daterangepicker) {
+ element.daterangepicker =
+ new DateRangePicker(element, {
+ singleDatePicker: true,
+ autoApply: true,
+ autoUpdateInput: false,
+ timePicker: true,
+ timePicker24Hour: true,
+ locale: {
+ format: 'YYYY-MM-DD HH:mm'
+ }
+ }, function (start, end) {
+ this.element.value = start.format('YYYY-MM-DD HH:mm');
+ });
+ }
}
-$(document).on('focus', 'input.datetime', datetimepicker);
+document.addEventListener('focusin', datetimepicker);
+
+
+function generateElements(html) {
+ const template = document.createElement('template');
+ template.innerHTML = html.trim();
+ return template.content.children;
+}
diff --git a/public/js/admin/heartbeat.js b/public/js/admin/heartbeat.js
index b682785..8a962f2 100755
--- a/public/js/admin/heartbeat.js
+++ b/public/js/admin/heartbeat.js
@@ -3,49 +3,74 @@
*/
let HeartBeat = setInterval(function () {
- $.ajax(window.location.pathname + '?action=heartbeat')
- .done(function (sessionStatus) {
- //console.log(sessionStatus);
+ fetch(window.location.pathname + '?action=heartbeat')
+ .then((response) => {
+ if (!response.ok) { throw new Error(response) }
+ return response.text()
+ })
+ .then(sessionStatus => {
if (sessionStatus != "ok") {
- if ($("#login").length == 0) {
- $.ajax(window.location.pathname + '?module=user/login&modal=true').done(function (formHtml) {
- $("#heartBeatLogin .modal-body").html(formHtml);
- const heartBeatLogin = bootstrap.Modal.getOrCreateInstance('#heartBeatLogin');
- heartBeatLogin.show();
- $("#heartBeatLogin").on("submit", "form", function(e) {
- let parameters = $(this).serializeArray();
- //$("#heartBeatLogin [data-v-notifications]").remove();
-
- $.ajax({
- url:window.location.pathname + '?module=user/login&modal=true',
- type: 'post',
- data: parameters,
- success: function(data) {
- //if no error message shown then hide login modal
- if (data.indexOf("data-v-notification-error") == -1) {
- heartBeatLogin.hide();
- } else {
- //if there are errors show login form with error message
- $("#heartBeatLogin .modal-body").html(data);
- }
- },beforeSend: function() {
- $('.btn-login .loading').removeClass('d-none');
- $('.btn-login .button-text').addClass('d-none');
- },complete: function() {
- $('.btn-login .loading').addClass('d-none');
- $('.btn-login .button-text').removeClass('d-none');
- }
- });
-
- e.preventDefault();
- return false;
+ if (!document.getElementById("login")) {
+ fetch(window.location.pathname + '?module=user/login&modal=true')
+ .then(response => {
+ if (!response.ok) { throw new Error(response) }
+ return response.text();
+ })
+ .then(formHtml => {
+ document.querySelector("#heartBeatLogin .modal-body").innerHTML = formHtml;
+ let login = document.getElementById('heartBeatLogin');
+ const heartBeatLogin = bootstrap.Modal.getOrCreateInstance(login);
+ heartBeatLogin.style.display = "";
+ login.addEventListener("submit", function(e) {
+ let form = e.target.closest("form");
+ if (form) {
+ //$("#heartBeatLogin [data-v-notifications]").remove();
+
+ document.querySelector('.btn-login .loading').classList.remove('d-none');
+ document.querySelector('.btn-login .button-text').classList.add('d-none');
+
+ fetch(window.location.pathname + '?module=user/login&modal=true', { method: "POST",
+ headers: {
+ //"Content-Type": "application/json",
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ },
+ body: new URLSearchParams(new FormData(form))})
+ .then((response) => {
+ if (!response.ok) { throw new Error(response) }
+ return response.text()
+ })
+ .then(data => {
+ //if no error message shown then hide login modal
+ if (data.indexOf("data-v-notification-error") == -1) {
+ heartBeatLogin.style.display = "none";
+ } else {
+ //if there are errors show login form with error message
+ document.querySelector("#heartBeatLogin .modal-body").innerHTML = data;
+ }
+
+ document.querySelector('.btn-login .loading').classList.add('d-none');
+ document.querySelector('.btn-login .button-text').classList.remove('d-none');
+ })
+ .catch(error => {
+ document.querySelector('.btn-login .loading').classList.add('d-none');
+ document.querySelector('.btn-login .button-text').classList.remove('d-none');
+ console.log(error.statusText);
+ displayToast("bg-danger", "Revision", "Error!");
+ });
+
+
+ e.preventDefault();
+ return false;
+ }
});
- });
+ }).catch(error => {
+ console.log(error.statusText);
+ });
}
}
- }).fail(function (data) {
- //alert(data.responseText);
- });;
+ }).catch(error => {
+ console.log(error.statusText);
+ });
}, 3 * 60 * 1000);//3 minutes
export {HeartBeat};
diff --git a/public/js/admin/model/plugins.js b/public/js/admin/model/plugins.js
index f8147f6..cc75305 100755
--- a/public/js/admin/model/plugins.js
+++ b/public/js/admin/model/plugins.js
@@ -1,8 +1,6 @@
class PluginsModel {
install(market, slug, callback) {
- console.log(market + " --- " + slug);
- console.log(installUrl);
callback();
}
}
diff --git a/public/js/admin/model/themes.js b/public/js/admin/model/themes.js
index 0d6a6e7..9b398fb 100755
--- a/public/js/admin/model/themes.js
+++ b/public/js/admin/model/themes.js
@@ -1,7 +1,6 @@
class ThemesModel {
install(market, slug, callback) {
- console.log(market + " --- " + slug);
callback();
}
}
diff --git a/public/js/admin/revisions.js b/public/js/admin/revisions.js
index 043ab8d..68a49f2 100644
--- a/public/js/admin/revisions.js
+++ b/public/js/admin/revisions.js
@@ -1,49 +1,72 @@
function revisionAction(action, data, callback) {
- $.ajax({
- type: "GET",
- url: window.location.pathname + "?module=content/revisions&action=" + action,//set your server side save script url
- data: data,
- cache: false,
- }).done(callback).fail(function (data) {
+ fetch(window.location.pathname + "?module=content/revisions&action=" + action + "&" + (new URLSearchParams(data)).toString())
+ .then((response) => {
+ if (!response.ok) { throw new Error(response) }
+ return response.json()
+ })
+ .then(callback)
+ .catch(error => {
+ console.log(error.statusText);
displayToast("bg-danger", "Revision", "Error!");
- //alert(data.responseText);
- //console.log(data.responseText);
- });
+ });
}
function revision(childElement) {
- let item = $(childElement).parents("[data-type]")
- if (item.length) {
- return Object.assign({}, item.get(0).dataset);
+ let item = childElement.closest("[data-type]")
+ if (item) {
+ return Object.assign({}, item.dataset);
}
return {}
}
-$(".revisions").on("click", ".btn-load", function (e) {
- let data = revision(this);
- let contentEditor = tinymce.get( $(this).parents(".tab-pane").find("[data-v-" + data.type + "-content-content]").attr("id") );
- revisionAction("revision", data, function (data, text) {
- if (data.content) {
- contentEditor.setContent(data["content"]);
- displayToast("bg-success", "Revision", data["created_at"] + " Revision loaded!");
- }});
-
- //e.preventDefault();
- return false;
+document.querySelector(".revisions")?.addEventListener("click", function (e) {
+ let element = e.target.closest(".btn-load");
+ if (element) {
+ let data = revision(element);
+ let contentEditor = tinymce.get( element.closest(".tab-pane").querySelector("[data-v-" + data.type + "-content-content]").id );
+ revisionAction("revision", data, function (data) {
+ if (data.content) {
+ contentEditor.setContent(data["content"]);
+ displayToast("bg-success", "Revision", data["created_at"] + " Revision loaded!");
+ }});
+
+ //e.preventDefault();
+ return false;
+ }
});
+/*
+document.querySelector(".revisions").addEventListener("click", function (e) {
+ let element = e.target.closest(".btn-compare");
+ if (element) {
+ let data = revision(this);
+ let item = element.closest("[data-v-revision]");
-$(".revisions").on("click", ".btn-delete", function (e) {
- let data = revision(this);
- let item = $(this).parents("[data-v-revision]")
- let count = $(item).parents(".tab-pane").find("[data-v-" + data.type + "-content-revision_count]");
-
- if (confirm('Are you sure?')) {
- revisionAction("delete", data, function (data, text) {
- displayToast("bg-success", "Revision", "Revision deleted!");
+ revisionAction("revision", data, function (data, text) {
item.remove();
- count.html(Math.max(count.html() - 1, 0));
});
+
+ //e.preventDefault();
+ return false;
+ }
+});
+*/
+
+document.querySelector(".revisions")?.addEventListener("click", function (e) {
+ let element = e.target.closest(".btn-delete");
+ if (element) {
+ let data = revision(element);
+ let item = element.closest("[data-v-revision]");
+ let tab = element.closest(".tab-pane");
+ let count = tab.querySelector("[data-v-" + data.type + "-content-revision_count]");
+
+ if (confirm('Are you sure?')) {
+ revisionAction("delete", data, function (data) {
+ displayToast("bg-success", "Revision", "Revision deleted!");
+ item.remove();
+ count.html(Math.max(count.html() - 1, 0));
+ });
+ }
+ //e.preventDefault()
+ return false;
}
- //e.preventDefault()
- return false;
});
diff --git a/public/js/app.js b/public/js/app.js
index 651cb19..ef6cc98 100755
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -21,66 +21,85 @@
if (VvvebTheme === undefined) var VvvebTheme = {};
VvvebTheme.Ajax = {
- call: function(parameters, element, selector, callback) {
- let url = '/index.php?module=' + parameters["module"] + '&action=' + parameters["action"];
+ call: function(url, parameters, element, selector, callback, requestType = "POST") {
+ if (!url) {
+ url = '/index.php?module=' + parameters["module"] + '&action=' + parameters["action"];
+ }
+
if (!selector) {
url += '&_component_ajax=' + parameters["component"] + '&_component_id=' + parameters["component_id"];
}
- $.ajax({
- url,
- type: 'post',
- data: parameters,
- //dataType: 'json',
- beforeSend: function() {
- let loading = $('.loading', element);
- let btn = $('.button-text', element);
-
- if (loading.hasClass("d-none")) {
- loading.removeClass('d-none');
- btn.addClass('d-none');
- }
-
- if ($(element).is('button')) {
- $(element).attr("disabled", "true");
- }
- },
- complete: function() {
- let loading = $('.loading', element);
- let btn = $('.button-text', element);
-
- if (btn.hasClass("d-none")) {
- loading.addClass('d-none');
- btn.removeClass('d-none');
- }
-
- if ($(element).is('button')) {
- $(element).removeAttr("disabled");
- }
- //$('#cart > button').button('reset');
- },
- success: function(data) {
- //$("header [data-v-component-cart]")[0].outerHTML = data;
- if (selector) {
- let response = $(data);//new DOMParser().parseFromString(data, "text/html");
- if (Array.isArray (selector) ) {
- for (k in selector) {
- let elementSelector = selector[k];
- let element = $(elementSelector, response);
- if (element.length) {
- $(elementSelector).replaceWith($(elementSelector, response));
- }
+
+ let loading = element.querySelector('.loading');
+ let btn = element.querySelector('.button-text');
+
+ if (loading && loading.classList.contains("d-none")) {
+ loading.classList.remove('d-none');
+ btn.classList.add('d-none');
+ }
+
+ if (element.hasAttribute("button")) {
+ element.setAttribute("disabled", "true");
+ }
+
+ const controller = new AbortController();
+ const signal = controller.signal;
+
+ fetch(url, {
+ method: requestType,
+ headers: {
+ "X-Requested-With": "XMLHttpRequest",
+ },
+ signal: signal,
+ body: new URLSearchParams(parameters)})
+ .then(response => {
+ if (!response.ok) { throw new Error(response) }
+ if (response.redirected) {
+ controller.abort();
+ window.location.href = response.url;
+ }
+ console.log(response);
+ return response.text()
+ })
+ .then(data => {
+ if (selector) {
+ let response = new DOMParser().parseFromString(data, "text/html");
+ if (Array.isArray (selector) ) {
+ for (k in selector) {
+ let elementSelector = selector[k];
+ let currentElement = document.querySelector(elementSelector);
+ let newElement = response.querySelector(elementSelector);
+ if (currentElement && newElement) {
+ currentElement.replaceWith(newElement);
}
- } else {
- $(selector).replaceWith($(selector, response));
+ }
+ } else {
+ let currentElement = document.querySelector(selector);
+ let newElement = response.querySelector(selector);
+ if (currentElement && newElement) {
+ currentElement.replaceWith(newElement);
}
}
- if (callback) callback(data);
- },
- error: function(xhr, ajaxOptions, thrownError) {
- alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
}
- });
-
+
+ if (callback) callback(data);
+
+ let loading = element.querySelector('.loading');
+ let btn = element.querySelector('.button-text');
+
+ if (loading && btn.classList.contains("d-none")) {
+ loading.classList.add('d-none');
+ btn.classList.remove('d-none');
+ }
+
+ if (element.hasAttribute("button")) {
+ element.removeAttribute("disabled");
+ }
+ })
+ .catch(error => {
+ console.log(error.statusText);
+ //displayToast("bg-danger", "Revision", "Error!");
+ });
}
}
@@ -95,13 +114,13 @@ VvvebTheme.Cart = {
parameters['action'] = parameters['action']?? action;
parameters['component'] = parameters['component'] ?? this.component;
parameters['component_id'] = parameters['component_id'] ?? this.component_id;
- VvvebTheme.Ajax.call(parameters, element, selector, callback);
+ VvvebTheme.Ajax.call("", parameters, element, selector, callback);
},
callback: function(data) {
/*
- let miniCart = $("[data-v-component-cart]");
- if (miniCart.length) {
+ let miniCart = document.querySelectorAll("[data-v-component-cart]");
+ if (miniCart) {
miniCart[0].outerHTML = data;
}*/
},
@@ -153,7 +172,7 @@ VvvebTheme.Wishlist = {
parameters['action'] = action;
parameters['component'] = this.component;
parameters['component_id'] = this.component_id;
- VvvebTheme.Ajax.call(parameters, element, selector, callback);
+ VvvebTheme.Ajax.call("", parameters, element, selector, callback);
},
callback: function(data) {
@@ -166,7 +185,7 @@ VvvebTheme.Wishlist = {
update: function(productId, quantity, element, selector, callback = false) {
if (!callback) callback = this.callback;
- return this.ajax('update',{'product_id':productId, 'quantity':quantity}, element, selector, callback);
+ return this.ajax('update',{'product_id':productId}, element, selector, callback);
},
remove: function(productId, element, selector, callback = false) {
@@ -187,7 +206,7 @@ VvvebTheme.Compare = {
parameters['action'] = action;
parameters['component'] = this.component;
parameters['component_id'] = this.component_id;
- VvvebTheme.Ajax.call(parameters, element, selector, callback);
+ VvvebTheme.Ajax.call("", parameters, element, selector, callback);
},
callback: function(data) {
@@ -217,7 +236,7 @@ VvvebTheme.Comments = {
ajax: function(action, parameters, element, selector, callback = false) {
parameters['module'] = parameters['module'] ?? this.module;
parameters['action'] = parameters['action'] ?? action;
- VvvebTheme.Ajax.call(parameters, element, selector, callback);
+ VvvebTheme.Ajax.call("", parameters, element, selector, callback);
},
add: function(parameters, element, selector, callback = false) {
@@ -245,7 +264,7 @@ VvvebTheme.User = {
parameters['component'] = parameters['component'] ?? this.component;
parameters['component_id'] = parameters['component_id'] ?? this.component_id;
- VvvebTheme.Ajax.call(parameters, element, selector, callback);
+ VvvebTheme.Ajax.call("", parameters, element, selector, callback);
},
login: function(parameters, element, selector, callback = false) {
@@ -265,7 +284,7 @@ VvvebTheme.Search = {
parameters['component'] = parameters['component'] ?? this.component;
parameters['component_id'] = parameters['component_id'] ?? this.component_id;
- VvvebTheme.Ajax.call(parameters, element, selector, callback = false);
+ VvvebTheme.Ajax.call("", parameters, element, selector, callback = false);
},
query: function(parameters, element, selector, callback) {
@@ -276,23 +295,27 @@ VvvebTheme.Search = {
VvvebTheme.Alert = {
show: function(message) {
- $('.alert-top .message').html(message);
- $('.alert-top').addClass("show").css('display', 'block');
+ let alertTop = document.querySelector('.alert-top');
+ alertTop.querySelector(".message").innerHTML = message;
+ alertTop.classList.add("show");
+ alertTop.style.display = "block";
setTimeout(function () {
- $('.alert-top').fadeOut();
+ alertTop.style.display = "none";
}, 4000);
}
}
-$('.alert-top').on('close.bs.alert', function (e) {
+document.querySelector('.alert-top .btn-close').addEventListener('click', function (e) {
+ let alert = this.closest(".alert");
+ alert.classList.remove('show')
+ alert.style.display = "";
e.preventDefault();
- $(this).removeClass('show').css('display', 'none');
});
function objectSerialize(serializeArray) {
- var returnObject = {};
- for (var i = 0; i < serializeArray.length; i++){
+ let returnObject = {};
+ for (let i = 0; i < serializeArray.length; i++){
returnObject[serializeArray[i]['name']] = serializeArray[i]['value'];
}
return returnObject;
@@ -300,12 +323,12 @@ function objectSerialize(serializeArray) {
function elementProduct(element) {
- let product = $(element).parents("[data-v-product]");
- if (!product.length) {
- product = $(element).parents("[data-v-component-product]");
+ let product = element.closest("[data-v-product]");
+ if (!product) {
+ product = element.closest("[data-v-component-product]");
}
- if (!product.length) {
- product = $(element).parents("[data-v-cart-product]");
+ if (!product) {
+ product = element.closest("[data-v-cart-product]");
}
return product;
@@ -315,58 +338,80 @@ VvvebTheme.Gui = {
init: function() {
let events = [];
+
+ document.querySelectorAll("[data-v-vvveb-action]").forEach(function (el) {
+
+ let on = "click";
+ if (el.dataset.vVvvebOn) on = el.dataset.vVvvebOn;
+
+ if (events.indexOf(on) > -1) return;
+ events.push(on);
+
+ document.addEventListener(on, function (e) {
+ let element = e.target.closest("[data-v-vvveb-action]");
+ if (element) {
+ let action = element.dataset.vVvvebAction;
+ let elOn = element.dataset.vVvvebOn ?? "click";
+
+ if (elOn == on && VvvebTheme.Gui.hasOwnProperty(action)) {
+ VvvebTheme.Gui[action].call(e.target, e);
+ }
+ }
+ });
+ });
- $("[data-v-vvveb-action]").each(function () {
+ /*
+ document.querySelectorAll("[data-v-vvveb-action]").forEach(function (el) {
let on = "click";
- if (this.dataset.vVvvebOn) on = this.dataset.vVvvebOn;
- let event = '[data-v-vvveb-action="' + this.dataset.vVvvebAction + '"]';
+ if (el.dataset.vVvvebOn) on = el.dataset.vVvvebOn;
+ let event = '[data-v-vvveb-action="' + el.dataset.vVvvebAction + '"]';
if (events.indexOf(event + on) > -1) return;
events.push(event + on);
- if (VvvebTheme.Gui.hasOwnProperty(this.dataset.vVvvebAction)) {
- $(document).on(on, event, VvvebTheme.Gui[this.dataset.vVvvebAction]);
+ if (VvvebTheme.Gui.hasOwnProperty(el.dataset.vVvvebAction)) {
+ document.addEventListener(on, function (e) {
+ let element = e.target.closest("[data-v-vvveb-action]");
+ if (element) {
+ VvvebTheme.Gui[el.dataset.vVvvebAction].call(e.target, e);
+ }
+ });
+ //document).addEventListener(on, VvvebTheme.Gui[this.dataset.vVvvebAction]);
}
});
-
- /*
- for (actionName in VvvebTheme.Gui)
- {
- if (actionName == "init") continue;
- //console.log(actionName);
- $(document).on("click", '[data-v-vvveb-action="' + actionName + '"]', VvvebTheme.Gui[actionName]);
- }*/
+ */
},
- addToCart : function (e) {
-
+ addToCart: function(e) {
let product = elementProduct(this);
- let img = $("img[data-v-product-image], img[data-v-product-image-src], img[data-v-product-image]", product);
- let name = $("[data-v-product-name]:first", product).text();
- let quantity = $('[name="quantity"]:first', product).val() ?? 1;
- let id = this.dataset.product_id;
+ let img = product.querySelector("img[data-v-product-image], img[data-v-product-image-src], img[data-v-product-image]");
+ let name = product.querySelector("[data-v-product-name]").textContent ?? "";
+ let quantity = product.querySelector('[name="quantity"]')?.value ?? 1;
+ let id = this.dataset.product_id ?? product.dataset.product_id;
let options = {quantity};
if (!id) {
- id = product[0].dataset.product_id;
+ id = product.dataset.product_id;
if (!id) {
- id = $('input[name="product_id"]', product).val();
+ id = product.querySelector('input[name="product_id"]').value;
}
}
let cart_add_text = 'was added to cart';
- if (e.currentTarget.form) {
- options = objectSerialize($(e.currentTarget.form).serializeArray());
- if (!e.currentTarget.form.checkValidity()) {
- e.currentTarget.form.requestSubmit();
+ let target = e.target.closest("button, input");
+
+ if (target?.form) {
+ options = Object.fromEntries(new URLSearchParams(new FormData(target.form)));
+ if (!target.form.checkValidity()) {
+ target.form.requestSubmit();
return false;
}
}
VvvebTheme.Cart.add(id, options, this, '.mini-cart', function() {
- let src = img.attr("src");
+ let src = img.getAttribute("src");
VvvebTheme.Alert.show(`
<div class="clearfix">
<img class="float-start me-2" height="80" src="${src}"> &ensp;
@@ -388,27 +433,28 @@ VvvebTheme.Gui = {
</div>`);
});
+ e.preventDefault();
return false;
},
- removeFromCart : function (e) {
+ removeFromCart: function(e) {
- let product = $(this).parents("[data-v-product]");
- if (!product.length) {
- product = $(this).parents("[data-v-component-product]");
+ let product = this.closest("[data-v-product]");
+ if (!product) {
+ product = this.closest("[data-v-component-product]");
}
- if (!product.length) {
- product = $(this).parents("[data-v-cart-product]");
+ if (!product) {
+ product = this.closest("[data-v-cart-product]");
}
- let img = $("[data-v-product-image],[data-v-product-image], [data-v-cart-product-image]", product).attr("src");
- let name = $("[data-v-product-name]", product).text();
+ let img = product.querySelector("[data-v-product-image],[data-v-product-image], [data-v-cart-product-image]")?.getAttribute("src") ?? "";
+ let name = product.querySelector("[data-v-product-name]")?.textContent ?? "";
let id = this.dataset.product_id;
let selector = this.dataset.selector ?? '.cart-box';
if (!id) {
- id = product[0].dataset.product_id;
+ id = product.dataset.product_id;
if (!id) {
- id = $('input[name="product_id"]', product).val();
+ id = product.querySelector('input[name="product_id"]').value;
}
}
@@ -417,18 +463,19 @@ VvvebTheme.Gui = {
product.remove();
});
+ e.preventDefault();
return false;
},
- addToWishlist : function (e) {
+ addToWishlist: function(e) {
let product = elementProduct(this);
- let id = this.dataset.product_id;
- let img = $("[data-v-product-image],[data-v-product-image], [data-v-cart-product-image]", product).attr("src");
+ let id = this.dataset.product_id ?? product.dataset.product_id;
+ let img = product.querySelector("[data-v-product-image],[data-v-product-image], [data-v-cart-product-image]").getAttribute("src");
if (!id) {
- id = product[0].dataset.product_id;
+ id = product.dataset.product_id;
if (!id) {
- id = $('input[name="product_id"]', product).val();
+ id = product.querySelector('input[name="product_id"]').value;
}
}
@@ -436,69 +483,71 @@ VvvebTheme.Gui = {
VvvebTheme.Alert.show('<img height=50 src="' + img + '"> &ensp; <strong>' + name +'</strong> was added to wishlist');
});
+ e.preventDefault();
return false;
},
- addToCompare : function (e) {
+ addToCompare: function(e) {
let product = elementProduct(this);
let id = this.dataset.product_id;
- let img = $("[data-v-product-image],[data-v-product-image], [data-v-cart-product-image]", product).attr("src");
+ let img = product.querySelector("[data-v-product-image],[data-v-product-image], [data-v-cart-product-image]").getAttribute("src");
if (!id) {
- id = product[0].dataset.product_id;
+ id = product.dataset.product_id;
if (!id) {
- id = $('input[name="product_id"]', product).val();
+ id = product.querySelector('input[name="product_id"]').value;
}
}
- VvvebTheme.Wishlist.add(id, this, false, function(data) {
+ VvvebTheme.Compare.add(id, this, false, function(data) {
VvvebTheme.Alert.show('<img height=50 src="' + img + '"> &ensp; <strong>' + name +'</strong> was added to compare');
});
+ e.preventDefault();
return false;
},
- replyTo : function (e) {
+ replyTo: function(e) {
let commentId = this.dataset.comment_id;
let commentAuthor = this.dataset.comment_author;
let commentForm = document.getElementById("comment-form");
//location.hash = "#comment-form";
+ /*
window.scrollTo({
top: commentForm.offsetTop + commentForm.clientHeight,
left: 0,
behavior: "smooth",
- });
+ });*/
- $("input[name=parent_id]", commentForm).val(commentId);
+ commentForm.querySelector("input[name=parent_id]").value = commentId;
if (commentId > 0) {
- $(".replyto").show();
- $(".replyto [data-comment-author]").html(commentAuthor);
+ document.querySelector(".replyto").style.display = "";
+ document.querySelector(".replyto [data-comment-author]").innerHTML = commentAuthor;
} else {
- $(".replyto").hide();
+ document.querySelector(".replyto").style.display = "none";
}
-
+ e.preventDefault();
return false;
},
- addComment : function (e) {
+ addComment: function(e) {
let selector = this.dataset.selector ?? ".post-comments";
let form = this;
- let parameters = $(form).serializeArray();
+ let parameters = Object.fromEntries(new URLSearchParams(new FormData(form)));
VvvebTheme.Comments.add(parameters, this, selector, function () {
form.reset();
});
e.preventDefault();
-
},
- addReview : function (e) {
+ addReview: function(e) {
let selector = this.dataset.selector ?? ".product-reviews";
let form = this;
- let parameters = $(form).serializeArray();
+ let parameters = Object.fromEntries(new URLSearchParams(new FormData(form)));
parameters['module'] = 'product/product';
parameters['action'] = 'addReview';
@@ -510,10 +559,10 @@ VvvebTheme.Gui = {
},
- addQuestion : function (e) {
+ addQuestion: function(e) {
let selector = this.dataset.selector ?? ".product-questions";
let form = this;
- let parameters = $(form).serializeArray();
+ let parameters = Object.fromEntries(new URLSearchParams(new FormData(form)));
parameters['module'] = 'product/product';
parameters['action'] = 'addQuestion';
@@ -522,45 +571,70 @@ VvvebTheme.Gui = {
});
e.preventDefault();
-
},
- search : function (e) {
+ search: function (e) {
clearTimeout(window.searchDebounce);
- let parameters = $(this).serializeArray();
+ let parameters = Object.fromEntries(new URLSearchParams(new FormData(this)));
+ let element = this;
+ let component = element.closest("[data-v-component-search]");
window.searchDebounce = setTimeout(function () {
- $("[data-v-component-search]").css("opacity", 0.5);
- VvvebTheme.Search.query(parameters, this, function(data) {
- $("[data-v-component-search]")[0].outerHTML = data;
+ component.css("opacity", 0.5);
+ VvvebTheme.Search.query(parameters, element, function(data) {
+ component.outerHTML = data;
});
e.preventDefault();
}, 1000);
},
- login : function (e) {
- let parameters = $(this).serializeArray();
+ login: function (e) {
+ let parameters = Object.fromEntries(new URLSearchParams(new FormData(this)));
let componentUser;
let url = this.dataset.vUrl ?? false;
let selector = this.dataset.selector ?? '.user-box';
-
+
if (url) {
VvvebTheme.User.module = url;
}
- componentUser = $(this).parents('[data-v-component-user]');
- //parameters['component_id'] = $('[data-v-component-user]').index(componentUser);
+ componentUser = this.closest('[data-v-component-user]');
+ //parameters['component_id'] = document.querySelectorAll('[data-v-component-user]').index(componentUser);
VvvebTheme.User.login(parameters, this, selector/*, function(data) {
- //$("[data-v-component-user]")[0].outerHTML = data;
+ //document.querySelectorAll("[data-v-component-user]")[0].outerHTML = data;
componentUser.html(data);
// alert("Login");
}*/);
e.preventDefault();
+ },
+
+ //used to submit any form without refreshing page, used for contact forms
+ submit: function (e) {
+ let form = this;
+ let parameters = Object.fromEntries(new URLSearchParams(new FormData(form)));
+ let componentUser;
+ let url = this.dataset.vUrl ?? false;
+ let selector = this.dataset.selector;
+ let loading = this.querySelector("button .loading, .btn .loading");
+ if (loading) {
+ loading.classList.remove("d-none");
+ loading.parentNode.querySelector(".button-text")?.classList.add("d-none");
+ }
+
+ loadAjax(url, selector, () => {
+ if (loading) {
+ loading.classList.add("d-none");
+ loading.parentNode.querySelector(".button-text")?.classList.remove("d-none");
+ form.reset();
+ }
+ }, parameters, "post");
+
+ e.preventDefault();
}
}
@@ -579,88 +653,61 @@ function preloadUrl(e) {
delay(() => loadUrl(e, true), 200);
}
-/*
-function loadUrl(e, preload = false) {
- let element = e.currentTarget;
- let url = element.href;
- let selector = e.data.update;
-
- if (!selector) selector = "body";
-
- if (urlCache.hasOwnProperty(url)) {
- let page = urlCache[url];
- if (page && !preload) {
- $(selector).replaceWith($(selector, $(page)));
- }
- return;
- } else if (!preload) {
- urlCache[url] = false;//set loading flag
- }
- $.ajax({
- dataType : 'html',
- url : url,
- cache: true,
- success : function(data) {
-
- //if not preloading or cache loading flag set then update page
- if (!preload || (preload && urlCache.hasOwnProperty(url) && urlCache[url] === false)) {
- let page = $(data);
- $(selector).replaceWith($(selector, page));
+//ajax url
+function loadAjax(url, selector, callback = null, params = {}, method = "get") {
+ let options = {method};
+ if (method == "post" && params) {
+ options.body = new URLSearchParams(params);
+ }
+
+ if (!url) url = window.location.href;
+ console.log(selector);
+ fetch(url, options).
+ then((response) => {
+ if (!response.ok) { throw new Error(response) }
+ return response.text()
+ }).then(function (data) {
+ if (selector) {
+ let response = new DOMParser().parseFromString(data, "text/html");
+
+ if (Array.isArray (selector) ) {
+ for (k in selector) {
+ let elementSelector = selector[k];
+ let currentElement = document.querySelector(elementSelector);
+ let newElement = response.querySelector(elementSelector);
+ if (currentElement && newElement) {
+ currentElement.replaceWith(newElement);
+ }
}
- urlCache[url] = data;
- }
- });
- //let selector = e.
- //if (!selector) selector = "body";
-
- e.preventDefault();
- return false;
-}
-
-if (preloadUrls) {
- for (url in preloadUrls) {
- let link = preloadUrls[url];
-
- $("body").on("mouseenter",link["link"], link, preloadUrl);
- $("body").on("click",link["link"], link, loadUrl);
- }
-}
-*/
-
-jQuery(document).ready(function() {
- VvvebTheme.Gui.init();
-});
+ } else {
+ let currentElement = document.querySelector(selector);
+ let newElement = response.querySelector(selector);
-//ajax url
-function loadAjax(url, selector, callback = null) {
- $.ajax({
- url
- }).done(function (data) {
- let content = $(selector, data);
- if (content.length) {
- $(selector).html(content.html());
- if (callback) {
- callback();
+ if (currentElement && newElement) {
+ currentElement.replaceWith(newElement);
+ }
}
-
- $(window).trigger("vvveb.loadUrl", {url, selector});
- }
- }).fail(function (data) {
- alert(data.responseText);
+ }
+
+ window.dispatchEvent(new CustomEvent("vvveb.loadUrl", {detail: {url, selector}}));
+ }).catch(error => {
+ console.log(error.statusText);
});
}
-$("body").on("click", "a[data-url]", function (e) {
- let $this = $(this);
- let selector = this.dataset.selector ?? "";
- let url = $this.attr("href") ?? "";
-
- if (!url) return;
-
- loadAjax(url, selector, () => window.history.pushState({url, selector}, null, url));
-
- e.preventDefault();
+document.addEventListener("click", function (e) {
+ let element = e.target.closest("a[data-url]");
+ if (element) {
+ let selector = element.dataset.selector ?? "";
+ let url = element.getAttribute("href") ?? "";
+
+ if (!url) return;
+
+ loadAjax(url, selector, () => window.history.pushState({url, selector}, null));
+
+ e.preventDefault();
+ }
});
addEventListener("popstate", checkState);
@@ -672,3 +719,6 @@ function checkState(e) {
}
window.history.pushState({url:window.location.pathname, selector:".content-body"}, null, window.location.href);
+
+
+VvvebTheme.Gui.init();
diff --git a/public/js/common/router.js b/public/js/common/router.js
index 80d55e3..ad03145 100755
--- a/public/js/common/router.js
+++ b/public/js/common/router.js
@@ -3,29 +3,30 @@ let Router = {
init: function() {
let events = [];
- $("[data-v-vvveb-action]").each(function () {
+ document.querySelectorAll("[data-v-vvveb-action]").forEach(function (el, i) {
let on = "click";
- if (this.dataset.vVvvebOn) on = this.dataset.vVvvebOn;
- var event = '[data-v-vvveb-action="' + this.dataset.vVvvebAction + '"]';
+ if (el.dataset.vVvvebOn) on = el.dataset.vVvvebOn;
+ var event = '[data-v-vvveb-action="' + el.dataset.vVvvebAction + '"]';
if (events.indexOf(event) > -1) return;
events.push(event);
- let namespace = this.dataset.vVvvebAction.split(".");
+ let namespace = el.dataset.vVvvebAction.split(".");
if (!window[namespace[0]]) {
- console.error('Controller %s is not available', namespace[0], this);
+ console.error('Controller %s is not available', namespace[0], el);
return;
}
if (!window[namespace[0]][namespace[1]]) {
- console.error('Method %s is not available for %s', namespace[1], namespace[0], this);
+ console.error('Method %s is not available for %s', namespace[1], namespace[0], el);
return;
}
let fn = window[namespace[0]][namespace[1]];
- $(document).on(on, event, fn);
+
+ el.addEventListener(on, fn);
});
},
diff --git a/public/js/filter.js b/public/js/filter.js
index 4b4b56e..0476d85 100644
--- a/public/js/filter.js
+++ b/public/js/filter.js
@@ -33,20 +33,48 @@ function filterChange() {
filters[name].push(element.value);
});
+ if ('URLSearchParams' in window) {
+ let params = new URLSearchParams(window.location.search);
+ for (const [key, value] of params.entries()) {
+ if (key.startsWith("filter")) {params.delete(key)}
+ }
+
+ let query = params.toString();
+ filter_text = (query ? "?" + query : "");
+ }
+
for(filter_name in filters) {
for (filter in filters[filter_name]) {
filter_text += (filter_text ? '&' : '?') + "filter[" + filter_name + "][]=" + filters[filter_name][filter];
}
}
-
- location = action + filter_text;
+
+ let url = action + filter_text;
+ let selector = "#site-content";
+ loadAjax(url, selector);
+ window.history.pushState({url, selector}, null, url);
+ //location = action + filter_text;
}
let _filter_timeout;
-document.querySelectorAll('.filters input').forEach(e => e.addEventListener("click", function() {
+
+document.addEventListener("click", (event) => {
+ if (event.target.closest('.filters input')) {
clearTimeout(_filter_timeout);
_filter_timeout = setTimeout(function () {
filterChange();
- }, 1500);
-}));
\ No newline at end of file
+ }, 1000);
+ }
+});
+
+document.addEventListener("click", (event) => {
+ let target = event.target.closest('.page-link');
+ if (target) {
+ let url = target.href;
+ let selector = "#site-content";
+ loadAjax(url, selector);
+ window.history.pushState({url, selector}, null, url);
+ event.preventDefault();
+ }
+});
\ No newline at end of file
diff --git a/public/js/jquery.hotkeys.js b/public/js/jquery.hotkeys.js
deleted file mode 100755
index e7701f3..0000000
--- a/public/js/jquery.hotkeys.js
+++ /dev/null
@@ -1,204 +0,0 @@
-/*jslint browser: true*/
-/*jslint jquery: true*/
-
-/*
- * jQuery Hotkeys Plugin
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Based upon the plugin by Tzury Bar Yochay:
- * https://github.com/tzuryby/jquery.hotkeys
- *
- * Original idea by:
- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
- */
-
-/*
- * One small change is: now keys are passed by object { keys: '...' }
- * Might be useful, when you want to pass some other data to your handler
- */
-
-(function(jQuery) {
-
- jQuery.hotkeys = {
- version: "0.2.0",
-
- specialKeys: {
- 8: "backspace",
- 9: "tab",
- 10: "return",
- 13: "return",
- 16: "shift",
- 17: "ctrl",
- 18: "alt",
- 19: "pause",
- 20: "capslock",
- 27: "esc",
- 32: "space",
- 33: "pageup",
- 34: "pagedown",
- 35: "end",
- 36: "home",
- 37: "left",
- 38: "up",
- 39: "right",
- 40: "down",
- 45: "insert",
- 46: "del",
- 59: ";",
- 61: "=",
- 96: "0",
- 97: "1",
- 98: "2",
- 99: "3",
- 100: "4",
- 101: "5",
- 102: "6",
- 103: "7",
- 104: "8",
- 105: "9",
- 106: "*",
- 107: "+",
- 109: "-",
- 110: ".",
- 111: "/",
- 112: "f1",
- 113: "f2",
- 114: "f3",
- 115: "f4",
- 116: "f5",
- 117: "f6",
- 118: "f7",
- 119: "f8",
- 120: "f9",
- 121: "f10",
- 122: "f11",
- 123: "f12",
- 144: "numlock",
- 145: "scroll",
- 173: "-",
- 186: ";",
- 187: "=",
- 188: ",",
- 189: "-",
- 190: ".",
- 191: "/",
- 192: "`",
- 219: "[",
- 220: "\\",
- 221: "]",
- 222: "'"
- },
-
- shiftNums: {
- "`": "~",
- "1": "!",
- "2": "@",
- "3": "#",
- "4": "$",
- "5": "%",
- "6": "^",
- "7": "&",
- "8": "*",
- "9": "(",
- "0": ")",
- "-": "_",
- "=": "+",
- ";": ": ",
- "'": "\"",
- ",": "<",
- ".": ">",
- "/": "?",
- "\\": "|"
- },
-
- // excludes: button, checkbox, file, hidden, image, password, radio, reset, search, submit, url
- textAcceptingInputTypes: [
- "text", "password", "number", "email", "url", "range", "date", "month", "week", "time", "datetime",
- "datetime-local", "search", "color", "tel"],
-
- // default input types not to bind to unless bound directly
- textInputTypes: /textarea|input|select/i,
-
- options: {
- filterInputAcceptingElements: true,
- filterTextInputs: true,
- filterContentEditable: true
- }
- };
-
- function keyHandler(handleObj) {
- if (typeof handleObj.data === "string") {
- handleObj.data = {
- keys: handleObj.data
- };
- }
-
- // Only care when a possible input has been specified
- if (!handleObj.data || !handleObj.data.keys || typeof handleObj.data.keys !== "string") {
- return;
- }
-
- var origHandler = handleObj.handler,
- keys = handleObj.data.keys.toLowerCase().split(" ");
-
- handleObj.handler = function(event) {
- // Don't fire in text-accepting inputs that we didn't directly bind to
- if (this !== event.target &&
- (jQuery.hotkeys.options.filterInputAcceptingElements &&
- jQuery.hotkeys.textInputTypes.test(event.target.nodeName) ||
- (jQuery.hotkeys.options.filterContentEditable && jQuery(event.target).attr('contenteditable')) ||
- (jQuery.hotkeys.options.filterTextInputs &&
- jQuery.inArray(event.target.type, jQuery.hotkeys.textAcceptingInputTypes) > -1))) {
- return;
- }
-
- var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[event.which],
- character = String.fromCharCode(event.which).toLowerCase(),
- modif = "",
- possible = {};
-
- jQuery.each(["alt", "ctrl", "shift"], function(index, specialKey) {
-
- if (event[specialKey + 'Key'] && special !== specialKey) {
- modif += specialKey + '+';
- }
- });
-
- // metaKey is triggered off ctrlKey erronously
- if (event.metaKey && !event.ctrlKey && special !== "meta") {
- modif += "meta+";
- }
-
- if (event.metaKey && special !== "meta" && modif.indexOf("alt+ctrl+shift+") > -1) {
- modif = modif.replace("alt+ctrl+shift+", "hyper+");
- }
-
- if (special) {
- possible[modif + special] = true;
- }
- else {
- possible[modif + character] = true;
- possible[modif + jQuery.hotkeys.shiftNums[character]] = true;
-
- // "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
- if (modif === "shift+") {
- possible[jQuery.hotkeys.shiftNums[character]] = true;
- }
- }
-
- for (var i = 0, l = keys.length; i < l; i++) {
- if (possible[keys[i]]) {
- return origHandler.apply(this, arguments);
- }
- }
- };
- }
-
- jQuery.each(["keydown", "keyup", "keypress"], function() {
- jQuery.event.special[this] = {
- add: keyHandler
- };
- });
-
-})(jQuery || this.jQuery || window.jQuery);
diff --git a/public/js/libs/tinymce-embed.js b/public/js/libs/tinymce-embed.js
index ffc6598..661d7e4 100755
--- a/public/js/libs/tinymce-embed.js
+++ b/public/js/libs/tinymce-embed.js
@@ -1,11 +1,14 @@
-$(window).on("vvveb.tinymce.options", function (e, tinyMceOptions) {
+window.addEventListener("vvveb.tinymce.options", function (e) {
+ let tinyMceOptions = e.detail;
+
tinyMceOptions.quickbars_insert_toolbar += '| Embed';
tinyMceOptions.toolbar += '| Embed';
return tinyMceOptions;
});
-$(window).on("vvveb.tinymce.setup", function (e, editor) {
+window.addEventListener("vvveb.tinymce.setup", function (e) {
+ let editor = e.detail;
editor.ui.registry.addButton('Embed', {
text: "Embed",
diff --git a/public/js/libs/tinymce-options.js b/public/js/libs/tinymce-options.js
index 733fd11..5d24b3d 100755
--- a/public/js/libs/tinymce-options.js
+++ b/public/js/libs/tinymce-options.js
@@ -1,8 +1,10 @@
var noWrapNodes = "p > img,p > video, p > figure";
var wrapNodes = ['B','I','SPAN', 'TABLE', 'P', 'H1', 'H2', 'H3', 'H4'];
-function fixWrapper(body){
- $(body).find(noWrapNodes + ",.post-content > *").each(function (i, e) {
+function fixWrapper(doc){
+ let body = doc.body;
+
+ body.querySelectorAll(noWrapNodes + ",.post-content > *").forEach(e => {
//if the element is the only node inside the paragraph and is not an inline element
if (!e.nextSibling && !e.previousSibling && (wrapNodes.indexOf(e.tagName) == -1)) {
if (e.parentNode.parentNode.tagName !== "HTML") {
@@ -16,8 +18,16 @@ function fixWrapper(body){
}
});
- if($(body).find('.post-content').length == 0 && body.tagName == "BODY" && body.id == "tinymce"){
- $(body).wrapInner('<div class="post-content"></div>');
+ if(!body.querySelector('.post-content') && body.tagName == "BODY" && body.id == "tinymce"){
+ const wrappingElement = body.ownerDocument.createElement('div');
+ wrappingElement.setAttribute("class","post-content");
+
+
+ while(body.firstChild) {
+ wrappingElement.appendChild(body.firstChild);
+ }
+
+ body.appendChild(wrappingElement);
}
}
@@ -25,24 +35,76 @@ const isSmallScreen = window.matchMedia('(max-width: 1023.5px)').matches;
let tinyMceSkin = "oxide";
let tinyMceTheme = 'auto'
-if (window.matchMedia("(prefers-color-scheme: dark)").matches || $("html").attr("data-bs-theme") == "dark") {
+if (window.matchMedia("(prefers-color-scheme: dark)").matches || (document.documentElement.dataset.bsTheme == "dark")) {
tinyMceSkin = "oxide-dark";
tinyMceTheme = 'dark';
}
let make_wysiwyg = function(inst){
- fixWrapper(inst.contentDocument.body);
+ fixWrapper(inst.contentDocument);
//set dark theme
inst.contentDocument.documentElement.setAttribute("data-bs-theme", tinyMceTheme);
}
-var tinyMceOptions = {
+
+const tinymce_image_upload_handler = (blobInfo, progress) => new Promise((resolve, reject) => {
+
+ const xhr = new XMLHttpRequest();
+ xhr.withCredentials = false;
+ xhr.open('POST', uploadUrl);
+
+ xhr.upload.onprogress = (e) => {
+ progress(e.loaded / e.total * 100);
+ };
+
+ xhr.onload = () => {
+ if (xhr.status === 403) {
+ reject({ message: 'HTTP Error: ' + xhr.status, remove: true });
+ return;
+ }
+
+ if (xhr.status < 200 || xhr.status >= 300) {
+ reject('HTTP Error: ' + xhr.status);
+ return;
+ }
+ /*
+ const json = JSON.parse(xhr.responseText);
+
+ if (!json || typeof json.location != 'string') {
+ reject('Invalid JSON: ' + xhr.responseText);
+ return;
+ }
+
+ resolve(json.location);*/
+ resolve(mediaPath + "/" + xhr.responseText);
+ };
+
+ xhr.onerror = () => {
+ reject('Image upload failed due to a XHR Transport error. Code: ' + xhr.status);
+ };
+
+ const formData = new FormData();
+ formData.append('file', blobInfo.blob(), blobInfo.filename());
+ formData.append('file', blobInfo.blob(), blobInfo.filename());
+
+ formData.append("mediaPath", mediaPath);
+ formData.append("onlyFilename", true);
+
+
+ xhr.send(formData);
+});
+
+
+let tinyMceOptions = {
selector: "textarea.html",
body_class: "container",
init_instance_callback : make_wysiwyg,
setup: function (editor) {
//set changes to false to avoid saving unchanged revisions if text is not changed
- $(".has_changes", document.getElementById(editor.id).parentNode).val("0");
+ let has_changes = document.getElementById(editor.id)?.parentNode.querySelector(".has_changes");
+ if (has_changes) {
+ has_changes.value = "0";
+ }
editor.ui.registry.addButton('quickmedia', {
icon: 'image',
@@ -86,16 +148,16 @@ var tinyMceOptions = {
});
*/
editor.on('SetContent',function (ed, e) {
- fixWrapper(this.contentDocument.body); // if wrapper has been deleted, add it back
+ fixWrapper(this.contentDocument); // if wrapper has been deleted, add it back
});
editor.on('change', function(ed, e) {
// text changed set has_changes flag to save revision
- $(".has_changes", ed.target.container.parentNode).val(1);
+ ed.target.container.parentNode.querySelector(".has_changes").value = "1";
});
- $(window).trigger("vvveb.tinymce.setup", editor);
+ window.dispatchEvent(new CustomEvent("tinymce.setup", {detail: editor}));
},
plugins: 'preview importcss searchreplace autolink autosave autoresize save directionality code visualblocks visualchars fullscreen image media link codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount help quickbars emoticons table accordion',
@@ -129,33 +191,11 @@ var tinyMceOptions = {
relative_urls : false,
convert_urls : false,
file_picker_callback: function (callback, value, meta) {
- if (!Vvveb.MediaModal) {
- Vvveb.MediaModal = new MediaModal(true);
- Vvveb.MediaModal.mediaPath = mediaPath;
- }
- Vvveb.MediaModal.open(null, callback);
- return;
- /* Provide file and text for the link dialog */
- if (meta.filetype === 'file') {
- callback('https://www.google.com/logos/google.jpg', {
- text: 'My text'
- });
- }
-
- /* Provide image and alt text for the image dialog */
- if (meta.filetype === 'image') {
- callback('https://www.google.com/logos/google.jpg', {
- alt: 'My alt text'
- });
- }
-
- /* Provide alternative source and posted for the media dialog */
- if (meta.filetype === 'media') {
- callback('movie.mp4', {
- source2: 'alt.ogg',
- poster: 'https://www.google.com/logos/google.jpg'
- });
+ if (!Vvveb.MediaModal) {
+ Vvveb.MediaModal = new MediaModal(true);
+ Vvveb.MediaModal.mediaPath = mediaPath;
}
+ Vvveb.MediaModal.open(null, callback);
},/*
templates: [{
title: 'New Table',
@@ -184,7 +224,8 @@ var tinyMceOptions = {
content_css: vvvebThemeCss,
//content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }',
content_style: "body {padding: 10px}",
- images_upload_url: 'postAcceptor.php',
+ images_reuse_filename: true,
+ images_upload_url: uploadUrl,
verify_html: false,
//force_br_newlines: true,
//forced_root_block : false,
@@ -201,13 +242,7 @@ var tinyMceOptions = {
apply_source_formatting : false,
verify_html : false,
/* we override default upload handler to simulate successful upload*/
- images_upload_handler: function (blobInfo, success, failure) {
- setTimeout(function () {
- /* no matter what you upload, we will turn it into TinyMCE logo :)*/
- success('http://moxiecode.cachefly.net/tinymce/v9/images/logo.png');
- }, 2000);
- },
-
+ images_upload_handler: tinymce_image_upload_handler,
formats: {
alignleft: [{
selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",