Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/ui.js

Issue 4759471792324608: Issue 1712 - Don't add "Adblock Warning Removal List" subscription on Fennec (Closed)
Patch Set: Created Dec. 22, 2014, 12:08 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 subscription.title = "Allow non-intrusive advertising"; 810 subscription.title = "Allow non-intrusive advertising";
811 FilterStorage.addSubscription(subscription); 811 FilterStorage.addSubscription(subscription);
812 if (subscription instanceof DownloadableSubscription && !subscription.la stDownload) 812 if (subscription instanceof DownloadableSubscription && !subscription.la stDownload)
813 Synchronizer.execute(subscription); 813 Synchronizer.execute(subscription);
814 } 814 }
815 else 815 else
816 addAcceptable = false; 816 addAcceptable = false;
817 } 817 }
818 818
819 // Add "anti-adblock messages" subscription for new users and users updating from old ABP versions 819 // Add "anti-adblock messages" subscription for new users and users updating from old ABP versions
820 if (Services.vc.compare(prevVersion, "2.5") < 0) 820 if ((Services.vc.compare(prevVersion, "2.5") < 0) && !Utils.isFennec)
Wladimir Palant 2015/01/06 13:18:12 I guess there is a misunderstanding here - not add
saroyanm 2015/01/06 16:03:07 Thanks for pointing this out, but don't we also ne
Wladimir Palant 2015/01/06 17:05:21 It is normally being enabled via the opt-in prompt
saroyanm 2015/01/06 17:32:36 The prompt is not showing up on mobile unfortunate
821 { 821 {
822 let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl ); 822 let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl );
823 if (subscription && !(subscription.url in FilterStorage.knownSubscriptions )) 823 if (subscription && !(subscription.url in FilterStorage.knownSubscriptions ))
824 { 824 {
825 subscription.disabled = true; 825 subscription.disabled = true;
826 FilterStorage.addSubscription(subscription); 826 FilterStorage.addSubscription(subscription);
827 if (subscription instanceof DownloadableSubscription && !subscription.la stDownload) 827 if (subscription instanceof DownloadableSubscription && !subscription.la stDownload)
828 Synchronizer.execute(subscription); 828 Synchronizer.execute(subscription);
829 } 829 }
830 } 830 }
(...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld