wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 53a5746425f9 (bug 834830)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-07-08 15:28:35 +02:00
parent 57c2d1654c
commit 18ed0d3ed2
2 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/browser.js
View File

@ -4377,10 +4377,6 @@ var XULBrowserWindow = {
gURLBar.removeAttribute("level");
}
// Make sure the "https" part of the URL is striked out or not,
// depending on the current mixed active content blocking state.
gURLBar.formatValue();
try {
uri = Services.uriFixup.createExposableURI(uri);
} catch (e) {}

32
browser/base/content/urlbarBindings.xml
View File

@ -213,17 +213,10 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
<field name="_formattingEnabled">true</field>
<method name="formatValue">
<body><![CDATA[
if (!this._formattingEnabled)
if (!this._formattingEnabled || this.focused)
return;
// Always clear the strike-out selection first.
let controller = this.editor.selectionController;
let strikeOut = controller.getSelection(controller.SELECTION_URLSTRIKEOUT);
strikeOut.removeAllRanges();
if (this.focused)
return;
let selection = controller.getSelection(controller.SELECTION_URLSECONDARY);
selection.removeAllRanges();
@ -238,17 +231,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
if (!matchedURL)
return;
// Strike out the "https" part if mixed active content is loaded.
if (this.getAttribute("pageproxystate") == "valid" &&
value.startsWith("https:") &&
gBrowser.securityUI.state &
Ci.nsIWebProgressListener.STATE_LOADED_MIXED_ACTIVE_CONTENT) {
let range = document.createRange();
range.setStart(textNode, 0);
range.setEnd(textNode, 5);
strikeOut.addRange(range);
}
let [, preDomain, domain] = matchedURL;
let baseDomain = domain;
let subDomain = "";
@ -951,17 +933,9 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
}
]]></handler>
<handler event="focus"><![CDATA[
if (event.originalTarget == this.inputField) {
this.formatValue();
}
]]></handler>
<handler event="blur"><![CDATA[
if (event.originalTarget == this.inputField) {
this._clearNoActions();
this.formatValue();
}
this._clearNoActions();
this.formatValue();
]]></handler>
<handler event="dragstart" phase="capturing"><![CDATA[