mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-06 04:35:04 +00:00
Backed out Australis changeset b1494e03f231
This commit is contained in:
parent
2ad84d7cf3
commit
5e98ba44a8
@ -207,8 +207,6 @@ const PanelUI = {
|
|||||||
return this._readyPromise;
|
return this._readyPromise;
|
||||||
}
|
}
|
||||||
this._readyPromise = Task.spawn(function() {
|
this._readyPromise = Task.spawn(function() {
|
||||||
this.contents.setAttributeNS("http://www.w3.org/XML/1998/namespace", "lang",
|
|
||||||
getLocale());
|
|
||||||
if (!this._scrollWidth) {
|
if (!this._scrollWidth) {
|
||||||
// In order to properly center the contents of the panel, while ensuring
|
// In order to properly center the contents of the panel, while ensuring
|
||||||
// that we have enough space on either side to show a scrollbar, we have to
|
// that we have enough space on either side to show a scrollbar, we have to
|
||||||
@ -414,25 +412,3 @@ const PanelUI = {
|
|||||||
this.removeEventListener("command", PanelUI.onCommandHandler);
|
this.removeEventListener("command", PanelUI.onCommandHandler);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the currently selected locale for display.
|
|
||||||
* @return the selected locale or "en-US" if none is selected
|
|
||||||
*/
|
|
||||||
function getLocale() {
|
|
||||||
try {
|
|
||||||
let locale = Services.prefs.getComplexValue(PREF_SELECTED_LOCALE,
|
|
||||||
Ci.nsIPrefLocalizedString);
|
|
||||||
if (locale)
|
|
||||||
return locale;
|
|
||||||
}
|
|
||||||
catch (e) { }
|
|
||||||
|
|
||||||
try {
|
|
||||||
return Services.prefs.getCharPref(PREF_SELECTED_LOCALE);
|
|
||||||
}
|
|
||||||
catch (e) { }
|
|
||||||
|
|
||||||
return "en-US";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -77,7 +77,6 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it
|
|||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
margin: 2px 0 0;
|
margin: 2px 0 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
-moz-hyphens: auto;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#wrapper-edit-controls:-moz-any([place="palette"],[place="panel"]) > #edit-controls,
|
#wrapper-edit-controls:-moz-any([place="palette"],[place="panel"]) > #edit-controls,
|
||||||
|
Loading…
Reference in New Issue
Block a user