CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-02 18:34:52 +12:00
Code Issues Releases Wiki Activity

Improve vAPI.messaging setup and connecting

Browse source
This commit is contained in:
calibrations 2017-12-29 16:15:43 +00:00
parent 74f3f6535f
commit 2768184d33
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
platform/firefox/vapi-client.js
View file

@ -80,8 +80,12 @@ vAPI.messaging = {
connected: false,
setup: function() {
this.connect();
this.listeners.add(this.builtinListener)
this.addListener(this.builtinListener);
if ( this.toggleListenerCallback === null ) {
this.toggleListenerCallback = this.toggleListener.bind(this);
}
window.addEventListener('pagehide', this.toggleListenerCallback, true);
window.addEventListener('pageshow', this.toggleListenerCallback, true);
},
close: function() {
@ -140,9 +144,7 @@ vAPI.messaging = {
},
send: function(channelName, message, callback) {
if ( !this.connected ) {
this.setup();
}
this.connect()
message = {
channelName: self._sandboxId_ + '|' + channelName,
@ -163,14 +165,15 @@ vAPI.messaging = {
}
if ( type === 'pagehide' ) {
vAPI.messaging.disconnect();
this.disconnect();
return;
}
if ( persisted ) {
vAPI.messaging.connect();
this.connect();
}
},
toggleListenerCallback: null,
sendToListeners: function(msg) {
for ( var listener of this.listeners ) {
@ -180,14 +183,11 @@ vAPI.messaging = {
addListener: function(listener) {
this.listeners.add(listener);
if ( !this.connected ) {
this.setup();
}
this.connect()
}
};
window.addEventListener('pagehide', vAPI.messaging.toggleListener, true);
window.addEventListener('pageshow', vAPI.messaging.toggleListener, true);
vAPI.messaging.setup()
/******************************************************************************/