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

Side by Side Diff: lib/icon.js

Issue 30025579: Issue 7340 - Fix JS error with notification animation (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Created March 7, 2019, 3:55 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } 98 }
99 else 99 else
100 { 100 {
101 page.browserAction.setIconPath( 101 page.browserAction.setIconPath(
102 "/icons/abp-$size" + (whitelisted ? "-whitelisted" : "") + ".png" 102 "/icons/abp-$size" + (whitelisted ? "-whitelisted" : "") + ".png"
103 ); 103 );
104 } 104 }
105 } 105 }
106 else 106 else
107 { 107 {
108 browser.browserAction.setIconPath({ 108 browser.browserAction.setIcon({
109 tabId: page.id, 109 tabId: page.id,
110 imageData: frames["" + opacity + whitelisted] 110 imageData: frames["" + opacity + whitelisted]
111 }); 111 });
112 } 112 }
113 } 113 }
114 114
115 filterNotifier.on("page.WhitelistingStateRevalidate", (page, filter) => 115 filterNotifier.on("page.WhitelistingStateRevalidate", (page, filter) =>
116 { 116 {
117 whitelistedState.set(page, !!filter); 117 whitelistedState.set(page, !!filter);
118 if (canUpdateIcon) 118 if (canUpdateIcon)
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 263
264 animateIcon(type, frames); 264 animateIcon(type, frames);
265 }, 10000); 265 }, 10000);
266 }); 266 });
267 }); 267 });
268 }; 268 };
269 269
270 // Pre-render icons on Chromium (#7253). 270 // Pre-render icons on Chromium (#7253).
271 if (info.platform == "chromium") 271 if (info.platform == "chromium")
272 renderIcons(); 272 renderIcons();
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld