mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-07 08:18:41 +09:00
Merge remote-tracking branch 'origin/master' into custom
This commit is contained in:
commit
2cb30a238c
4110 changed files with 343 additions and 435849 deletions
|
|
@ -158,10 +158,7 @@ var gUIStateBeforeReset = {
|
|||
XPCOMUtils.defineLazyGetter(this, "log", () => {
|
||||
let scope = {};
|
||||
Cu.import("resource://gre/modules/Console.jsm", scope);
|
||||
let debug;
|
||||
try {
|
||||
debug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
|
||||
} catch (ex) {}
|
||||
let debug = Services.prefs.getBoolPref(kPrefCustomizationDebug, false);
|
||||
let consoleOptions = {
|
||||
maxLogLevel: debug ? "all" : "log",
|
||||
prefix: "CustomizableUI",
|
||||
|
|
@ -1924,16 +1921,10 @@ var CustomizableUIInternal = {
|
|||
// state immediately when a browser window opens, which is important for
|
||||
// other consumers of this API.
|
||||
loadSavedState: function() {
|
||||
let state = null;
|
||||
try {
|
||||
state = Services.prefs.getCharPref(kPrefCustomizationState);
|
||||
} catch (e) {
|
||||
log.debug("No saved state found");
|
||||
// This will fail if nothing has been customized, so silently fall back to
|
||||
// the defaults.
|
||||
}
|
||||
|
||||
let state = Services.prefs.getCharPref(kPrefCustomizationState, "");
|
||||
if (!state) {
|
||||
log.debug("No saved state found");
|
||||
// Nothing has been customized, so silently fall back to the defaults.
|
||||
return;
|
||||
}
|
||||
try {
|
||||
|
|
@ -2218,10 +2209,7 @@ var CustomizableUIInternal = {
|
|||
this.notifyListeners("onWidgetAdded", widget.id, widget.currentArea,
|
||||
widget.currentPosition);
|
||||
} else if (widgetMightNeedAutoAdding) {
|
||||
let autoAdd = true;
|
||||
try {
|
||||
autoAdd = Services.prefs.getBoolPref(kPrefCustomizationAutoAdd);
|
||||
} catch (e) {}
|
||||
let autoAdd = Services.prefs.getBoolPref(kPrefCustomizationAutoAdd, true);
|
||||
|
||||
// If the widget doesn't have an existing placement, and it hasn't been
|
||||
// seen before, then add it to its default area so it can be used.
|
||||
|
|
|
|||
|
|
@ -42,10 +42,7 @@ const kWidePanelItemClass = "panel-wide-item";
|
|||
XPCOMUtils.defineLazyGetter(this, "log", () => {
|
||||
let scope = {};
|
||||
Cu.import("resource://gre/modules/Console.jsm", scope);
|
||||
let debug;
|
||||
try {
|
||||
debug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
|
||||
} catch (ex) {}
|
||||
let debug = Services.prefs.getBoolPref(kPrefCustomizationDebug, false);
|
||||
let consoleOptions = {
|
||||
maxLogLevel: debug ? "all" : "log",
|
||||
prefix: "CustomizableWidgets",
|
||||
|
|
|
|||
|
|
@ -40,9 +40,7 @@ let gDebug;
|
|||
XPCOMUtils.defineLazyGetter(this, "log", () => {
|
||||
let scope = {};
|
||||
Cu.import("resource://gre/modules/Console.jsm", scope);
|
||||
try {
|
||||
gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug);
|
||||
} catch (ex) {}
|
||||
gDebug = Services.prefs.getBoolPref(kPrefCustomizationDebug, false);
|
||||
let consoleOptions = {
|
||||
maxLogLevel: gDebug ? "all" : "log",
|
||||
prefix: "CustomizeMode",
|
||||
|
|
@ -1503,10 +1501,7 @@ CustomizeMode.prototype = {
|
|||
if (!AppConstants.CAN_DRAW_IN_TITLEBAR) {
|
||||
return;
|
||||
}
|
||||
let drawInTitlebar = true;
|
||||
try {
|
||||
drawInTitlebar = Services.prefs.getBoolPref(kDrawInTitlebarPref);
|
||||
} catch (ex) { }
|
||||
let drawInTitlebar = Services.prefs.getBoolPref(kDrawInTitlebarPref, true);
|
||||
let button = this.document.getElementById("customization-titlebar-visibility-button");
|
||||
// Drawing in the titlebar means 'hiding' the titlebar:
|
||||
if (drawInTitlebar) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue