This commit is contained in:
lxsang 2021-10-12 22:35:47 +02:00
parent 9c06d88713
commit 043214c001

View File

@ -949,7 +949,7 @@ namespace OS {
$("#systooltip")[0].uify(undefined); $("#systooltip")[0].uify(undefined);
$("#contextmenu")[0].uify(undefined); $("#contextmenu")[0].uify(undefined);
$("#wrapper").on("contextmenu",(e) => bindContextMenu(e)); $("#wrapper").on("contextmenu", (e) => bindContextMenu(e));
// tooltip // tooltip
$(document).on("mouseover", function (e) { $(document).on("mouseover", function (e) {
const el: any = $(e.target).closest("[tooltip]"); const el: any = $(e.target).closest("[tooltip]");
@ -1152,9 +1152,7 @@ namespace OS {
return API.packages.fetch().then(function (r) { return API.packages.fetch().then(function (r) {
let v: API.PackageMetaType; let v: API.PackageMetaType;
if (r.result) { if (r.result) {
const result = r.result as GenericObject< const result = r.result as GenericObject<API.PackageMetaType>;
API.PackageMetaType
>;
for (let k in result) { for (let k in result) {
v = result[k]; v = result[k];
v.text = v.name; v.text = v.name;
@ -1172,32 +1170,28 @@ namespace OS {
? result ? result
: undefined; : undefined;
} }
// load VFSX // load services + VFSX
// GUI.refreshSystemMenu()
// GUI.buildSystemMenu()
// push startup services
// TODO: get services list from user setting
Promise.all( Promise.all(
[OS.API.VFS.loadVFSX(true), [
pushServices( OS.API.VFS.loadVFSX(true),
(() => { pushServices(
const result = []; (() => {
for (let v of setting.system.startup.services) { const result = [];
result.push(v); for (let v of setting.system.startup.services) {
} result.push(v);
return result; }
})() return result;
) })()
]) )
.then(function () { ])
setting.system.startup.apps.map((a) => { .then(function () {
launch(a, []); setting.system.startup.apps.map((a) => {
launch(a, []);
});
}); });
});
}); });
} }
}); });
//GUI.launch "DummyApp"
// initDM // initDM
API.setLocale(setting.system.locale).then(() => initDM()); API.setLocale(setting.system.locale).then(() => initDM());
Ant.OS.announcer.observable.on("error", function (d) { Ant.OS.announcer.observable.on("error", function (d) {