| OLD | NEW |
| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 previousVersion = null; | 77 previousVersion = null; |
| 78 } | 78 } |
| 79 | 79 |
| 80 if (previousVersion != info.addonVersion || FilterStorage.firstRun) | 80 if (previousVersion != info.addonVersion || FilterStorage.firstRun) |
| 81 { | 81 { |
| 82 seenDataCorruption = previousVersion && FilterStorage.firstRun; | 82 seenDataCorruption = previousVersion && FilterStorage.firstRun; |
| 83 Prefs.currentVersion = info.addonVersion; | 83 Prefs.currentVersion = info.addonVersion; |
| 84 addSubscription(previousVersion); | 84 addSubscription(previousVersion); |
| 85 } | 85 } |
| 86 | 86 |
| 87 // The "Hide placeholders" option has been removed from the UI in 1.8.8.1285 | |
| 88 // So we reset the option for users updating from older versions. | |
| 89 if (previousVersion && Services.vc.compare(previousVersion, "1.8.8.1285") <
0) | |
| 90 Prefs.hidePlaceholders = true; | |
| 91 | |
| 92 initNotifications(); | 87 initNotifications(); |
| 93 | 88 |
| 94 // Update browser actions and context menus when whitelisting might have | 89 // Update browser actions and context menus when whitelisting might have |
| 95 // changed. That is now when initally loading the filters and later when | 90 // changed. That is now when initally loading the filters and later when |
| 96 // importing backups or saving filter changes. | 91 // importing backups or saving filter changes. |
| 97 FilterNotifier.addListener(function(action) | 92 FilterNotifier.addListener(function(action) |
| 98 { | 93 { |
| 99 if (action == "load" || action == "save") | 94 if (action == "load" || action == "save") |
| 100 refreshIconAndContextMenuForAllPages(); | 95 refreshIconAndContextMenuForAllPages(); |
| 101 }); | 96 }); |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 } | 425 } |
| 431 }); | 426 }); |
| 432 | 427 |
| 433 // update icon when page changes location | 428 // update icon when page changes location |
| 434 ext.pages.onLoading.addListener(function(page) | 429 ext.pages.onLoading.addListener(function(page) |
| 435 { | 430 { |
| 436 page.sendMessage({type: "clickhide-deactivate"}); | 431 page.sendMessage({type: "clickhide-deactivate"}); |
| 437 refreshIconAndContextMenu(page); | 432 refreshIconAndContextMenu(page); |
| 438 showNextNotificationForUrl(page.url); | 433 showNextNotificationForUrl(page.url); |
| 439 }); | 434 }); |
| OLD | NEW |