Skip to content

Commit

Permalink
Merge branch 'feature/AG-2737' into feature/AG-8668
Browse files Browse the repository at this point in the history
  • Loading branch information
zhelvis committed Jun 21, 2021
2 parents b0b40c9 + 34fa747 commit b275da0
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* along with Adguard Browser Extension. If not, see <http://www.gnu.org/licenses/>.
*/


/**
* This is an abstract filtering log module with methods throwing errors if used.
* It should be replaced by webpack during compilation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,8 @@ const browsersFilteringLog = (function () {

/**
* Remove log requests for tab
* @param tabId
* @param {boolean} ignorePreserveLog
* @param {number} tabId
* @param {boolean} [ignorePreserveLog]
*/
const clearEventsByTabId = function (tabId, ignorePreserveLog) {
const tabInfo = tabsInfoMap[tabId];
Expand Down
8 changes: 4 additions & 4 deletions Extension/src/background/filter/request-blocking.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const webRequestService = (function () {
referrerUrl,
requestType,
tab,
requestRule
requestRule,
});

return isRequestBlockedByRule(requestRule);
Expand Down Expand Up @@ -449,9 +449,9 @@ export const webRequestService = (function () {
const ruleResult = r.getAdvancedModifier().removeParameters(result);
if (ruleResult !== result) {
filteringLog.addRemoveParamEvent({
tab,
frameUrl: requestUrl,
requestType,
tab,
frameUrl: requestUrl,
requestType,
rule: r,
timestamp: Date.now(),
});
Expand Down
12 changes: 0 additions & 12 deletions Extension/src/background/webrequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,6 @@ const webrequestInit = function () {
// Reset tab button state
listeners.notifyListeners(listeners.UPDATE_TAB_BUTTON_STATE, tab, true);

// Record request context for the main frame
requestContextStorage.record({
requestId,
requestUrl,
referrerUrl: requestUrl,
originUrl,
requestType,
tab,
method,
});

/**
* Just to remember!
* In the case of the "about:newtab" pages we don't receive onResponseReceived event for the main_frame
Expand Down Expand Up @@ -517,7 +506,6 @@ const webrequestInit = function () {
const requestContext = requestContextStorage.get(requestId);
if (!requestContext) {
// Record request for other types
//const { requestId, requestUrl, referrerUrl, originUrl, requestType, tab } = params;
requestContextStorage.record({
requestId,
requestUrl,
Expand Down
9 changes: 8 additions & 1 deletion Extension/src/pages/common/components/ui/Select/Select.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ import './select.pcss';

const renderOptions = (options) => options.map((option) => {
const { value, title } = option;
return <option key={value} value={value}>{title}</option>;

// &#8201 - Invisible thin space
return (
<option key={value} value={value}>
&#8201;
{title}
</option>
);
});

const Select = (props) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
}

& .th, & .td {
padding: 0 25px;
padding: 0 10px;
height: 30px;
display: inline-block;
width: 20%;
Expand Down

0 comments on commit b275da0

Please sign in to comment.