| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 152 // Load subscriptions data | 152 // Load subscriptions data |
| 153 let request = new XMLHttpRequest(); | 153 let request = new XMLHttpRequest(); |
| 154 request.mozBackgroundRequest = true; | 154 request.mozBackgroundRequest = true; |
| 155 request.open("GET", "chrome://adblockplus/content/ui/subscriptions.xml") ; | 155 request.open("GET", "chrome://adblockplus/content/ui/subscriptions.xml") ; |
| 156 request.addEventListener("load", function() | 156 request.addEventListener("load", function() |
| 157 { | 157 { |
| 158 if (onShutdown.done) | 158 if (onShutdown.done) |
| 159 return; | 159 return; |
| 160 | 160 |
| 161 let currentSubscription = FilterStorage.subscriptions.filter((subscrip tion) => subscription instanceof DownloadableSubscription && | 161 let currentSubscription = FilterStorage.subscriptions.filter((subscrip tion) => subscription instanceof DownloadableSubscription && |
| 162 subscription.url != Prefs.subscriptions_exceptionsurl); | 162 subscription.url != Prefs.subscriptions_exceptionsurl && subscriptio n.url != Prefs.subscriptions_antiadblockurl); |
|
Wladimir Palant
2015/01/06 17:05:21
Nit: newline after && to keep this line reasonably
saroyanm
2015/01/06 17:32:36
Done.
| |
| 163 currentSubscription = (currentSubscription.length ? currentSubscriptio n[0] : null); | 163 currentSubscription = (currentSubscription.length ? currentSubscriptio n[0] : null); |
| 164 | 164 |
| 165 let subscriptions =request.responseXML.getElementsByTagName("subscript ion"); | 165 let subscriptions =request.responseXML.getElementsByTagName("subscript ion"); |
| 166 for (let i = 0; i < subscriptions.length; i++) | 166 for (let i = 0; i < subscriptions.length; i++) |
| 167 { | 167 { |
| 168 let item = subscriptions[i]; | 168 let item = subscriptions[i]; |
| 169 let url = item.getAttribute("url"); | 169 let url = item.getAttribute("url"); |
| 170 if (!url) | 170 if (!url) |
| 171 continue; | 171 continue; |
| 172 | 172 |
| (...skipping 1780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1953 ["abp-command-contribute", "command", UI.openContributePage.bind(UI)], | 1953 ["abp-command-contribute", "command", UI.openContributePage.bind(UI)], |
| 1954 ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)] | 1954 ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)] |
| 1955 ]; | 1955 ]; |
| 1956 | 1956 |
| 1957 onShutdown.add(function() | 1957 onShutdown.add(function() |
| 1958 { | 1958 { |
| 1959 for (let window in UI.applicationWindows) | 1959 for (let window in UI.applicationWindows) |
| 1960 if (UI.isBottombarOpen(window)) | 1960 if (UI.isBottombarOpen(window)) |
| 1961 UI.toggleBottombar(window); | 1961 UI.toggleBottombar(window); |
| 1962 }); | 1962 }); |
| OLD | NEW |