From 2310d01835d2f9dfb47a13538eeef46021218514 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 18 Nov 2014 11:29:55 -0200 Subject: [PATCH] requests must be deemed unhandled by default --- meta/crx/vapi-background.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/crx/vapi-background.js b/meta/crx/vapi-background.js index a173a40..a6cfe65 100644 --- a/meta/crx/vapi-background.js +++ b/meta/crx/vapi-background.js @@ -244,7 +244,7 @@ vAPI.messaging.onPortMessage = function(request, port) { } // Specific handler - var r; + var r = vAPI.messaging.UNHANDLED; var listener = vAPI.messaging.listeners[request.portName]; if ( typeof listener === 'function' ) { r = listener(request.msg, port.sender, callback); @@ -264,16 +264,16 @@ vAPI.messaging.onPortMessage = function(request, port) { /******************************************************************************/ -vAPI.messaging.onDisconnect = function(port) { - port.onDisconnect.removeListener(vAPI.messaging.onDisconnect); +vAPI.messaging.onPortDisconnect = function(port) { + port.onDisconnect.removeListener(vAPI.messaging.onPortDisconnect); port.onMessage.removeListener(vAPI.messaging.onPortMessage); delete vAPI.messaging.ports[port.name]; }; /******************************************************************************/ -vAPI.messaging.onConnect = function(port) { - port.onDisconnect.addListener(vAPI.messaging.onDisconnect); +vAPI.messaging.onPortConnect = function(port) { + port.onDisconnect.addListener(vAPI.messaging.onPortDisconnect); port.onMessage.addListener(vAPI.messaging.onPortMessage); vAPI.messaging.ports[port.name] = port; }; @@ -291,7 +291,7 @@ vAPI.messaging.setup = function(defaultHandler) { } this.defaultHandler = defaultHandler; - chrome.runtime.onConnect.addListener(this.onConnect); + chrome.runtime.onConnect.addListener(this.onPortConnect); }; /******************************************************************************/