Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: messageResponder.js

Issue 29338734: Issue 3839 - Adapt for Prefs event changes (Closed)
Patch Set: Cleaned up onFilterChange() Created March 22, 2016, 7:19 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« background.js ('K') | « background.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: messageResponder.js
===================================================================
--- a/messageResponder.js
+++ b/messageResponder.js
@@ -52,7 +52,8 @@
"downloadStatus", "homepage", "lastDownload", "title", "url"]);
var convertFilter = convertObject.bind(null, ["text"]);
- var changeListeners = null;
+ var changeListeners = new global.ext.PageMap();
+ var listenedPreferences = [];
var messageTypes = {
"app": "app.listen",
"filter": "filters.listen",
@@ -60,13 +61,14 @@
"subscription": "subscriptions.listen"
};
- function sendMessage(type, action, args, page)
+ function sendMessage(type, action, args)
{
- var pages = page ? [page] : changeListeners.keys();
+ var pages = changeListeners.keys();
for (var i = 0; i < pages.length; i++)
{
var filters = changeListeners.get(pages[i]);
- if (filters[type] && filters[type].indexOf(action) >= 0)
+ var actions = filters[type];
+ if (actions && actions.indexOf(action) != -1)
{
pages[i].sendMessage({
type: messageTypes[type],
@@ -79,62 +81,50 @@
function onFilterChange(action)
{
+ var type;
if (action == "load")
- action = "filter.loaded";
-
- var parts = action.split(".", 2);
- var type;
- if (parts.length == 1)
Thomas Greiner 2016/03/22 13:29:40 What about other events dispatched by `FilterNotif
Sebastian Noack 2016/03/22 14:24:11 Currently "app.addSubscription" is the only "app.*
{
- type = "app";
- action = parts[0];
+ type = "filter";
+ action = "loaded";
}
else
{
+ var parts = action.split(".", 2);
Sebastian Noack 2016/03/22 14:24:10 I just realized that the second argument is redund
type = parts[0];
action = parts[1];
}
- if (!messageTypes.hasOwnProperty(type))
+ if (!(type in messageTypes))
return;
- var args = Array.prototype.slice.call(arguments, 1).map(function(arg)
+ var args = [];
+ for (var i = 1; i < arguments.length; i++)
Sebastian Noack 2016/03/22 07:29:56 Note that passing arguments to other functions wil
{
+ var arg = arguments[i];
if (arg instanceof Subscription)
- return convertSubscription(arg);
+ args.push(convertSubscription(arg));
else if (arg instanceof Filter)
- return convertFilter(arg);
+ args.push(convertFilter(arg));
else
- return arg;
- });
+ args.push(arg);
+ }
+
sendMessage(type, action, args);
}
- function onPrefChange(name)
+ function getListenerFilters(page)
{
- sendMessage("pref", name, [Prefs[name]]);
+ var listenerFilters = changeListeners.get(page);
+ if (!listenerFilters)
+ {
+ listenerFilters = Object.create(null);
+ changeListeners.set(page, listenerFilters);
+ }
+ return listenerFilters;
}
global.ext.onMessage.addListener(function(message, sender, callback)
{
- var listenerFilters = null;
- if (/\.listen$/.test(message.type))
- {
- if (!changeListeners)
- {
- changeListeners = new global.ext.PageMap();
- FilterNotifier.addListener(onFilterChange);
- Prefs.onChanged.addListener(onPrefChange);
- }
-
- listenerFilters = changeListeners.get(sender.page);
- if (!listenerFilters)
- {
- listenerFilters = Object.create(null);
- changeListeners.set(sender.page, listenerFilters);
- }
- }
-
switch (message.type)
{
case "app.get":
@@ -187,6 +177,7 @@
callback(null);
break;
case "app.listen":
+ var listenerFilters = getListenerFilters(sender.page);
if (message.filter)
listenerFilters.app = message.filter;
else
@@ -287,8 +278,12 @@
}
break;
case "filters.listen":
+ var listenerFilters = getListenerFilters(sender.page);
if (message.filter)
+ {
+ FilterNotifier.addListener(onFilterChange);
Sebastian Noack 2016/03/22 07:29:56 Since FilterNotifier.addListener() only adds the l
listenerFilters.filter = message.filter;
+ }
else
delete listenerFilters.filter;
break;
@@ -307,8 +302,22 @@
callback(Prefs[message.key]);
break;
case "prefs.listen":
+ var listenerFilters = getListenerFilters(sender.page);
if (message.filter)
+ {
+ message.filter.forEach(function(preference)
+ {
+ if (listenedPreferences.indexOf(preference) == -1)
+ {
+ listenedPreferences.push(preference);
+ Prefs.on(preference, function()
+ {
+ sendMessage("pref", preference, [Prefs[preference]]);
+ });
+ }
+ });
listenerFilters.pref = message.filter;
+ }
else
delete listenerFilters.pref;
break;
@@ -329,7 +338,7 @@
{
ext.showOptions(function()
{
- onFilterChange("addSubscription", subscription);
+ sendMessage("app", "addSubscription", [convertSubscription(subscription)]);
Sebastian Noack 2016/03/22 07:29:56 Sorry for the unrelated change, but it seems inapp
});
}
else
@@ -355,8 +364,12 @@
callback(subscriptions.map(convertSubscription));
break;
case "subscriptions.listen":
+ var listenerFilters = getListenerFilters(sender.page);
if (message.filter)
+ {
+ FilterNotifier.addListener(onFilterChange);
listenerFilters.subscription = message.filter;
+ }
else
delete listenerFilters.subscription;
break;
« background.js ('K') | « background.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld