OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
3 * Copyright (C) 2006-2013 Eyeo GmbH | 3 * Copyright (C) 2006-2013 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 22 matching lines...) Expand all Loading... |
33 { | 33 { |
34 if (tabId) | 34 if (tabId) |
35 { | 35 { |
36 let frameData = getFrameData(tabId, 0); | 36 let frameData = getFrameData(tabId, 0); |
37 return (frameData && key in frameData ? frameData[key] : 0); | 37 return (frameData && key in frameData ? frameData[key] : 0); |
38 } | 38 } |
39 else | 39 else |
40 return (key in Prefs.stats_total ? Prefs.stats_total[key] : 0); | 40 return (key in Prefs.stats_total ? Prefs.stats_total[key] : 0); |
41 }; | 41 }; |
42 | 42 |
43 FilterNotifier.addListener(function(action, item, newValue, oldValue, tabId) | 43 FilterNotifier.addListener(function(action, item, newValue, oldValue, tab) |
44 { | 44 { |
45 if (action != "filter.hitCount") | 45 if (action != "filter.hitCount") |
46 return; | 46 return; |
47 | 47 |
48 var blocked = item instanceof BlockingFilter; | 48 var blocked = item instanceof BlockingFilter; |
49 | 49 |
50 // Increment counts | 50 // Increment counts |
51 if (blocked) | 51 if (blocked) |
52 { | 52 { |
53 if ("blocked" in Prefs.stats_total) | 53 if ("blocked" in Prefs.stats_total) |
54 Prefs.stats_total.blocked++; | 54 Prefs.stats_total.blocked++; |
55 else | 55 else |
56 Prefs.stats_total.blocked = 1; | 56 Prefs.stats_total.blocked = 1; |
57 Prefs.stats_total = Prefs.stats_total; | 57 Prefs.stats_total = Prefs.stats_total; |
58 | 58 |
59 let frameData = getFrameData(tabId, 0); | 59 let frameData = getFrameData(tab, 0); |
60 if (frameData) | 60 if (frameData) |
61 { | 61 { |
62 if ("blocked" in frameData) | 62 if ("blocked" in frameData) |
63 frameData.blocked++; | 63 frameData.blocked++; |
64 else | 64 else |
65 frameData.blocked = 1; | 65 frameData.blocked = 1; |
66 } | 66 } |
67 } | 67 } |
68 }); | 68 }); |
OLD | NEW |