Left: | ||
Right: |
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 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1497 let host = null; | 1497 let host = null; |
1498 try | 1498 try |
1499 { | 1499 { |
1500 host = location.host.replace(/^www\./, ""); | 1500 host = location.host.replace(/^www\./, ""); |
1501 } catch (e) {} | 1501 } catch (e) {} |
1502 | 1502 |
1503 if (host) | 1503 if (host) |
1504 { | 1504 { |
1505 let ending = "|"; | 1505 let ending = "|"; |
1506 location = location.clone(); | 1506 location = location.clone(); |
1507 location.spec = (location.spec.indexOf("#", location.spec.length - 1) ? | |
1508 location.spec.substring(0, location.spec.length - 1) : location.spec); | |
Wladimir Palant
2014/06/12 06:40:08
The code setting location.ref right below the one
saroyanm
2014/06/12 07:19:06
Good point, how I could miss that easy change.
Don
| |
1507 if (location instanceof Ci.nsIURL && location.ref) | 1509 if (location instanceof Ci.nsIURL && location.ref) |
1508 location.ref = ""; | 1510 location.ref = ""; |
1509 if (location instanceof Ci.nsIURL && location.query) | 1511 if (location instanceof Ci.nsIURL && location.query) |
1510 { | 1512 { |
1511 location.query = ""; | 1513 location.query = ""; |
1512 ending = "?"; | 1514 ending = "?"; |
1513 } | 1515 } |
1514 | 1516 |
1515 siteWhitelist = Filter.fromText("@@||" + host + "^$document"); | 1517 siteWhitelist = Filter.fromText("@@||" + host + "^$document"); |
1516 setChecked(prefix + "whitelistsite", siteWhitelist.subscriptions.length && !siteWhitelist.disabled); | 1518 setChecked(prefix + "whitelistsite", siteWhitelist.subscriptions.length && !siteWhitelist.disabled); |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1950 ["abp-command-contribute", "command", UI.openContributePage.bind(UI)], | 1952 ["abp-command-contribute", "command", UI.openContributePage.bind(UI)], |
1951 ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)] | 1953 ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)] |
1952 ]; | 1954 ]; |
1953 | 1955 |
1954 onShutdown.add(function() | 1956 onShutdown.add(function() |
1955 { | 1957 { |
1956 for (let window in UI.applicationWindows) | 1958 for (let window in UI.applicationWindows) |
1957 if (UI.isBottombarOpen(window)) | 1959 if (UI.isBottombarOpen(window)) |
1958 UI.toggleBottombar(window); | 1960 UI.toggleBottombar(window); |
1959 }); | 1961 }); |
OLD | NEW |