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

Side by Side Diff: background.js

Issue 6201561285918720: Issue 1671 - Removed "Hide placeholders" option from the UI (Chrome/Opera/Safari) (Closed)
Patch Set: Created Dec. 8, 2014, 6:13 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 | options.html » ('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 <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 if (prevVersion != addonVersion || FilterStorage.firstRun) 74 if (prevVersion != addonVersion || FilterStorage.firstRun)
75 { 75 {
76 seenDataCorruption = prevVersion && FilterStorage.firstRun; 76 seenDataCorruption = prevVersion && FilterStorage.firstRun;
77 ext.storage.currentVersion = addonVersion; 77 ext.storage.currentVersion = addonVersion;
78 addSubscription(prevVersion); 78 addSubscription(prevVersion);
79 } 79 }
80 80
81 if (canUseChromeNotifications) 81 if (canUseChromeNotifications)
82 initChromeNotifications(); 82 initChromeNotifications();
83 initAntiAdblockNotification(); 83 initAntiAdblockNotification();
84
85 // The "Hide placeholders" option has been removed from the UI in 1.8.8.1283
86 // So we reset the option for users updating from older versions.
87 if (prevVersion && Services.vc.compare(prevVersion, "1.8.8.1283") < 0)
88 Prefs.hidePlaceholders = true;
84 } 89 }
85 90
86 // update browser actions when whitelisting might have changed, 91 // update browser actions when whitelisting might have changed,
87 // due to loading filters or saving filter changes 92 // due to loading filters or saving filter changes
88 if (action == "load" || action == "save") 93 if (action == "load" || action == "save")
89 refreshIconAndContextMenuForAllPages(); 94 refreshIconAndContextMenuForAllPages();
90 }); 95 });
91 96
92 // Special-case domains for which we cannot use style-based hiding rules. 97 // Special-case domains for which we cannot use style-based hiding rules.
93 // See http://crbug.com/68705. 98 // See http://crbug.com/68705.
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 page.sendMessage({type: "clickhide-deactivate"}); 579 page.sendMessage({type: "clickhide-deactivate"});
575 refreshIconAndContextMenu(page); 580 refreshIconAndContextMenu(page);
576 }); 581 });
577 582
578 setTimeout(function() 583 setTimeout(function()
579 { 584 {
580 var notificationToShow = Notification.getNextToShow(); 585 var notificationToShow = Notification.getNextToShow();
581 if (notificationToShow) 586 if (notificationToShow)
582 showNotification(notificationToShow); 587 showNotification(notificationToShow);
583 }, 3 * 60 * 1000); 588 }, 3 * 60 * 1000);
OLDNEW
« no previous file with comments | « no previous file | options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld