デフォルト値指定

Floorp-Projects · Dec 19, 2023 · 8712f9e · 8712f9e
1 parent d0a454a
commit 8712f9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/browser/components/newtab/lib/PrefsFeed.jsm b/browser/components/newtab/lib/PrefsFeed.jsm
@@ -273,7 +273,7 @@ class PrefsFeed {
 
       }
     }else if(Services.prefs.getIntPref("browser.newtabpage.activity-stream.floorp.background.type") == 4){
-      const tmpPath = Services.prefs.getStringPref("browser.newtabpage.activity-stream.floorp.background.image.path")
+      const tmpPath = Services.prefs.getStringPref("browser.newtabpage.activity-stream.floorp.background.image.path") || PathUtils.join(Services.dirsvc.get("ProfD", Ci.nsIFile).path, "newtabImages","wallpaper.png")
       const fetchPath = Services.io.newFileURI(FileUtils.File(tmpPath)).asciiSpec
       if(tmpPath != this.oneImageData.url){
         this.oneImageData = {"url":tmpPath,data:"","extension":"",notExist:false}

diff --git a/browser/components/preferences/home.js b/browser/components/preferences/home.js
@@ -822,7 +822,8 @@ var gHomePane = {
   },
 
   imagePathInputSet(){
-    let folderPath = Services.prefs.getStringPref("browser.newtabpage.activity-stream.floorp.background.image.path","")
+    let folderPath = Services.prefs.getStringPref("browser.newtabpage.activity-stream.floorp.background.image.path") || PathUtils.join(Services.dirsvc.get("ProfD", Ci.nsIFile).path, "newtabImages","wallpaper.png")
+    console.log(folderPath)
     document.querySelector("#picturePath").value = folderPath
     document.querySelector("#picturePath").style.backgroundImage = `url(moz-icon://${Services.io.newFileURI(FileUtils.File(folderPath)).asciiSpec})`
   }

diff --git a/floorp b/floorp
+4 −1		browser/app/profile/000-floorp.js
+2 −0		browser/base/content/browser-browserActions.js
+0 −82		browser/base/content/browser-floorp.css
+20 −0		browser/base/content/browser-workspace.js
+18 −46		browser/base/content/browser-workspaces.js
+2 −1		browser/base/content/floorp-scripts.inc
+13 −12		browser/components/preferences/workspaces.inc.xhtml
+88 −0		browser/components/workspaces/WorkspacesElementService.sys.mjs
+0 −7		browser/components/workspaces/WorkspacesService.sys.mjs
+1 −1		browser/locales/l10n-central