summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 05:00:55 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 05:00:55 +0000
commit24db15aad11b621bee53e2fb6fc27d59d48531a5 (patch)
tree3b8e793961a17fe2dd76d4b62e6e8096ca354298
parent445b7dba22ea5da2d3ed818ce443e54546156886 (diff)
downloadchromium_src-24db15aad11b621bee53e2fb6fc27d59d48531a5.zip
chromium_src-24db15aad11b621bee53e2fb6fc27d59d48531a5.tar.gz
chromium_src-24db15aad11b621bee53e2fb6fc27d59d48531a5.tar.bz2
History: Unable to open a link in search result if we click on bold text.
This is a follow-up change for crrev.com/212474. We need to handle cases that <a> contains child elements like <label><input type=checkbox> <a><b>Issue</b> xxxx: ...</a></label> BUG=265434 Review URL: https://chromiumcodereview.appspot.com/21151004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215223 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/history/history.js13
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/resources/history/history.js b/chrome/browser/resources/history/history.js
index 637dc78..1f688e5 100644
--- a/chrome/browser/resources/history/history.js
+++ b/chrome/browser/resources/history/history.js
@@ -1777,9 +1777,16 @@ function entryBoxClick(event) {
// Do nothing if a bookmark star is clicked.
if (event.defaultPrevented)
return;
- var tagName = event.target.tagName;
- if (tagName == 'BUTTON' || tagName == 'INPUT' || tagName == 'A')
- return;
+ var element = event.target;
+ // Do nothing if the event happened in an interactive element.
+ for (; element != event.currentTarget; element = element.parentNode) {
+ switch (element.tagName) {
+ case 'A':
+ case 'BUTTON':
+ case 'INPUT':
+ return;
+ }
+ }
var checkbox = event.currentTarget.control;
checkbox.checked = !checkbox.checked;
handleCheckboxStateChange(checkbox, event.shiftKey);