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

improve closest handling for inline edit

Browse Source
This commit is contained in:
Dennis Eichhorn 2019-05-02 22:21:58 +02:00
parent 02d597c5c9
commit 83b6ec231b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
UI/Component/Form.js
View File

@ -355,6 +355,8 @@ export class Form {
this.app.uiManager.getFormManager().get(createForm).injectSubmit(function () { this.app.uiManager.getFormManager().get(createForm).injectSubmit(function () {
const formElement = document.getElementById(id); const formElement = document.getElementById(id);
const subMain = formElement.querySelector(formElement.getAttribute('data-ui-content')); const subMain = formElement.querySelector(formElement.getAttribute('data-ui-content'));
// todo: [0/1] is no longer working because of arbitrary templates for inline editing
const newEle = subMain.getElementsByTagName('template')[0].content.cloneNode(true); const newEle = subMain.getElementsByTagName('template')[0].content.cloneNode(true);
// set internal value // set internal value
@ -424,6 +426,8 @@ export class Form {
createForm.addEventListener('click', function () { createForm.addEventListener('click', function () {
const formElement = document.getElementById(id); const formElement = document.getElementById(id);
const subMain = formElement.querySelector(formElement.getAttribute('data-ui-content')); const subMain = formElement.querySelector(formElement.getAttribute('data-ui-content'));
// todo: [0/1] is no longer working because of arbitrary templates for inline editing
const newEle = subMain.getElementsByTagName('template')[1].content.cloneNode(true); const newEle = subMain.getElementsByTagName('template')[1].content.cloneNode(true);
const eleId = 'f' + Math.random().toString(36).substring(7); const eleId = 'f' + Math.random().toString(36).substring(7);
// todo: check if random id doesn't already exist // todo: check if random id doesn't already exist
@ -440,6 +444,7 @@ export class Form {
subMain.appendChild(newEle.firstElementChild); subMain.appendChild(newEle.firstElementChild);
// todo: this is no longer working... it's not tbody!!!
self.app.uiManager.getFormManager().get(eleId + '-form').injectSubmit(function () { self.app.uiManager.getFormManager().get(eleId + '-form').injectSubmit(function () {
document.getElementById(id).getElementsByTagName('tbody')[0].removeChild( document.getElementById(id).getElementsByTagName('tbody')[0].removeChild(
document.getElementById(eleId) document.getElementById(eleId)
@ -482,13 +487,27 @@ export class Form {
const newEle = []; const newEle = [];
for (let i = 0; i < selectorLength; ++i) { for (let i = 0; i < selectorLength; ++i) {
parents.push(this.closest(selectors[i].trim(' '))); // this handles selectors such as 'ancestor > child/or/sibling' and many more
// todo: maybe move this to the library as an advanced ancestor function?
const selector = selectors[i].trim(' ').split(' ');
const closest = selector[0].trim();
let subSelector = '';
if (selector.length !== 0) {
selector.shift();
subSelector = selector.join(' ').trim();
}
parents.push(
selector.length === 0 ? this.closest(closest) : this.closest(closest).querySelector(subSelector)
);
values = values.concat(Array.prototype.slice.call(parents[i].querySelectorAll('[data-tpl-value]'))); values = values.concat(Array.prototype.slice.call(parents[i].querySelectorAll('[data-tpl-value]')));
text = text.concat(Array.prototype.slice.call(parents[i].querySelectorAll('[data-tpl-text]'))); text = text.concat(Array.prototype.slice.call(parents[i].querySelectorAll('[data-tpl-text]')));
parents[i].style = 'display: none'; // todo: replace with class instead of inline style parents[i].style = 'display: none'; // todo: replace with class instead of inline style
newEle.push(subMain.getElementsByTagName('template')[i + 1].content.cloneNode(true)); newEle.push(subMain.getElementsByTagName('template')[selectorLength + i].content.cloneNode(true));
// todo: don't use random id use actual row id for data which needs to be updated // todo: don't use random id use actual row id for data which needs to be updated
const eleId = 'f' + Math.random().toString(36).substring(7); const eleId = 'f' + Math.random().toString(36).substring(7);