| 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-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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 { | 692 { |
| 693 chrome.storage.local.remove(key, callback); | 693 chrome.storage.local.remove(key, callback); |
| 694 }, | 694 }, |
| 695 onChanged: chrome.storage.onChanged | 695 onChanged: chrome.storage.onChanged |
| 696 }; | 696 }; |
| 697 | 697 |
| 698 /* Options */ | 698 /* Options */ |
| 699 | 699 |
| 700 ext.showOptions = callback => | 700 ext.showOptions = callback => |
| 701 { | 701 { |
| 702 let info = require("info"); |
| 703 |
| 702 if ("openOptionsPage" in chrome.runtime && | 704 if ("openOptionsPage" in chrome.runtime && |
| 703 // Firefox for Android does have a runtime.openOptionsPage but it | 705 // Some versions of Firefox for Android before version 57 do have a |
| 704 // doesn't do anything. | 706 // runtime.openOptionsPage but it doesn't do anything. |
| 705 // https://bugzilla.mozilla.org/show_bug.cgi?id=1364945 | 707 // https://bugzilla.mozilla.org/show_bug.cgi?id=1364945 |
| 706 require("info").application != "fennec") | 708 (info.application != "fennec" || |
| 709 parseInt(info.applicationVersion, 10) >= 57)) |
| 707 { | 710 { |
| 708 if (!callback) | 711 if (!callback) |
| 709 { | 712 { |
| 710 chrome.runtime.openOptionsPage(); | 713 chrome.runtime.openOptionsPage(); |
| 711 } | 714 } |
| 712 else | 715 else |
| 713 { | 716 { |
| 714 chrome.runtime.openOptionsPage(() => | 717 chrome.runtime.openOptionsPage(() => |
| 715 { | 718 { |
| 716 if (chrome.runtime.lastError) | 719 if (chrome.runtime.lastError) |
| 717 return; | 720 return; |
| 718 | 721 |
| 719 chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs => | 722 chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs => |
| 720 { | 723 { |
| 721 if (tabs.length > 0) | 724 if (tabs.length > 0) |
| 722 { | 725 { |
| 723 if (tabs[0].status == "complete") | 726 if (tabs[0].status == "complete") |
| 724 callback(new Page(tabs[0])); | 727 callback(new Page(tabs[0])); |
| 725 else | 728 else |
| 726 afterTabLoaded(callback)(tabs[0]); | 729 afterTabLoaded(callback)(tabs[0]); |
| 727 } | 730 } |
| 728 }); | 731 }); |
| 729 }); | 732 }); |
| 730 } | 733 } |
| 731 } | 734 } |
| 732 else | 735 else |
| 733 { | 736 { |
| 734 // Edge does not yet support runtime.openOptionsPage (tested version 38) | 737 // Edge does not yet support runtime.openOptionsPage (tested version 38) |
| 735 // nor does Firefox for Android, | 738 // nor does Firefox for Android before version 57, |
| 736 // and so this workaround needs to stay for now. | 739 // and so this workaround needs to stay for now. |
| 737 // We are not using extension.getURL to get the absolute path here | 740 // We are not using extension.getURL to get the absolute path here |
| 738 // because of the Edge issue: | 741 // because of the Edge issue: |
| 739 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10
276332/ | 742 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10
276332/ |
| 740 let open = win => | 743 let open = win => |
| 741 { | 744 { |
| 742 let optionsUrl = "options.html"; | 745 let optionsUrl = "options.html"; |
| 743 let queryInfo = {url: optionsUrl}; | 746 let queryInfo = {url: optionsUrl}; |
| 744 | 747 |
| 745 // extension pages can't be accessed in incognito windows. In order to | 748 // extension pages can't be accessed in incognito windows. In order to |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 ext.windows = { | 790 ext.windows = { |
| 788 create(createData, callback) | 791 create(createData, callback) |
| 789 { | 792 { |
| 790 chrome.windows.create(createData, createdWindow => | 793 chrome.windows.create(createData, createdWindow => |
| 791 { | 794 { |
| 792 afterTabLoaded(callback)(createdWindow.tabs[0]); | 795 afterTabLoaded(callback)(createdWindow.tabs[0]); |
| 793 }); | 796 }); |
| 794 } | 797 } |
| 795 }; | 798 }; |
| 796 }()); | 799 }()); |
| OLD | NEW |