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

Delta Between Two Patch Sets: adblockplus/Api.jsm

Issue 4920541991403520: Create a minimal settings UI (Closed)
Left Patch Set: ...malformed Created March 22, 2015, 5:13 p.m.
Right Patch Set: Removed default case Created March 22, 2015, 9:23 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | mobile/android/base/moz.build » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 get acceptableAdsEnabled() 46 get acceptableAdsEnabled()
47 { 47 {
48 return FilterStorage.subscriptions.some( 48 return FilterStorage.subscriptions.some(
49 (subscription) => subscription.url == Prefs.subscriptions_exceptionsurl); 49 (subscription) => subscription.url == Prefs.subscriptions_exceptionsurl);
50 }, 50 },
51 set acceptableAdsEnabled(acceptableAdsEnabled) 51 set acceptableAdsEnabled(acceptableAdsEnabled)
52 { 52 {
53 if (acceptableAdsEnabled != AdblockPlusApi.acceptableAdsEnabled) 53 if (acceptableAdsEnabled != AdblockPlusApi.acceptableAdsEnabled)
54 UI.toggleAcceptableAds(); 54 UI.toggleAcceptableAds();
55 }, 55 },
56 initCommunication : function() 56 initCommunication: function()
Felix Dahlke 2015/03/22 21:05:09 Nit: No space before :. Also below.
René Jeschke 2015/03/22 21:18:15 Done.
57 { 57 {
58 RequestService.addListener((function(data) 58 RequestService.addListener((function(data)
59 { 59 {
60 if (!data) 60 if (!data)
61 return {"success" : false, "error" : "malformed request"}; 61 return {"success": false, "error": "malformed request"};
62 62
63 if (data["action"] == "getFiltersLoaded") 63 if (data["action"] == "getFiltersLoaded")
64 return {"success" : true, "value" : this.filtersLoaded}; 64 return {"success": true, "value": this.filtersLoaded};
65 65
66 if (!this.filtersLoaded) 66 if (!this.filtersLoaded)
67 return {"success" : false, "error" : "filters not loaded"}; 67 return {"success": false, "error": "filters not loaded"};
68 68
69 switch (data["action"]) 69 switch (data["action"])
70 { 70 {
71 case "getAcceptableAdsEnabled": 71 case "getAcceptableAdsEnabled":
72 return {"success" : true, "value" : this.acceptableAdsEnabled}; 72 return {"success": true, "value": this.acceptableAdsEnabled};
73 case "setAcceptableAdsEnabled": 73 case "setAcceptableAdsEnabled":
74 if ("enable" in data) 74 if ("enable" in data)
75 { 75 {
76 this.acceptableAdsEnabled = !!data["enable"]; 76 this.acceptableAdsEnabled = !!data["enable"];
77 return {"success" : true}; 77 return {"success" : true};
78 } 78 }
79 return {"success" : false, "error" : "malformed request"}; 79 return {"success": false, "error": "malformed request"};
80 default:
81 return {"success" : false, "error" : "unknown action '" + data["action "] + "'"};
82 } 80 }
83 return {"success" : false, "error" : "malformed request"}; 81 return {"success": false, "error": "malformed request"};
Felix Dahlke 2015/03/22 21:05:09 We can't really reach this with the default case a
René Jeschke 2015/03/22 21:18:15 But is 'missing action' the same as 'no such actio
84 }).bind(this), "AdblockPlus:Api"); 82 }).bind(this), "AdblockPlus:Api");
85 } 83 }
86 }; 84 };
87 85
LEFTRIGHT

Powered by Google App Engine
This is Rietveld