Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
71 this._keys.splice(index, 1); | 71 this._keys.splice(index, 1); |
72 this._values.splice(index, 1); | 72 this._values.splice(index, 1); |
73 } | 73 } |
74 } | 74 } |
75 }; | 75 }; |
76 | 76 |
77 global.ext.PageMap = PageMap; | 77 global.ext.PageMap = PageMap; |
78 | 78 |
79 global.ext.showOptions = function(callback) | 79 global.ext.showOptions = function(callback) |
80 { | 80 { |
81 if (top.location.href.indexOf("options.html") == -1) | |
82 window.open("options.html", "_blank"); | |
83 | |
81 if (callback) | 84 if (callback) |
82 callback(); | 85 callback(); |
Felix Dahlke
2015/05/28 20:35:41
Isn't the callback supposed to be invoked after th
Thomas Greiner
2015/06/08 16:12:43
That's not necessarily correct. It will also be ca
| |
83 else | |
84 window.open("http://example.com/options.html", "_blank"); | |
85 }; | 86 }; |
86 })(this); | 87 })(this); |
LEFT | RIGHT |