diff --git a/background/browser.ts b/background/browser.ts index 222d87c30..a1ff50253 100644 --- a/background/browser.ts +++ b/background/browser.ts @@ -408,7 +408,6 @@ export const executeScript_ = (tabId: OnChrome && Build.MinCVer < BrowserVer.MinInjectImmediatelyInMV3 && CurCVer_ < BrowserVer.MinInjectImmediatelyInMV3 && delete toRun.injectImmediately browser_.scripting.executeScript(toRun, callback || runtimeError_) - return } else { const toRun: chrome.tabs.InjectDetails = frameId >= 0 ? { frameId } : { allFrames: true, matchAboutBlank: true } toRun.runAt = "document_start" diff --git a/background/help_dialog.ts b/background/help_dialog.ts index 0c7538e15..c4cb5afec 100644 --- a/background/help_dialog.ts +++ b/background/help_dialog.ts @@ -362,7 +362,7 @@ const commandGroups_: { , "clearContentSettings", 1 , "copyWindowInfo", 1, "$format=\"${title}: ${url}\", join:true/string, decoded" , "captureTab" - , "toggleWindow", "$states=\"normal maximized\"" + , "toggleWindow", "$states=\"normal,maximized\"" ], misc: [ "showHelp" @@ -388,7 +388,9 @@ const commandGroups_: { } if (OnChrome) { - (commandGroups_.misc as Writable).push("closeDownloadBar") + (commandGroups_.misc as Writable).push("closeDownloadBar", 1) + Build.MinCVer < BrowserVer.MinNoDownloadBubbleFlag && CurCVer_ < BrowserVer.MinNoDownloadBubbleFlag + && (commandGroups_.misc as Writable).pop() } if (OnFirefox || OnChrome && IsEdg_) { diff --git a/gulpfile.js b/gulpfile.js index 66e36dd84..4f0096d6d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -129,7 +129,7 @@ var Tasks = { } var btypes = getBuildItem("BTypes"); const has_wordsRe = btypes & BrowserType.Chrome && getBuildItem("MinCVer") < - 59 /* min(MinSelExtendForwardOnlySkipWhitespaces, MinEnsuredUnicodePropertyEscapesInRegExp) */ + /* min(MinSelExtendForwardOnlySkipWhitespaces, MinEnsuredUnicodePropertyEscapesInRegExp) */ 59 || btypes & BrowserType.Firefox && !getBuildItem("NativeWordMoveOnFirefox") && getBuildItem("MinFFVer") < /* FirefoxBrowserVer.MinEnsuredUnicodePropertyEscapesInRegExp */ 78 if (!has_wordsRe) { @@ -327,6 +327,8 @@ var Tasks = { optional = optional.filter(i => { return !i.includes("chrome:") && i !== "downloads.shelf" && i !== "contentSettings" }) + } else if (optional && minVer >= /* MinNoDownloadBubbleFlag */ 117) { + optional = optional.filter(i => i !== "downloads.shelf") } if (!getBuildItem("OnBrowserNativePages")) { optional = optional.filter(i => { return !i.includes("chrome:") }) @@ -526,7 +528,7 @@ gulp.task("locally", function(done) { compilerOptions = loadValidCompilerOptions("scripts/gulp.tsconfig.json"); createBuildConfigCache(); var old_has_polyfill = has_polyfill; - has_polyfill = getBuildItem("MinCVer") < 43 /* MinSafe$String$$StartsWith */; + has_polyfill = getBuildItem("MinCVer") < /* MinSafe$String$$StartsWith */ 43 if (has_polyfill != old_has_polyfill) { CompileTasks.front[0][1] = has_polyfill ? POLYFILL_FILE : "!" + POLYFILL_FILE; CompileTasks.lib.length = 1; diff --git a/pages/options.css b/pages/options.css index 173e6761b..6c678450b 100644 --- a/pages/options.css +++ b/pages/options.css @@ -510,8 +510,12 @@ label:active { padding-left: 22px; text-indent: -22px; } -.optional-permission:first-of-type:not(.single) { - margin-top: -4px; +#optionalPermissions.has-many { + position: relative; + top: -4px; +} +#optionalPermissionsHelp.has-many { + top: 0; } /* Ids and classes for rendering exclusionRules */ #exclusionRules { diff --git a/pages/options.html b/pages/options.html index a247f098d..b19fca0db 100644 --- a/pages/options.html +++ b/pages/options.html @@ -210,7 +210,7 @@ -
+
Check to enable some features on this computer.