Skip to content

Commit 247c8af

Browse files
committed
v11.0.5
1 parent e6a912c commit 247c8af

File tree

8 files changed

+49
-22
lines changed

8 files changed

+49
-22
lines changed

build/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/main.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Gleap.setApiUrl("http://0.0.0.0:9000");
55

66
Gleap.setLanguage("de");
77

8-
Gleap.initialize("ogWhNhuiZcGWrva5nlDS8l7a78OfaLlV");
8+
Gleap.initialize("hQ6xS3YZoQ69XV6CYYmyVSav1RDM5TIv");
9+
Gleap.open();
910
//Gleap.setEnvironment("dev");
1011

1112
/*Gleap.setUrlHandler((url, newTab) => {
@@ -14,8 +15,8 @@ Gleap.initialize("ogWhNhuiZcGWrva5nlDS8l7a78OfaLlV");
1415

1516
Gleap.playSound(false);
1617

17-
Gleap.on("unread-count-changed", (data) => {
18-
console.log("unread-count-changed", data);
18+
Gleap.on("initialized", (data) => {
19+
console.log("initialized", data);
1920
});
2021

2122
Gleap.attachCustomData({

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gleap",
3-
"version": "11.0.4",
3+
"version": "11.0.5",
44
"main": "build/index.js",
55
"scripts": {
66
"start": "webpack serve",

published/11.0.5/index.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

published/latest/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Gleap.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ class Gleap {
180180

181181
// Check for URL params.
182182
Gleap.checkForUrlParams();
183+
184+
// Notify event.
185+
GleapEventManager.notifyEvent("initialized");
183186
});
184187
})
185188
.catch(function (err) {

src/GleapConfigManager.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ const parseIntWithDefault = (val, def) => {
1212
export default class GleapConfigManager {
1313
flowConfig = null;
1414
projectActions = null;
15+
onConfigLoadedListener = [];
16+
17+
onConfigLoaded = (onConfigLoaded) => {
18+
if (this.flowConfig !== null) {
19+
onSessionReady();
20+
} else {
21+
this.onConfigLoadedListener.push(onConfigLoaded);
22+
}
23+
};
1524

1625
// GleapConfigManager singleton
1726
static instance;
@@ -105,6 +114,15 @@ export default class GleapConfigManager {
105114
);
106115
}
107116

117+
notifyConfigLoaded() {
118+
if (this.onConfigLoadedListener.length > 0) {
119+
for (var i = 0; i < this.onConfigLoadedListener.length; i++) {
120+
this.onConfigLoadedListener[i]();
121+
}
122+
}
123+
this.onConfigLoadedListener = [];
124+
}
125+
108126
/**
109127
* Applies the Gleap config.
110128
* @param {*} config
@@ -148,6 +166,8 @@ export default class GleapConfigManager {
148166
GleapTranslationManager.getInstance().updateRTLSupport();
149167

150168
Gleap.enableShortcuts(flowConfig.enableShortcuts ? true : false);
169+
170+
this.notifyConfigLoaded();
151171
} catch (e) { }
152172
}
153173

src/GleapFrameManager.js

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,29 @@ export default class GleapFrameManager {
130130

131131
this.autoWhiteListCookieManager();
132132

133-
// Apply CSS.
134-
GleapConfigManager.getInstance().applyStylesFromConfig();
135-
136133
// Inject the frame manager after it has been loaded.
137134
runFunctionWhenDomIsReady(() => {
138-
// Inject widget HTML.
139-
var elem = document.createElement("div");
140-
elem.className =
141-
"gleap-frame-container gleap-frame-container--hidden gl-block";
142-
elem.innerHTML = `<div class="gleap-frame-container-inner"><iframe src="${this.frameUrl}" class="gleap-frame" scrolling="yes" title="Gleap Widget Window" allow="autoplay; encrypted-media; fullscreen;" frameborder="0"></iframe></div>`;
143-
document.body.appendChild(elem);
135+
GleapConfigManager.getInstance().onConfigLoaded(() => {
136+
// Apply CSS.
137+
GleapConfigManager.getInstance().applyStylesFromConfig();
144138

145-
this.gleapFrameContainer = elem;
146-
this.gleapFrame = document.querySelector(".gleap-frame");
139+
// Inject widget HTML.
140+
var elem = document.createElement("div");
141+
elem.className =
142+
"gleap-frame-container gleap-frame-container--hidden gl-block";
143+
elem.innerHTML = `<div class="gleap-frame-container-inner"><iframe src="${this.frameUrl}" class="gleap-frame" scrolling="yes" title="Gleap Widget Window" allow="autoplay; encrypted-media; fullscreen;" frameborder="0"></iframe></div>`;
144+
document.body.appendChild(elem);
147145

148-
this.updateFrameStyle();
146+
this.gleapFrameContainer = elem;
147+
this.gleapFrame = document.querySelector(".gleap-frame");
149148

150-
// Show loading preview for widget app mode.
151-
if (this.appMode === "widget") {
152-
this.showFrameContainer(true);
153-
}
149+
this.updateFrameStyle();
150+
151+
// Show loading preview for widget app mode.
152+
if (this.appMode === "widget") {
153+
this.showFrameContainer(true);
154+
}
155+
});
154156
});
155157
};
156158

0 commit comments

Comments
 (0)