extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-16 19:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix camelCased attributes didn't work for more than 1 underscore

Browse Source 
Also fixes vfsSelect destroyed session
This commit is contained in:
nathan 2022-07-25 16:12:09 -06:00
parent bdc74303bb
commit aace76b97a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/Et2Dialog/Et2Dialog.ts
View File

@ -222,7 +222,7 @@ export class Et2Dialog extends Et2Widget(ScopedElementsMixin(SlotMixin(LionDialo
/** /**
* Automatically destroy the dialog when it closes. Set to false to keep the dialog around. * Automatically destroy the dialog when it closes. Set to false to keep the dialog around.
*/ */
destroy_on_close: Boolean, destroyOnClose: Boolean,
/** /**
* Legacy-option for appending dialog into a specific dom node * Legacy-option for appending dialog into a specific dom node
@ -319,7 +319,7 @@ export class Et2Dialog extends Et2Widget(ScopedElementsMixin(SlotMixin(LionDialo
} }
this.modal = true; this.modal = true;
this.dialog_type = Et2Dialog.PLAIN_MESSAGE; this.dialog_type = Et2Dialog.PLAIN_MESSAGE;
this.destroy_on_close = true; this.destroyOnClose = true;
this.hideOnEscape = this.hideOnEscape === false ? false : true; this.hideOnEscape = this.hideOnEscape === false ? false : true;
this.__value = {}; this.__value = {};
@ -398,7 +398,7 @@ export class Et2Dialog extends Et2Widget(ScopedElementsMixin(SlotMixin(LionDialo
this.dispatchEvent(new Event('close')); this.dispatchEvent(new Event('close'));
if(this.destroy_on_close) if(this.destroyOnClose)
{ {
if(this._template_widget) if(this._template_widget)
{ {

2
api/js/etemplate/Et2Widget/Et2Widget.ts
View File

@ -1375,7 +1375,7 @@ function transformAttributes(widget, mgr : et2_arrayMgr, attributes)
{ {
let parts = attribute.split('_'); let parts = attribute.split('_');
if (attribute === 'parent_node') parts[1] = 'Id'; if (attribute === 'parent_node') parts[1] = 'Id';
attribute = parts.shift()+parts.map(part => part[0].toUpperCase()+part.substring(1)); attribute = parts.shift() + parts.map(part => part[0].toUpperCase() + part.substring(1)).join("");
} }
const property = widget_class.getPropertyOptions(attribute); const property = widget_class.getPropertyOptions(attribute);