Skip to content

Commit 5cc4382

Browse files
committed
async calls
1 parent d0401ab commit 5cc4382

File tree

3 files changed

+48
-40
lines changed

3 files changed

+48
-40
lines changed

services/static-webserver/client/source/class/osparc/Application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ qx.Class.define("osparc.Application", {
6464
}
6565

6666
// libs
67-
osparc.wrapper.DOMPurify.getInstance().init();
68-
osparc.wrapper.IntlTelInput.getInstance().init();
67+
await osparc.wrapper.DOMPurify.getInstance().init();
68+
await osparc.wrapper.IntlTelInput.getInstance().init();
6969

7070
// trackers
7171
osparc.announcement.Tracker.getInstance().startTracker();

services/static-webserver/client/source/class/osparc/wrapper/DOMPurify.js

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,27 @@ qx.Class.define("osparc.wrapper.DOMPurify", {
7474

7575
members: {
7676
init: function() {
77-
// initialize the script loading
78-
const purifyPath = "DOMPurify/purify-3.2.7.min.js";
79-
const dynLoader = new qx.util.DynamicScriptLoader([
80-
purifyPath
81-
]);
82-
83-
dynLoader.addListenerOnce("ready", e => {
84-
console.log(purifyPath + " loaded");
85-
this.setLibReady(true);
86-
}, this);
87-
88-
dynLoader.addListener("failed", e => {
89-
let data = e.getData();
90-
console.error("failed to load " + data.script);
91-
}, this);
92-
93-
dynLoader.start();
77+
return new Promise((resolve, reject) => {
78+
// initialize the script loading
79+
const purifyPath = "DOMPurify/purify-3.2.7.min.js";
80+
const dynLoader = new qx.util.DynamicScriptLoader([
81+
purifyPath
82+
]);
83+
84+
dynLoader.addListenerOnce("ready", e => {
85+
console.log(purifyPath + " loaded");
86+
this.setLibReady(true);
87+
resolve();
88+
}, this);
89+
90+
dynLoader.addListener("failed", e => {
91+
let data = e.getData();
92+
console.error("failed to load " + data.script);
93+
reject(data);
94+
}, this);
95+
96+
dynLoader.start();
97+
});
9498
},
9599

96100
sanitize: function(html) {

services/static-webserver/client/source/class/osparc/wrapper/IntlTelInput.js

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,34 @@ qx.Class.define("osparc.wrapper.IntlTelInput", {
4949
},
5050
members: {
5151
init: function() {
52-
// initialize the script loading
53-
let intlTelInputPath = "intl-tel-input/js/intlTelInput.min.js";
54-
let dataPath = "intl-tel-input/js/data.min.js";
55-
let utilsPath = "intl-tel-input/js/utils.js";
56-
let intlTelInputCss = "intl-tel-input/css/intlTelInput.css";
57-
let intlTelInputCssUri = qx.util.ResourceManager.getInstance().toUri(intlTelInputCss);
58-
qx.module.Css.includeStylesheet(intlTelInputCssUri);
59-
let dynLoader = new qx.util.DynamicScriptLoader([
60-
intlTelInputPath,
61-
dataPath,
62-
utilsPath
63-
]);
52+
return new Promise((resolve, reject) => {
53+
// initialize the script loading
54+
let intlTelInputPath = "intl-tel-input/js/intlTelInput.min.js";
55+
let dataPath = "intl-tel-input/js/data.min.js";
56+
let utilsPath = "intl-tel-input/js/utils.js";
57+
let intlTelInputCss = "intl-tel-input/css/intlTelInput.css";
58+
let intlTelInputCssUri = qx.util.ResourceManager.getInstance().toUri(intlTelInputCss);
59+
qx.module.Css.includeStylesheet(intlTelInputCssUri);
60+
let dynLoader = new qx.util.DynamicScriptLoader([
61+
intlTelInputPath,
62+
dataPath,
63+
utilsPath
64+
]);
6465

65-
dynLoader.addListenerOnce("ready", () => {
66-
console.log(intlTelInputPath + " loaded");
67-
this.setLibReady(true);
68-
}, this);
66+
dynLoader.addListenerOnce("ready", () => {
67+
console.log(intlTelInputPath + " loaded");
68+
this.setLibReady(true);
69+
resolve();
70+
}, this);
6971

70-
dynLoader.addListener("failed", e => {
71-
let data = e.getData();
72-
console.error("failed to load " + data.script);
73-
}, this);
72+
dynLoader.addListener("failed", e => {
73+
let data = e.getData();
74+
console.error("failed to load " + data.script);
75+
reject(data);
76+
}, this);
7477

75-
dynLoader.start();
78+
dynLoader.start();
79+
});
7680
}
7781
}
7882
});

0 commit comments

Comments
 (0)