This commit is contained in:
Dany LE 2021-11-24 23:37:06 +01:00
parent 149566ec5d
commit d208aea1b9
3 changed files with 15 additions and 13 deletions

Binary file not shown.

View File

@ -1275,11 +1275,12 @@ namespace OS {
* @param {string} p message string
*/
export function loading(q: number, p: string): void {
announcer.trigger("loading", {
id: q,
data: { m: `${p}`, s: true },
name: "OS",
});
const data:API.AnnouncementDataType<boolean> = {} as API.AnnouncementDataType<boolean>;
data.id = q;
data.message = p;
data.name = "OS";
data.u_data = true;
announcer.trigger("loading", data);
}
/**
@ -1294,11 +1295,12 @@ namespace OS {
* @param {string} m message status (`OK` of `FAIL`)
*/
export function loaded(q: number, p: string, m: string): void {
announcer.trigger("loaded", {
id: q,
data: { m: `${m}: ${p}`, s: false },
name: "OS",
});
const data:API.AnnouncementDataType<boolean> = {} as API.AnnouncementDataType<boolean>;
data.id = q;
data.message = p;
data.name = "OS";
data.u_data = false;
announcer.trigger("loaded", data);
}
/**

View File

@ -536,17 +536,17 @@ namespace OS {
}
m.show(e);
};
announcer.observable.on("app-pinned", (d) => {
announcer.observable.on("app-pinned", (_) => {
this.RefreshPinnedApp();
});
announcer.observable.on("loading", (o) => {
announcer.observable.on("loading", (o: API.AnnouncementDataType<boolean>) => {
this._pending_task.push(o.id);
if(!$(this.refs.panel).hasClass("loading"))
$(this.refs.panel).addClass("loading");
$(GUI.workspace).css("cursor", "wait");
});
announcer.observable.on("loaded", (o) => {
announcer.observable.on("loaded", (o: API.AnnouncementDataType<boolean>) => {
const i = this._pending_task.indexOf(o.id);
if (i >= 0) {
this._pending_task.splice(i, 1);