mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
Switch egw.user(..., async=true) to always return a Promise for consistency
Switch Et2ButtonTimestamper to use egw.user(...,async=true)
This commit is contained in:
parent
82504ed158
commit
79b6cef5fd
@ -81,7 +81,9 @@ export class Et2ButtonTimestamper extends Et2Button
|
|||||||
|
|
||||||
// Get properly formatted user name
|
// Get properly formatted user name
|
||||||
const user = parseInt(egw.user('account_id'));
|
const user = parseInt(egw.user('account_id'));
|
||||||
const account = egw.accounts('accounts').filter(option => option.value == user)[0];
|
egw.accounts('accounts', true).then((accounts) =>
|
||||||
|
{
|
||||||
|
const account = accounts.filter(option => option.value == user)[0];
|
||||||
text += account.label + ': ';
|
text += account.label + ': ';
|
||||||
|
|
||||||
const widget = this._get_input(this.target);
|
const widget = this._get_input(this.target);
|
||||||
@ -117,7 +119,10 @@ export class Et2ButtonTimestamper extends Et2Button
|
|||||||
{
|
{
|
||||||
tabbox = tabbox._parent;
|
tabbox = tabbox._parent;
|
||||||
}
|
}
|
||||||
if (tabbox.nodeName === 'ET2-TABBOX') (<Et2Tabs>tabbox).activateTab(widget);
|
if(tabbox.nodeName === 'ET2-TABBOX')
|
||||||
|
{
|
||||||
|
(<Et2Tabs>tabbox).activateTab(widget);
|
||||||
|
}
|
||||||
|
|
||||||
// If tinymce, update it
|
// If tinymce, update it
|
||||||
if(tinymce)
|
if(tinymce)
|
||||||
@ -138,7 +143,8 @@ export class Et2ButtonTimestamper extends Et2Button
|
|||||||
|
|
||||||
// Clean up a little
|
// Clean up a little
|
||||||
pos = pos + text.length;
|
pos = pos + text.length;
|
||||||
if (browser == "ie") {
|
if(browser == "ie")
|
||||||
|
{
|
||||||
input.focus();
|
input.focus();
|
||||||
let range = document["selection"].createRange();
|
let range = document["selection"].createRange();
|
||||||
range.moveStart("character", -input.value.length);
|
range.moveStart("character", -input.value.length);
|
||||||
@ -146,7 +152,8 @@ export class Et2ButtonTimestamper extends Et2Button
|
|||||||
range.moveEnd("character", 0);
|
range.moveEnd("character", 0);
|
||||||
range.select();
|
range.select();
|
||||||
}
|
}
|
||||||
else if (browser == "standards") {
|
else if(browser == "standards")
|
||||||
|
{
|
||||||
input.selectionStart = pos;
|
input.selectionStart = pos;
|
||||||
input.selectionEnd = pos;
|
input.selectionEnd = pos;
|
||||||
input.focus();
|
input.focus();
|
||||||
@ -154,6 +161,7 @@ export class Et2ButtonTimestamper extends Et2Button
|
|||||||
input.scrollTop = scrollPos;
|
input.scrollTop = scrollPos;
|
||||||
input.focus();
|
input.focus();
|
||||||
}
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private _get_input(target)
|
private _get_input(target)
|
||||||
|
@ -122,11 +122,16 @@ egw.extend('user', egw.MODULE_GLOBAL, function()
|
|||||||
// Synchronous
|
// Synchronous
|
||||||
egw.json("EGroupware\\Api\\Framework::ajax_user_list",[], cache_it, this, false).sendRequest(false);
|
egw.json("EGroupware\\Api\\Framework::ajax_user_list",[], cache_it, this, false).sendRequest(false);
|
||||||
}
|
}
|
||||||
|
let result = [];
|
||||||
if (type === 'both')
|
if (type === 'both')
|
||||||
{
|
{
|
||||||
return [].concat(accountStore.accounts, accountStore.groups);
|
result = [].concat(accountStore.accounts, accountStore.groups);
|
||||||
}
|
}
|
||||||
return [].concat(accountStore[type]);
|
else
|
||||||
|
{
|
||||||
|
result = [].concat(accountStore[type]);
|
||||||
|
}
|
||||||
|
return async ? Promise.resolve(result) : result;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user