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

Unified Diff: include.postload.js

Issue 6236888415338496: Issue 1611 - Fixed inconsistent behavior with "Block element" context menu item (Closed)
Patch Set: Created Nov. 26, 2014, 11:28 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/ext/background.js ('k') | safari/ext/background.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include.postload.js
===================================================================
--- a/include.postload.js
+++ b/include.postload.js
@@ -678,50 +678,12 @@
clickHide_deactivate();
break;
case "clickhide-new-filter":
- // The request is received by all frames, so ignore it if we're not the frame the
- // user right-clicked in
- if(!lastRightClickEvent)
- return;
- // We hope the URL we are given is the same as the one in the element referenced
- // by lastRightClickEvent.target. If not, we just discard
- var target = lastRightClickEvent.target;
- var url = target.src;
- // If we don't have the element with a src URL same as the filter, look for it.
- // Chrome's context menu API is terrible. Why can't it give us the friggin' element
- // to start with?
- if(msg.filter !== url)
+ if(lastRightClickEvent)
{
- // Grab all elements with a src attribute.
- // This won't work for all object/embed tags, but the context menu API doesn't
- // work on those, so we're OK for now.
- var elts = document.querySelectorAll('[src]');
- for(var i=0; i<elts.length; i++) {
- url = elts[i].src;
- if(msg.filter === url)
- {
- // This is hopefully our element. In case of multiple elements
- // with the same src, only one will be highlighted.
- target = elts[i];
- break;
- }
- }
- }
- // Following test will be true if we found the element with the filter URL
- if(msg.filter === url)
- {
- // This request would have come from the chrome.contextMenu handler, so we
- // simulate the user having chosen the element to get rid of via the usual means.
clickHide_activated = true;
- // FIXME: clickHideFilters is erased in clickHide_mouseClick anyway, so why set it?
- clickHideFilters = [msg.filter];
- // Coerce red highlighted overlay on top of element to remove.
- // TODO: Wow, the design of the clickHide stuff is really dumb - gotta fix it sometime
- currentElement = addElementOverlay(target);
- // clickHide_mouseOver(lastRightClickEvent);
+ currentElement = addElementOverlay(lastRightClickEvent.target);
clickHide_mouseClick(lastRightClickEvent);
}
- else
- console.log("clickhide-new-filter: URLs don't match. Couldn't find that element.", msg.filter, url, lastRightClickEvent.target.src);
break;
case "clickhide-init":
if (clickHideFiltersDialog)
« no previous file with comments | « chrome/ext/background.js ('k') | safari/ext/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld