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

Side by Side Diff: background.js

Issue 4918989293617152: Issue 1819 - Update dependency on adblockplusui in adblockpluschrome and remove unnecessary code (Closed)
Patch Set: Created Jan. 15, 2015, 6:02 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 | dependencies » ('j') | 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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 else 257 else
258 notifyUser(); 258 notifyUser();
259 } 259 }
260 260
261 Prefs.addListener(function(name) 261 Prefs.addListener(function(name)
262 { 262 {
263 if (name == "shouldShowBlockElementMenu") 263 if (name == "shouldShowBlockElementMenu")
264 refreshIconAndContextMenuForAllPages(); 264 refreshIconAndContextMenuForAllPages();
265 }); 265 });
266 266
267 // TODO: This hack should be removed, however currently
268 // the firstRun page still calls backgroundPage.openOptions()
269 openOptions = ext.showOptions;
270
271 function prepareNotificationIconAndPopup() 267 function prepareNotificationIconAndPopup()
272 { 268 {
273 var animateIcon = (activeNotification.type !== "question"); 269 var animateIcon = (activeNotification.type !== "question");
274 activeNotification.onClicked = function() 270 activeNotification.onClicked = function()
275 { 271 {
276 if (animateIcon) 272 if (animateIcon)
277 iconAnimation.stop(); 273 iconAnimation.stop();
278 notificationClosed(); 274 notificationClosed();
279 }; 275 };
280 if (animateIcon) 276 if (animateIcon)
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 page.sendMessage({type: "clickhide-deactivate"}); 571 page.sendMessage({type: "clickhide-deactivate"});
576 refreshIconAndContextMenu(page); 572 refreshIconAndContextMenu(page);
577 }); 573 });
578 574
579 setTimeout(function() 575 setTimeout(function()
580 { 576 {
581 var notificationToShow = NotificationStorage.getNextToShow(); 577 var notificationToShow = NotificationStorage.getNextToShow();
582 if (notificationToShow) 578 if (notificationToShow)
583 showNotification(notificationToShow); 579 showNotification(notificationToShow);
584 }, 3 * 60 * 1000); 580 }, 3 * 60 * 1000);
OLDNEW
« no previous file with comments | « no previous file | dependencies » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld