From 9eb71e0a028045d3e6f4107ac4823c13d4dc75e1 Mon Sep 17 00:00:00 2001 From: Florian Thoma Date: Sat, 1 Jul 2023 15:07:50 +1000 Subject: [PATCH 1/3] allow SS5 in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 11cfb21..fea5027 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "silverstripe/framework": "^4.0" + "silverstripe/framework": "^4.0 || ^5.0" }, "require-dev": { "phpunit/phpunit": "^9.5", From b8eacae142b31af97a7a04017a5a42a705dd8872 Mon Sep 17 00:00:00 2001 From: Florian Thoma Date: Sat, 1 Jul 2023 16:53:55 +1000 Subject: [PATCH 2/3] add entwine to re-enable field after saving a page --- js/SelectUploadField.js | 48 +++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/js/SelectUploadField.js b/js/SelectUploadField.js index cf1545c..dca04a8 100644 --- a/js/SelectUploadField.js +++ b/js/SelectUploadField.js @@ -1,27 +1,29 @@ -const uploadFields = document.querySelectorAll(".selectupload div.folderdropdown input[type=hidden]"); -const changeFolderLink = document.querySelector(".ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .change-folder"); -const handleUploadFieldChange = (event) => { - let folderID = event.target.value; - if (folderID !== '') { - const securityID = document.getElementById("Form_EditForm_SecurityID").value; +jQuery.entwine("selectupload", function ($) { - formData = new FormData(); - formData.append('FolderID', folderID); - formData.append('SecurityID', securityID); - let xmlhttp = new XMLHttpRequest(); - xmlhttp.open("POST", folderURL); - xmlhttp.send(formData); - } -}; + $(".field.selectupload div.folderdropdown input[type=hidden]").entwine({ + onchange: function () { + let folderID = $(this).val(); + if (folderID !== '') { + const securityID = document.getElementById("Form_EditForm_SecurityID") + ? document.getElementById("Form_EditForm_SecurityID").value + : document.getElementById("Form_ItemEditForm_SecurityID").value; -const handleDisplayFolderSelect = () => { - const folderSelectWrapper = document.querySelector(".ss-uploadfield-item .select-folder-container"); - folderSelectWrapper.classList.remove("hide"); - document.querySelector(".ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name small").innerHTML = - "Select upload folder:"; -} + let formData = new FormData(); + formData.append('FolderID', folderID); + formData.append('SecurityID', securityID); + let xmlhttp = new XMLHttpRequest(); + xmlhttp.open("POST", folderURL); + xmlhttp.send(formData); + } + } + }); + + $(".field.selectupload .ss-uploadfield-item .ss-uploadfield-item-info .ss-uploadfield-item-name .change-folder").entwine({ + onclick: function () { + const folderSelectWrapper = $(this).parents('.ss-uploadfield-item-info').find(".select-folder-container"); + folderSelectWrapper.removeClass("hide"); + $(this).parents('.ss-uploadfield-item-info').find(".ss-uploadfield-item-name small").html("Select upload folder:"); + } + }); -changeFolderLink.addEventListener('click', handleDisplayFolderSelect); -uploadFields.forEach(function (field) { - document.getElementById(field.id).onchange = handleUploadFieldChange; }); From da1362a6e79fe9d9c2808f43d53a7d07623b5a9c Mon Sep 17 00:00:00 2001 From: Florian Thoma Date: Sat, 1 Jul 2023 17:05:25 +1000 Subject: [PATCH 3/3] remove obsolete config --- _config.php | 1 - _config/config.yml | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 _config.php diff --git a/_config.php b/_config.php deleted file mode 100644 index b3d9bbc..0000000 --- a/_config.php +++ /dev/null @@ -1 +0,0 @@ -