Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code review: fix eraser when using "Current tab" view in logger

This commit is contained in:
Raymond Hill 2018-01-10 11:50:08 -05:00
parent abcea432a4
commit 9fa1c37183
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/logger-ui-inspector.js
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
uBlock Origin - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2015-2016 Raymond Hill Copyright (C) 2015-2018 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -561,8 +561,7 @@ var onMouseOver = (function() {
var currentTabId = function() { var currentTabId = function() {
if ( showdomButton.classList.contains('active') === false ) { return ''; } if ( showdomButton.classList.contains('active') === false ) { return ''; }
var tabId = logger.tabIdFromPageSelector(); return logger.tabIdFromPageSelector();
return tabId !== 'bts' ? tabId : '';
}; };
/******************************************************************************/ /******************************************************************************/

30
src/js/logger-ui.js
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
uBlock Origin - a browser extension to block requests. uBlock Origin - a browser extension to block requests.
Copyright (C) 2015-2017 Raymond Hill Copyright (C) 2015-2018 Raymond Hill
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -46,17 +46,17 @@ var removeAllChildren = logger.removeAllChildren = function(node) {
/******************************************************************************/ /******************************************************************************/
var tabIdFromClassName = logger.tabIdFromClassName = function(className) { var tabIdFromClassName = function(className) {
var matches = className.match(/\btab_([^ ]+)\b/); var matches = className.match(/\btab_([^ ]+)\b/);
return matches !== null ? matches[1] : ''; return matches !== null ? matches[1] : '';
}; };
var tabIdFromPageSelector = logger.tabIdFromPageSelector = function() { var tabIdFromPageSelector = logger.tabIdFromPageSelector = function() {
var tabClass = uDom.nodeFromId('pageSelector').value; var tabClass = uDom.nodeFromId('pageSelector').value;
if ( tabClass === '' ) { return ''; } if ( tabClass === 'tab_active' && activeTabId !== undefined ) {
if ( tabClass === 'tab_bts' ) { return noTabId; } return activeTabId;
if ( tabClass === 'tab_active' ) { return activeTabId; } }
return tabClass.slice(4); return /^tab_\d+$/.test(tabClass) ? tabClass.slice(4) : '';
}; };
/******************************************************************************/ /******************************************************************************/
@ -623,10 +623,14 @@ var pageSelectorFromURLHash = (function() {
/******************************************************************************/ /******************************************************************************/
var reloadTab = function() { var reloadTab = function(ev) {
var tabId = tabIdFromPageSelector(); var tabId = tabIdFromPageSelector();
if ( tabId === '' || tabId === noTabId ) { return; } if ( tabId === '' ) { return; }
messaging.send('loggerUI', { what: 'reloadTab', tabId: tabId }); messaging.send('loggerUI', {
what: 'reloadTab',
tabId: tabId,
bypassCache: ev && (ev.ctrlKey || ev.metaKey || ev.shiftKey)
});
}; };
/******************************************************************************/ /******************************************************************************/
@ -1509,13 +1513,17 @@ var toJunkyard = function(trs) {
/******************************************************************************/ /******************************************************************************/
var clearBuffer = function() { var clearBuffer = function() {
var tabClass = uDom.nodeFromId('pageSelector').value || ''; var tabClass = uDom.nodeFromId('pageSelector').value;
var btsAlso = tabClass === '' || tabClass === 'tab_bts';
var tbody = document.querySelector('#netInspector tbody'); var tbody = document.querySelector('#netInspector tbody');
var tr = tbody.lastElementChild; var tr = tbody.lastElementChild;
var trPrevious; var trPrevious;
while ( tr !== null ) { while ( tr !== null ) {
trPrevious = tr.previousElementSibling; trPrevious = tr.previousElementSibling;
if ( tabClass === '' || tr.classList.contains(tabClass) ) { if (
(tr.clientHeight > 0) &&
(tr.classList.contains('tab_bts') === false || btsAlso)
) {
trJunkyard.push(tbody.removeChild(tr)); trJunkyard.push(tbody.removeChild(tr));
} }
tr = trPrevious; tr = trPrevious;