Development sync into master #25

Merged
andydixon merged 2 commits from development into master 2024-10-09 21:31:08 +02:00
Showing only changes of commit abfb0225cd - Show all commits
+4 -4
View File
@@ -68,10 +68,11 @@ $(document).ready(function () {
// Handle Saving changes to the page // Handle Saving changes to the page
$('#savePage').click(() => { $('#savePage').click(() => {
frameContainer=$('#frameContainer').contents().get(0)
$.post("/cms/controller/", { $.post("/cms/controller/", {
action: "save", action: "save",
uri: $('#frameContainer').contents().get(0).location.pathname, uri: frameContainer.location.pathname,
content: new XMLSerializer().serializeToString($('#frameContainer').contents().get(0)) content: new XMLSerializer().serializeToString(frameContainer)
}, function (data) { }, function (data) {
if (typeof data.error == "undefined") { if (typeof data.error == "undefined") {
showMessage(data.message, "success"); showMessage(data.message, "success");
@@ -165,8 +166,7 @@ $(document).ready(function () {
// Add click event to list items to redirect // Add click event to list items to redirect
$("#fileList li").click(function () { $("#fileList li").click(function () {
const fileUrl = $(this).data("url"); $('#frameContainer').contents().get(0).location.href = $(this).data("url"); // Redirect to the clicked file's URL
$('#frameContainer').contents().get(0).location.href = fileUrl; // Redirect to the clicked file's URL
$("#fileListDialog").dialog("close"); // Close the modal $("#fileListDialog").dialog("close"); // Close the modal
}); });
}, },