Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-17 09:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick backup before crash

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-06-13 18:55:52 +00:00
parent f56259e181
commit fb1ae16215
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/Component/Form.js
View File

@ -379,9 +379,9 @@ export class Form
jsOMS.preventAll(event); jsOMS.preventAll(event);
if (document.querySelector('[data-update-form="' + id + '"') === null) { if (document.querySelector('[data-update-form="' + id + '"') === null) {
this.formActionSaveInline(self, event, id, elementIndex) this.formActionSaveInline(self, event, id, elementIndex);
} else { } else {
this.formActionSaveExternal(self, event, id, elementIndex) this.formActionSaveExternal(self, event, id, elementIndex);
} }
} }
@ -934,6 +934,8 @@ export class Form
// Consider: It might make sense to do this in the Table.js??? Kinda depends on additional functionality together with the form probably. // Consider: It might make sense to do this in the Table.js??? Kinda depends on additional functionality together with the form probably.
} }
// @todo: if input change check if iframe needs to be reloaded (if there is a iframe that is attached/part of the form e.g. media renderer based on currently selected element)
// remote actions (maybe solvable with callbacks?): // remote actions (maybe solvable with callbacks?):
// filter // filter
// sort // sort

7
Uri/UriFactory.js
View File

@ -192,9 +192,10 @@ export class UriFactory
* . = DOM class * . = DOM class
* / = Current path * / = Current path
* ? = Current query * ? = Current query
* @ = * @ = Name attribute
* $ = Other data * $ =
* % = Current url * % = Current url
* ! = Query selector
* *
* @param {string} uri Raw uri * @param {string} uri Raw uri
* @param {null|Object} [toMatch] Key/value pair to replace in raw * @param {null|Object} [toMatch] Key/value pair to replace in raw
@ -214,7 +215,7 @@ export class UriFactory
} }
} }
let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$\!][a-zA-Z0-9_\\-#\.]*\}', 'g'), function (match) { let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$\!].*?\}', 'g'), function (match) {
match = match.substring(1, match.length - 1); match = match.substring(1, match.length - 1);
if (toMatch !== null && Object.prototype.hasOwnProperty.call(toMatch, match)) { if (toMatch !== null && Object.prototype.hasOwnProperty.call(toMatch, match)) {