OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor messaging listerners.

pull/21833/head
Richard Lewis 2017-11-30 10:20:29 +00:00
parent 4f5f44ff38
commit 2cfbbb000e
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/WidgetMessaging.js
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2016 OpenMarket Ltd Copyright 2017 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -14,28 +14,46 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
export default class WidgetMessaging { /**
constructor() { * Handle widget postMessage events
this.listenerCount = 0; * @param {Event} event Event to handle
* @return {undefined}
*/
function onMessage(event) {
console.warn("Checking for widget event", event);
if (!event.origin) { // Handle chrome
event.origin = event.originalEvent.origin;
} }
// Event origin is empty string if undefined
if (event.origin.length === 0 || !event.data.widgetData) {
// TODO / FIXME -- check for valid origin URLs!!
return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
}
// TODO -- handle widget actions
alert(event.data.widgetData);
}
let listenerCount = 0;
module.exports = {
/** /**
* Register widget message event listeners * Register widget message event listeners
* @return {undefined} * @return {undefined}
*/ */
registerListeners() { startListening() {
if (this.listenerCount === 0) { if (listenerCount === 0) {
window.addEventListener("message", this.onMessage, false); window.addEventListener("message", onMessage, false);
} }
this.listenerCount += 1; listenerCount += 1;
} },
derigisterListeners() { stopListening() {
this.listenerCount -= 1; listenerCount -= 1;
if (this.listenerCount === 0) { if (listenerCount === 0) {
window.removeEventListener("message", this.onMessage); window.removeEventListener("message", onMessage);
} }
if (this.listenerCount < 0) { if (listenerCount < 0) {
// Make an error so we get a stack trace // Make an error so we get a stack trace
const e = new Error( const e = new Error(
"WidgetMessaging: mismatched startListening / stopListening detected." + "WidgetMessaging: mismatched startListening / stopListening detected." +
@ -43,21 +61,5 @@ export default class WidgetMessaging {
); );
console.error(e); console.error(e);
} }
} },
};
onMessage(event) {
console.warn("Checking for widget event", event);
if (!event.origin) { // Handle chrome
event.origin = event.originalEvent.origin;
}
// Event origin is empty string if undefined
if (event.origin.length === 0 || !event.data.widgetData) {
// TODO / FIXME -- check for valid origin URLs!!
return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
}
// TODO -- handle widget actions
alert(event.data.widgetData);
}
}

4
src/components/views/elements/AppTile.js
View File

@ -153,8 +153,7 @@ export default React.createClass({
}, },
componentWillMount() { componentWillMount() {
this.widgetMessagingClient = new WidgetMessaging(); WidgetMessaging.startListening();
this.widgetMessagingClient.registerListeners();
window.addEventListener('message', this._onMessage, false); window.addEventListener('message', this._onMessage, false);
this.setScalarToken(); this.setScalarToken();
}, },
@ -207,6 +206,7 @@ export default React.createClass({
}, },
componentWillUnmount() { componentWillUnmount() {
WidgetMessaging.stopListening();
window.removeEventListener('message', this._onMessage); window.removeEventListener('message', this._onMessage);
}, },