mirrors/Firefox-UI-Fix
1
Fork 0
mirror of https://github.com/black7375/Firefox-UI-Fix.git synced 2026-03-20 05:40:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split windowIsReady from startUpFinished

Browse source
This commit is contained in:
MrOtherGuy 2020-05-29 08:49:26 +03:00
parent b9e858ee55
commit 2a34305a28
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
profile/chrome/utils/boot.jsm
View file

@ -64,6 +64,8 @@ let _uc = {
RESOURCE_DIR: resolveChromePath('chrome://userchrome/content/'),
BASE_FILEURI: Services.io.getProtocolHandler('file').QueryInterface(Ci.nsIFileProtocolHandler).getURLSpecFromDir(Services.dirsvc.get('UChrm',Ci.nsIFile)),
SESSION_RESTORED: false,
get chromeDir() {return Services.dirsvc.get('UChrm',Ci.nsIFile)},
getDirEntry: function(filename,isLoader = false){
@ -290,14 +292,36 @@ let _uc = {
startupFinished: function(){
return new Promise(resolve => {
if(_uc.SESSION_RESTORED){
resolve();
}
let observer = (subject, topic, data) => {
Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
resolve({ subject, data });
Services.obs.removeObserver(observer, "sessionstore-windows-restored");
resolve();
};
Services.obs.addObserver(observer, "browser-delayed-startup-finished");
Services.obs.addObserver(observer, "sessionstore-windows-restored");
});
},
windowIsReady: function(win){
if(win && win.isChromeWindow){
return new Promise(resolve => {
if(win.gBrowserInit.delayedStartupFinished){
resolve()
}
let observer = (subject, topic, data) => {
if(subject === win){
Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
resolve();
}
};
Services.obs.addObserver(observer, "browser-delayed-startup-finished");
});
}else{
return Promise.reject(new Error("reference is not a window"))
}
},
registerHotkey: function(desc,func){
const validMods = ["accel","alt","ctrl","meta","shift"];
const validKey = (k)=>((/^[\w-]$/).test(k) ? 1 : (/^F(?:1[0,2]|[1-9])$/).test(k) ? 2 : 0);
@ -349,6 +373,8 @@ let _uc = {
};
Object.freeze(_uc.utils);
_uc.utils.startupFinished()
.then(()=>{_uc.SESSION_RESTORED = true});
if (yPref.get(_uc.PREF_ENABLED) === undefined) {
yPref.set(_uc.PREF_ENABLED, true);