From 5c18c64afbdc8b888fdedf2d7cc45e1930225f02 Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sat, 16 Jan 2021 16:11:30 -0500 Subject: Change integration configuration page (#3372) I've refactored the user query code to be able to use it also on the integration configuration page. Now, items can be re-organized as in the user query list. --- p/scripts/draggable.js | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ p/scripts/extra.js | 42 --------------------- p/scripts/integration.js | 54 +++++++++++++++++++++++++++ p/scripts/user.query.js | 97 ------------------------------------------------ 4 files changed, 151 insertions(+), 139 deletions(-) create mode 100644 p/scripts/draggable.js create mode 100644 p/scripts/integration.js delete mode 100644 p/scripts/user.query.js (limited to 'p') diff --git a/p/scripts/draggable.js b/p/scripts/draggable.js new file mode 100644 index 000000000..d9d1d1cc0 --- /dev/null +++ b/p/scripts/draggable.js @@ -0,0 +1,97 @@ +// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0 +"use strict"; +/* jshint esversion:6, strict:global */ + +const init_draggable_list = function() { + if (!window.context) { + if (window.console) { + console.log('FreshRSS draggable list waiting for JS…'); + } + setTimeout(init_draggable_list, 50); + return; + } + + let source; + const draggableList = document.querySelector('.draggableList'); + const addMarker = (position, element) => { + const hr = draggableList.querySelector('hr.drag-drop-marker'); + if (null === hr) { + element.insertAdjacentHTML(position, '
'); + } + }; + const removeMarker = () => { + const hr = draggableList.querySelector('hr.drag-drop-marker'); + if (null !== hr) { + hr.remove(); + } + }; + + draggableList.addEventListener('dragstart', event => { + source = event.target.closest('[draggable="true"]'); + event.dataTransfer.setData('text/html', source.outerHTML); + event.dataTransfer.effectAllowed = 'move'; + }); + draggableList.addEventListener('dragover', event => { + event.preventDefault(); + if (!event.target || !event.target.closest) { + return; + } + + const draggableItem = event.target.closest('[draggable="true"]'); + if (null === draggableItem || source === draggableItem) { + return; + } + + const rect = draggableItem.getBoundingClientRect(); + if (event.clientY < (rect.top + rect.height / 2)) { + addMarker('beforebegin', draggableItem); + } else { + addMarker('afterend', draggableItem); + } + }); + draggableList.addEventListener('dragleave', event => { + event.preventDefault(); + removeMarker(); + }); + draggableList.addEventListener('drop', event => { + event.preventDefault(); + event.stopPropagation(); + if (!event.target || !event.target.closest) { + return; + } + + const draggableItem = event.target.closest('[draggable="true"]'); + if (null === draggableItem || source === draggableItem) { + return; + } + + const rect = draggableItem.getBoundingClientRect(); + if (event.clientY < (rect.top + rect.height / 2)) { + draggableItem.insertAdjacentHTML('beforebegin', event.dataTransfer.getData('text/html')); + } else { + draggableItem.insertAdjacentHTML('afterend', event.dataTransfer.getData('text/html')); + } + source.remove(); + removeMarker(); + draggableList.submit(); + }); + + // This is needed to work around a Firefox bug → https://bugzilla.mozilla.org/show_bug.cgi?id=800050 + draggableList.addEventListener('focusin', event => { + if (!event.target || !event.target.closest) { + return; + } + + const itemName = event.target.closest('input[type="text"]'); + if (null !== itemName) { + itemName.select(); + } + }); +}; + +if (document.readyState && document.readyState !== 'loading') { + init_draggable_list(); +} else if (document.addEventListener) { + document.addEventListener('DOMContentLoaded', event => init_draggable_list(), false); +} +// @license-end diff --git a/p/scripts/extra.js b/p/scripts/extra.js index 3cb7b93aa..a78b5b10d 100644 --- a/p/scripts/extra.js +++ b/p/scripts/extra.js @@ -93,46 +93,6 @@ function init_crypto_form() { } // -function init_share_observers() { - let shares = document.querySelectorAll('.group-share').length; - const shareAdd = document.querySelector('.share.add'); - if (shareAdd) { - shareAdd.onclick = function (ev) { - const s = this.parentElement.querySelector('select'), - opt = s.options[s.selectedIndex]; - let row = this.closest('form').getAttribute('data-' + opt.getAttribute('data-form')); - row = row.replace(/##label##/g, opt.text); - row = row.replace(/##type##/g, opt.value); - row = row.replace(/##help##/g, opt.getAttribute('data-help')); - row = row.replace(/##key##/g, shares); - row = row.replace(/##method##/g, opt.getAttribute('data-method')); - row = row.replace(/##field##/g, opt.getAttribute('data-field')); - this.closest('.form-group').insertAdjacentHTML('beforebegin', row); - shares++; - return false; - }; - } -} - - -function init_remove_observers() { - document.querySelectorAll('.post').forEach(function (div) { - div.onclick = function (ev) { - const a = ev.target.closest('a.remove'); - if (a) { - const remove_what = a.getAttribute('data-remove'); - if (remove_what !== undefined) { - const d = document.getElementById(remove_what); - if (d) { - d.remove(); - } - } - return false; - } - }; - }); -} - function init_password_observers() { document.querySelectorAll('.toggle-password').forEach(function (a) { a.onmousedown = function (ev) { @@ -248,8 +208,6 @@ function init_extra() { return; } init_crypto_form(); - init_share_observers(); - init_remove_observers(); init_password_observers(); init_select_observers(); init_slider_observers(); diff --git a/p/scripts/integration.js b/p/scripts/integration.js new file mode 100644 index 000000000..076f379ec --- /dev/null +++ b/p/scripts/integration.js @@ -0,0 +1,54 @@ +// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0 +"use strict"; +/* jshint esversion:6, strict:global */ + +const init_integration = function() { + if (!window.context) { + if (window.console) { + console.log('FreshRSS integration waiting for JS…'); + } + setTimeout(init_integration, 50); + return; + } + + let shares = document.querySelectorAll('.group-share').length; + document.querySelector('.share.add').addEventListener('click', event => { + const shareTypes = event.target.closest('.group-controls').querySelector('select'); + const shareType = shareTypes.options[shareTypes.selectedIndex]; + let newShare = event.target.closest('form').getAttribute(`data-${shareType.getAttribute('data-form')}`); + newShare = newShare.replace(/##label##/g, shareType.text); + newShare = newShare.replace(/##type##/g, shareType.value); + newShare = newShare.replace(/##help##/g, shareType.getAttribute('data-help')); + newShare = newShare.replace(/##key##/g, shares); + newShare = newShare.replace(/##method##/g, shareType.getAttribute('data-method')); + newShare = newShare.replace(/##field##/g, shareType.getAttribute('data-field')); + event.target.closest('.form-group').insertAdjacentHTML('beforebegin', newShare); + shares++; + }); + + document.querySelector('.post').addEventListener('click', event => { + if (!event.target || !event.target.closest) { + return; + } + + const deleteButton = event.target.closest('a.remove'); + if (null === deleteButton || !deleteButton.closest) { + return; + } + + const share = deleteButton.closest('.group-share'); + const form = deleteButton.closest('form'); + if (!share.remove || !form.submit) { + return; + } + share.remove(); + form.submit(); + }); +}; + +if (document.readyState && document.readyState !== 'loading') { + init_integration(); +} else if (document.addEventListener) { + document.addEventListener('DOMContentLoaded', event => init_integration(), false); +} +// @license-end diff --git a/p/scripts/user.query.js b/p/scripts/user.query.js deleted file mode 100644 index 17bf041a6..000000000 --- a/p/scripts/user.query.js +++ /dev/null @@ -1,97 +0,0 @@ -// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-3.0 -"use strict"; -/* jshint esversion:6, strict:global */ - -const init_draggable = function() { - if (!window.context) { - if (window.console) { - console.log('FreshRSS user query waiting for JS…'); - } - setTimeout(init_draggable, 50); - return; - } - - let source; - const configureQueries = document.querySelector('#configureQueries'); - const addMarker = (position, element) => { - const hr = configureQueries.querySelector('hr.drag-drop-marker'); - if (null === hr) { - element.insertAdjacentHTML(position, '
'); - } - }; - const removeMarker = () => { - const hr = configureQueries.querySelector('hr.drag-drop-marker'); - if (null !== hr) { - hr.remove(); - } - }; - - configureQueries.addEventListener('dragstart', event => { - source = event.target.closest('[draggable="true"]'); - event.dataTransfer.setData('text/html', source.outerHTML); - event.dataTransfer.effectAllowed = 'move'; - }); - configureQueries.addEventListener('dragover', event => { - event.preventDefault(); - if (!event.target || !event.target.closest) { - return; - } - - const dropQuery = event.target.closest('[draggable="true"]'); - if (null === dropQuery || source === dropQuery) { - return; - } - - const rect = dropQuery.getBoundingClientRect(); - if (event.clientY < (rect.top + rect.height / 2)) { - addMarker('beforebegin', dropQuery); - } else { - addMarker('afterend', dropQuery); - } - }); - configureQueries.addEventListener('dragleave', event => { - event.preventDefault(); - removeMarker(); - }); - configureQueries.addEventListener('drop', event => { - event.preventDefault(); - event.stopPropagation(); - if (!event.target || !event.target.closest) { - return; - } - - const dropQuery = event.target.closest('[draggable="true"]'); - if (null === dropQuery || source === dropQuery) { - return; - } - - const rect = dropQuery.getBoundingClientRect(); - if (event.clientY < (rect.top + rect.height / 2)) { - dropQuery.insertAdjacentHTML('beforebegin', event.dataTransfer.getData('text/html')); - } else { - dropQuery.insertAdjacentHTML('afterend', event.dataTransfer.getData('text/html')); - } - source.remove(); - removeMarker(); - configureQueries.submit(); - }); - - // This is needed to work around a Firefox bug → https://bugzilla.mozilla.org/show_bug.cgi?id=800050 - configureQueries.addEventListener('focusin', event => { - if (!event.target || !event.target.closest) { - return; - } - - const queryName = event.target.closest('input[id^="queries_"][id$="_name"]'); - if (null !== queryName) { - queryName.select(); - } - }); -}; - -if (document.readyState && document.readyState !== 'loading') { - init_draggable(); -} else if (document.addEventListener) { - document.addEventListener('DOMContentLoaded', event => init_draggable(), false); -} -// @license-end -- cgit v1.2.3