| OLD | NEW |
| 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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 // the current page is replaced with a prerendered page. | 645 // the current page is replaced with a prerendered page. |
| 646 replacePage(pages[event.message.pageId]); | 646 replacePage(pages[event.message.pageId]); |
| 647 break; | 647 break; |
| 648 } | 648 } |
| 649 }); | 649 }); |
| 650 | 650 |
| 651 | 651 |
| 652 /* Storage */ | 652 /* Storage */ |
| 653 | 653 |
| 654 ext.storage = safari.extension.settings; | 654 ext.storage = safari.extension.settings; |
| 655 |
| 656 |
| 657 /* Options */ |
| 658 |
| 659 ext.showOptions = function(callback) |
| 660 { |
| 661 var optionsUrl = safari.extension.baseURI + "options.html"; |
| 662 |
| 663 for (var id in pages) |
| 664 { |
| 665 var page = pages[id]; |
| 666 |
| 667 if (page.url == optionsUrl && page._tab.browserWindow == safari.applicatio
n.activeBrowserWindow) |
| 668 { |
| 669 page.activate(); |
| 670 if (callback) |
| 671 callback(page); |
| 672 return; |
| 673 } |
| 674 } |
| 675 |
| 676 ext.pages.open(optionsUrl, callback); |
| 677 }; |
| 655 })(); | 678 })(); |
| OLD | NEW |