buzzcode2007/ShopAI-Extension
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

patch stubborn data handling

Browse source 
Real fix to be done later
This commit is contained in:
buzz-lightsnack-2007 2024-04-08 23:06:34 +08:00
parent a4296b15e1
commit b8552f88c6
1 changed files with 49 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gui/scripts/windowman.JS
View file

@ -412,7 +412,6 @@ export default class windowman {
*/ */
var SEARCH = {}; var SEARCH = {};
function display(TARGET_NAME, RESULTS, TITLE_FIELD) { function display(TARGET_NAME, RESULTS, TITLE_FIELD) {
if (document.querySelectorAll(`[data-results-list="${TARGET_NAME}"]`)) { if (document.querySelectorAll(`[data-results-list="${TARGET_NAME}"]`)) {
@ -433,7 +432,7 @@ export default class windowman {
} }
// Display the results. // Display the results.
{ if ((RESULTS != null && (typeof RESULTS).includes(`obj`) && !Array.isArray(RESULTS)) ? Object.keys(RESULTS).length > 0 : false) {
let ACCESS_KEYS = {"top": ["1", "2", "3", "4", "5", "6", "7", "8", "9"], "nav": ["<", ">"]}; let ACCESS_KEYS = {"top": ["1", "2", "3", "4", "5", "6", "7", "8", "9"], "nav": ["<", ">"]};
(Object.keys(RESULTS)).forEach((result) => { (Object.keys(RESULTS)).forEach((result) => {
let result_element = document.createElement(`li`); let result_element = document.createElement(`li`);
@ -496,7 +495,7 @@ export default class windowman {
if (CONTAINERS) { if (CONTAINERS) {
(CONTAINERS).forEach((CONTAINER) => { (CONTAINERS).forEach((CONTAINER) => {
([].concat(CONTAINER.querySelectorAll(`[data-result-content]`), CONTAINER.querySelectorAll(`[data-result-store]`), document.querySelectorAll(`[data-result-enable]`))).forEach(function (ELEMENTS) { ([].concat(CONTAINER.querySelectorAll(`[data-result-content]`), CONTAINER.querySelectorAll(`[data-result-store]`), document.querySelectorAll(`[data-result-enable]`))).forEach(async function (ELEMENTS) {
if (ELEMENTS) { if (ELEMENTS) {
CONTAINER.disabled = (ITEM != null) ? !((typeof ITEM).includes(`obj`) && !Array.isArray(ITEM)) : true; CONTAINER.disabled = (ITEM != null) ? !((typeof ITEM).includes(`obj`) && !Array.isArray(ITEM)) : true;
(ELEMENTS).forEach(async function(ELEMENT) { (ELEMENTS).forEach(async function(ELEMENT) {
@ -506,23 +505,20 @@ export default class windowman {
// Init updater function. // Init updater function.
ELEMENT[`function`] = function() {}; ELEMENT[`function`] = function() {};
// Make sure that target is contained var DATA = {};
let DATA = {};
DATA[`target`] = (Object.keys(ITEM).includes(ELEMENT.getAttribute(`data-result-store`))) ? [...AREA, ...[NAME], ...(ELEMENT.getAttribute(`data-result-store`).split(`,`))] : [...(ELEMENT.getAttribute(`data-result-store`).split(`,`)), ...[NAME]]; DATA[`target`] = ((ELEMENT.getAttribute(`data-result-store`).split(`,`))[0] == ``) ? [...(ELEMENT.getAttribute(`data-result-store`).split(`,`).slice(1)), ...[NAME]] : [...AREA, ...[NAME], ...(ELEMENT.getAttribute(`data-result-store`).split(`,`))];
DATA[`value`] = ((Object.keys(ITEM).includes(ELEMENT.getAttribute(`data-result-store`))) ? ITEM[ELEMENT.getAttribute(`data-result-store`)] : await secretariat.read(DATA[`target`], (ELEMENT.hasAttribute(`data-store-location`)) ? parseInt(ELEMENT.getAttribute(`data-store-location`)) : -1));
let TARGET = (Object.keys(ITEM).includes(ELEMENT.getAttribute(`data-result-store`))) ? [...AREA, ...[NAME], ...(ELEMENT.getAttribute(`data-result-store`).split(`,`))] : [...(ELEMENT.getAttribute(`data-result-store`).split(`,`)), ...[NAME]];
DATA[`value`] = (Object.keys(ITEM).includes(ELEMENT.getAttribute(`data-result-store`))) ? ITEM[ELEMENT.getAttribute(`data-result-store`)] : await secretariat.read(TARGET);
switch (ELEMENT[`type`]) { switch (ELEMENT[`type`]) {
case `checkbox`: case `checkbox`:
ELEMENT.checked = DATA[`value`]; ELEMENT.checked = (DATA[`value`]);
console.log(await secretariat.read(null, 1));
ELEMENT[`function`] = async function() { ELEMENT[`function`] = function() {
DATA[`target`] = ((ELEMENT.getAttribute(`data-result-store`).split(`,`))[0] == ``) ? [...(ELEMENT.getAttribute(`data-result-store`).split(`,`).slice(1)), ...[NAME]] : [...AREA, ...[NAME], ...(ELEMENT.getAttribute(`data-result-store`).split(`,`))];
DATA[`value`] = ELEMENT.checked; DATA[`value`] = ELEMENT.checked;
await secretariat.write(DATA[`target`], DATA[`value`], (ELEMENT.hasAttribute(`data-store-location`)) ? parseInt(ELEMENT.getAttribute(`data-store-location`)) : -1); secretariat.write(DATA[`target`], DATA[`value`], (ELEMENT.hasAttribute(`data-store-location`)) ? parseInt(ELEMENT.getAttribute(`data-store-location`)) : -1);
} };
break; break;
default: default:
if ((typeof (ITEM[ELEMENT.getAttribute(`data-result-store`)])).includes(`obj`)) { if ((typeof (ITEM[ELEMENT.getAttribute(`data-result-store`)])).includes(`obj`)) {
@ -530,8 +526,9 @@ export default class windowman {
ELEMENT[`function`] = function() { ELEMENT[`function`] = function() {
try { try {
DATA[`target`] = ((ELEMENT.getAttribute(`data-result-store`).split(`,`))[0] == ``) ? [...(ELEMENT.getAttribute(`data-result-store`).split(`,`).slice(1)), ...[NAME]] : [...AREA, ...[NAME], ...(ELEMENT.getAttribute(`data-result-store`).split(`,`))];
DATA[`value`] = JSON.parse(ELEMENT.value.trim()); DATA[`value`] = JSON.parse(ELEMENT.value.trim());
(async function() {secretariat.write(DATA[`target`], DATA[`value`], (ELEMENT.hasAttribute(`data-store-location`)) ? parseInt(ELEMENT.getAttribute(`data-store-location`)) : -1);}) secretariat.write(DATA[`target`], DATA[`value`], (ELEMENT.hasAttribute(`data-store-location`)) ? parseInt(ELEMENT.getAttribute(`data-store-location`)) : -1);
} catch(err) { } catch(err) {
// The JSON isn't valid. // The JSON isn't valid.
alerts.error(err.name, texts.localized(`JSON_parse_error`), err.stack, false); alerts.error(err.name, texts.localized(`JSON_parse_error`), err.stack, false);
@ -540,9 +537,10 @@ export default class windowman {
} else { } else {
ELEMENT.value = DATA[`value`]; ELEMENT.value = DATA[`value`];
ELEMENT[`function`] = async function() { ELEMENT[`function`] = function() {
DATA[`target`] = ((ELEMENT.getAttribute(`data-result-store`).split(`,`))[0] == ``) ? [...(ELEMENT.getAttribute(`data-result-store`).split(`,`).slice(1)), ...[NAME]] : [...AREA, ...[NAME], ...(ELEMENT.getAttribute(`data-result-store`).split(`,`))];
DATA[`value`] = ELEMENT.value.trim() DATA[`value`] = ELEMENT.value.trim()
await secretariat.write(DATA[`target`], DATA[`value`], (ELEMENT.hasAttribute(`data-store-location`)) ? parseInt(ELEMENT.getAttribute(`data-store-location`)) : -1); secretariat.write(DATA[`target`], DATA[`value`], (ELEMENT.hasAttribute(`data-store-location`)) ? parseInt(ELEMENT.getAttribute(`data-store-location`)) : -1);
} }
} }
break; break;
@ -560,7 +558,7 @@ export default class windowman {
: ITEM[ELEMENT.getAttribute(`data-result-content`)]) : ITEM[ELEMENT.getAttribute(`data-result-content`)])
: ((ITEM[ELEMENT.getAttribute(`data-result-store`)]) : ((ITEM[ELEMENT.getAttribute(`data-result-store`)])
? (ITEM[ELEMENT.getAttribute(`data-result-store`)]) ? (ITEM[ELEMENT.getAttribute(`data-result-store`)])
: null) /*secretariat.read(((ITEM[(ELEMENT.getAttribute(`data-result-store`).split(`,`))])[ITEM])))*/; : null) /*secretariat.read(((ITEM[(ELEMENT.getAttribute(`data-result-store`).split(`,`))])[ITEM])));*/
} }
} else { } else {
if (ELEMENT.getAttribute(`data-result-store`) && ELEMENT.type) { if (ELEMENT.getAttribute(`data-result-store`) && ELEMENT.type) {
@ -628,8 +626,11 @@ export default class windowman {
} }
display(element.getAttribute(`data-result`), SEARCH[element.getAttribute(`data-result`)][`results`], `name`); display(element.getAttribute(`data-result`), SEARCH[element.getAttribute(`data-result`)][`results`], `name`);
if ((!((SEARCH[element.getAttribute(`data-result`)][`criteria`]) && (SEARCH[element.getAttribute(`data-result`)][`selected`])) || (typeof SEARCH[element.getAttribute(`data-result`)][`results`]).includes(`obj`) && SEARCH[element.getAttribute(`data-result`)][`results`] != null) if ((
? ((Object.keys(SEARCH[element.getAttribute(`data-result`)][`results`]).length <= 0) || !((SEARCH[element.getAttribute(`data-result`)][`selected`]))) !(SEARCH[element.getAttribute(`data-result`)][`selected`])
|| (typeof SEARCH[element.getAttribute(`data-result`)][`results`]).includes(`obj`) && SEARCH[element.getAttribute(`data-result`)][`results`] != null)
? (((SEARCH[element.getAttribute(`data-result`)][`results`] != null) ? (Object.keys(SEARCH[element.getAttribute(`data-result`)][`results`]).length <= 0) : false)
|| !((SEARCH[element.getAttribute(`data-result`)][`selected`])))
: true) : true)
{ {
pick(null, null, element.getAttribute(`data-result`)); pick(null, null, element.getAttribute(`data-result`));