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

Delta Between Two Patch Sets: background.js

Issue 29345232: Issue 4084 - Do not use @@bidi_dir directly in adblockplusui (Closed)
Left Patch Set: Rebase Created Aug. 28, 2017, 4:58 p.m.
Right Patch Set: Fix rebase artifacts Created Aug. 29, 2017, 11:25 a.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 | ext/common.js » ('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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 modules.utils = { 86 modules.utils = {
87 Utils: { 87 Utils: {
88 getDocLink(link) 88 getDocLink(link)
89 { 89 {
90 return "https://adblockplus.org/redirect?link=" + encodeURIComponent(lin k); 90 return "https://adblockplus.org/redirect?link=" + encodeURIComponent(lin k);
91 }, 91 },
92 get appLocale() 92 get appLocale()
93 { 93 {
94 return parent.ext.i18n.locale.replace(/_/g, "-"); 94 return parent.ext.i18n.locale.replace(/_/g, "-");
95 } 95 },
96 get readingDirection() 96 get readingDirection()
97 { 97 {
98 reuturn bidiDir = /^(ar|fa|he|ug|ur)(-|$)/.test(this.appLocale) ? 98 return /^(?:ar|fa|he|ug|ur)\b/.test(this.appLocale) ? "rtl" : "ltr";
Thomas Greiner 2017/08/29 08:51:17 Typo: Replace "reuturn" with "return"
Thomas Greiner 2017/08/29 08:51:17 Suggestion: We're not using the values in the capt
Oleksandr 2017/08/29 11:26:29 Rebase artifact. There was more than just this too
99 "rtl" : "ltr";
100 } 99 }
101 } 100 }
102 }; 101 };
103 102
104 modules.prefs = {Prefs: new EventEmitter()}; 103 modules.prefs = {Prefs: new EventEmitter()};
105 let prefs = { 104 let prefs = {
106 notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [], 105 notifications_ignoredcategories: (params.showNotificationUI) ? ["*"] : [],
107 notifications_showui: params.showNotificationUI, 106 notifications_showui: params.showNotificationUI,
108 shouldShowBlockElementMenu: true, 107 shouldShowBlockElementMenu: true,
109 show_devtools_panel: true, 108 show_devtools_panel: true,
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 }, 567 },
569 filter: { 568 filter: {
570 text: "||example.com/some-annoying-popup$popup", 569 text: "||example.com/some-annoying-popup$popup",
571 whitelisted: false, 570 whitelisted: false,
572 userDefined: true, 571 userDefined: true,
573 subscription: null 572 subscription: null
574 } 573 }
575 }); 574 });
576 }); 575 });
577 }()); 576 }());
LEFTRIGHT
« no previous file | ext/common.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld