From bb626108d6b3fde7d00d0cd22210c70ddbaea08b Mon Sep 17 00:00:00 2001 From: Andrew Hurle Date: Mon, 16 Jul 2012 20:48:00 -0700 Subject: [PATCH] Bug 774495 - Get rid of ac-emphasize-alt in awesomebar. r=Unfocused --- toolkit/content/widgets/autocomplete.xml | 24 +------------------ .../gnomestripe/global/autocomplete.css | 4 ---- .../themes/pinstripe/global/autocomplete.css | 4 ---- .../themes/winstripe/global/autocomplete.css | 4 ---- 4 files changed, 1 insertion(+), 35 deletions(-) diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml index 2d7de59a06d..a032bb2eda1 100644 --- a/toolkit/content/widgets/autocomplete.xml +++ b/toolkit/content/widgets/autocomplete.xml @@ -1360,23 +1360,6 @@ - - - - = 0; ) { - let charCode = aText.charCodeAt(i); - // Arabic, Syriac, Indic languages are likely to have ligatures - // that are broken when using the main emphasis styling - if (0x0600 <= charCode && charCode <= 0x109F) - return true; - } - - return false; - ]]> - - - @@ -1398,10 +1381,6 @@ let tokens = this._getSearchTokens(search); let indices = this._getBoundaryIndices(aText, tokens); - // If we're searching for something that needs alternate emphasis, - // we'll need to check the text that we match - let checkAlt = this._needsAlternateEmphasis(search); - let next; let start = 0; let len = indices.length; @@ -1415,8 +1394,7 @@ // Emphasize the text for even indices let span = aDescriptionElement.appendChild( document.createElementNS("http://www.w3.org/1999/xhtml", "span")); - span.className = checkAlt && this._needsAlternateEmphasis(text) ? - "ac-emphasize-alt" : "ac-emphasize-text"; + span.className = "ac-emphasize-text"; span.textContent = text; } else { // Otherwise, it's plain text diff --git a/toolkit/themes/gnomestripe/global/autocomplete.css b/toolkit/themes/gnomestripe/global/autocomplete.css index aec845eab94..38162c791ce 100644 --- a/toolkit/themes/gnomestripe/global/autocomplete.css +++ b/toolkit/themes/gnomestripe/global/autocomplete.css @@ -177,10 +177,6 @@ html|span.ac-emphasize-text { background-color: rgba(255,255,255,0.2); } -html|span.ac-emphasize-alt { - text-decoration: underline; -} - .ac-title, .ac-url { overflow: hidden; } diff --git a/toolkit/themes/pinstripe/global/autocomplete.css b/toolkit/themes/pinstripe/global/autocomplete.css index 73eedd3f911..7bed66a21fb 100644 --- a/toolkit/themes/pinstripe/global/autocomplete.css +++ b/toolkit/themes/pinstripe/global/autocomplete.css @@ -164,10 +164,6 @@ html|span.ac-emphasize-text { background-color: rgba(183,210,226,0.3); } -html|span.ac-emphasize-alt { - text-decoration: underline; -} - .ac-title, .ac-url { overflow: hidden; } diff --git a/toolkit/themes/winstripe/global/autocomplete.css b/toolkit/themes/winstripe/global/autocomplete.css index 5f3ca4c5bfd..3f9b6795556 100644 --- a/toolkit/themes/winstripe/global/autocomplete.css +++ b/toolkit/themes/winstripe/global/autocomplete.css @@ -204,10 +204,6 @@ html|span.ac-emphasize-text { %endif } -html|span.ac-emphasize-alt { - text-decoration: underline; -} - .ac-title, .ac-url { overflow: hidden; }