Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-29 06:07:11 +02:00
Code Issues Releases Wiki Activity

Change back to 'Block Element' until later (details:...)

Browse Source 
until we have a more general 'element picker' equivalent that can
block resources. So having this exposed in the request logger would
be basically useless (since the only type of stuff that one would
want to block using the request logger are probably things that
aren't visible DOM elements)
This commit is contained in:
Chris 2015-05-14 17:04:15 -06:00
parent 73cec697ea
commit 801e6d706f
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/firefox/vapi-background.js
View File

@ -1943,10 +1943,10 @@ vAPI.contextMenu.displayMenuItem = function({target}) {
/******************************************************************************/ /******************************************************************************/
vAPI.contextMenu.createContextMenuItem = function(doc, labelOverride) { vAPI.contextMenu.createContextMenuItem = function(doc) {
var menuitem = doc.createElement('menuitem'); var menuitem = doc.createElement('menuitem');
menuitem.setAttribute('id', this.menuItemId); menuitem.setAttribute('id', this.menuItemId);
menuitem.setAttribute('label', labelOverride || this.menuLabel); menuitem.setAttribute('label', this.menuLabel);
menuitem.setAttribute('image', vAPI.getURL('img/browsericons/icon16.svg')); menuitem.setAttribute('image', vAPI.getURL('img/browsericons/icon16.svg'));
menuitem.setAttribute('class', 'menuitem-iconic'); menuitem.setAttribute('class', 'menuitem-iconic');
return menuitem; return menuitem;
@ -2037,7 +2037,7 @@ vAPI.contextMenu.registerForNetMonitor = function(eventName, toolbox, panel) {
var insertBeforeMenuItem = doc.getElementById("request-menu-context-separator"); var insertBeforeMenuItem = doc.getElementById("request-menu-context-separator");
if (menuPopup && insertBeforeMenuItem) { if (menuPopup && insertBeforeMenuItem) {
var menuitem = vAPI.contextMenu.createContextMenuItem(doc, vAPI.i18n('netLoggerBlockResourcePrompt')); var menuitem = vAPI.contextMenu.createContextMenuItem(doc);
menuitem.addEventListener('command', function() { menuitem.addEventListener('command', function() {
var selectedRequest = panel.panelWin.NetMonitorView.RequestsMenu.selectedAttachment; var selectedRequest = panel.panelWin.NetMonitorView.RequestsMenu.selectedAttachment;
if (selectedRequest) { if (selectedRequest) {

4
src/_locales/en/messages.json
View File

@ -147,10 +147,6 @@
"message":"Block element", "message":"Block element",
"description":"English: Block element" "description":"English: Block element"
}, },
"netLoggerBlockResourcePrompt":{
"message":"Block resource",
"description":"English: Block resource"
},
"settingsCollapseBlockedPrompt":{ "settingsCollapseBlockedPrompt":{
"message":"Hide placeholders of blocked elements", "message":"Hide placeholders of blocked elements",
"description":"English: Hide placeholders of blocked elements" "description":"English: Hide placeholders of blocked elements"

8
src/css/devtool-log.css
View File

@ -85,11 +85,11 @@ input:focus {
#content table tr.allowed { #content table tr.allowed {
background-color: rgba(0, 160, 0, 0.1); background-color: rgba(0, 160, 0, 0.1);
} }
#content table tr.allowed.mirrored { #content table tr.neutral {
background-color: rgba(255, 255, 0, 0.3); cursor: pointer;
} }
#content table tr.maindoc { #content table tr.neutral:hover {
background-color: #eee; background-color: rgba(80, 80, 80, 0.1);
} }
#content table tr.cosmetic { #content table tr.cosmetic {
background-color: rgba(255, 255, 0, 0.1); background-color: rgba(255, 255, 0, 0.1);

4
src/js/devtool-log.js
View File

@ -156,11 +156,9 @@ var renderLogEntry = function(entry) {
tr.cells[0].textContent = ' -\u00A0'; tr.cells[0].textContent = ' -\u00A0';
} else if ( entry.result.charAt(1) === 'a' ) { } else if ( entry.result.charAt(1) === 'a' ) {
tr.classList.add('allowed'); tr.classList.add('allowed');
if ( entry.result.charAt(0) === 'm' ) {
tr.classList.add('mirrored');
}
tr.cells[0].textContent = ' +\u00A0'; tr.cells[0].textContent = ' +\u00A0';
} else { } else {
tr.classList.add('neutral');
tr.cells[0].textContent = ''; tr.cells[0].textContent = '';
} }

2
tools/make-firefox-meta.py
View File

@ -24,7 +24,7 @@ source_locale_dir = pj(build_dir, '_locales')
target_locale_dir = pj(build_dir, 'locale') target_locale_dir = pj(build_dir, 'locale')
language_codes = [] language_codes = []
descriptions = OrderedDict({}) descriptions = OrderedDict({})
title_case_strings = ['pickerContextMenuEntry', 'netLoggerBlockResourcePrompt'] title_case_strings = ['pickerContextMenuEntry']
for alpha2 in sorted(os.listdir(source_locale_dir)): for alpha2 in sorted(os.listdir(source_locale_dir)):
locale_path = pj(source_locale_dir, alpha2, 'messages.json') locale_path = pj(source_locale_dir, alpha2, 'messages.json')