ma1 pushed to branch tor-browser-115.18.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
f703416b
by Gijs Kruitbosch at 2024-11-20T13:05:17+01:00
-
5e64483b
by Edgar Chen at 2024-11-22T17:14:16+01:00
-
36cabf84
by Marco Bonardo at 2024-11-22T20:11:33+01:00
6 changed files:
- toolkit/actors/SelectParent.sys.mjs
- toolkit/components/downloads/DownloadUIHelper.sys.mjs
- toolkit/components/reputationservice/ApplicationReputation.cpp
- toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp
- xpcom/io/nsLocalFileCommon.cpp
- xpcom/io/nsLocalFileCommon.h
Changes:
| ... | ... | @@ -278,6 +278,31 @@ export var SelectParentHelper = { |
| 278 | 278 | },
|
| 279 | 279 | |
| 280 | 280 | open(browser, menulist, rect, isOpenedViaTouch, selectParentActor) {
|
| 281 | + const canOpen = (() => {
|
|
| 282 | + if (!menulist.ownerDocument.hasFocus()) {
|
|
| 283 | + // Don't open in inactive browser windows.
|
|
| 284 | + return false;
|
|
| 285 | + }
|
|
| 286 | + if (browser) {
|
|
| 287 | + if (!browser.browsingContext.isActive) {
|
|
| 288 | + // Don't open in inactive tabs.
|
|
| 289 | + return false;
|
|
| 290 | + }
|
|
| 291 | + let tabbrowser = browser.getTabBrowser();
|
|
| 292 | + if (tabbrowser && tabbrowser.selectedBrowser != browser) {
|
|
| 293 | + // AsyncTabSwitcher might delay activating our browser, check
|
|
| 294 | + // explicitly for tabbrowser.
|
|
| 295 | + return false;
|
|
| 296 | + }
|
|
| 297 | + }
|
|
| 298 | + return true;
|
|
| 299 | + })();
|
|
| 300 | + |
|
| 301 | + if (!canOpen) {
|
|
| 302 | + selectParentActor.sendAsyncMessage("Forms:DismissedDropDown", {});
|
|
| 303 | + return;
|
|
| 304 | + }
|
|
| 305 | + |
|
| 281 | 306 | this._actor = selectParentActor;
|
| 282 | 307 | menulist.hidden = false;
|
| 283 | 308 | this._currentBrowser = browser;
|
| ... | ... | @@ -175,7 +175,10 @@ DownloadPrompter.prototype = { |
| 175 | 175 | "download-ui-file-executable-security-warning",
|
| 176 | 176 | { executable: PathUtils.filename(path) }
|
| 177 | 177 | );
|
| 178 | - return this._prompter.confirm(title, message);
|
|
| 178 | + let flags =
|
|
| 179 | + Ci.nsIPrompt.BUTTON_DELAY_ENABLE | Ci.nsIPrompt.STD_OK_CANCEL_BUTTONS;
|
|
| 180 | + let nulls = Array(4).fill(null);
|
|
| 181 | + return 0 == this._prompter.confirmEx(title, message, flags, ...nulls, {});
|
|
| 179 | 182 | },
|
| 180 | 183 | |
| 181 | 184 | /**
|
| ... | ... | @@ -291,6 +291,7 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = { |
| 291 | 291 | //".jse", exec // JScript
|
| 292 | 292 | ".ksh", // Linux shell
|
| 293 | 293 | //".lha",
|
| 294 | + //".library-ms", exec // Windows
|
|
| 294 | 295 | //".lnk", exec // Windows
|
| 295 | 296 | ".local", // Windows
|
| 296 | 297 | //".lpaq1",
|
| ... | ... | @@ -121,6 +121,7 @@ static const char* const kTestFileExtensions[] = { |
| 121 | 121 | ".js", // JavaScript script
|
| 122 | 122 | ".jse", // JScript
|
| 123 | 123 | ".ksh", // Linux shell
|
| 124 | + ".library-ms", // Windows Library Files
|
|
| 124 | 125 | ".lnk", // Windows
|
| 125 | 126 | ".local", // Windows
|
| 126 | 127 | ".mad", // MS Access
|
| ... | ... | @@ -72,6 +72,7 @@ const char* const sExecutableExts[] = { |
| 72 | 72 | #endif
|
| 73 | 73 | ".js",
|
| 74 | 74 | ".jse",
|
| 75 | + ".library-ms", // Windows Library Files
|
|
| 75 | 76 | ".lnk",
|
| 76 | 77 | ".mad", // Access Module Shortcut
|
| 77 | 78 | ".maf", // Access
|
| ... | ... | @@ -8,9 +8,9 @@ |
| 8 | 8 | #define _NS_LOCAL_FILE_COMMON_H_
|
| 9 | 9 | |
| 10 | 10 | #ifdef MOZ_ESR
|
| 11 | -extern const char* const sExecutableExts[108];
|
|
| 12 | -#else
|
|
| 13 | 11 | extern const char* const sExecutableExts[109];
|
| 12 | +#else
|
|
| 13 | +extern const char* const sExecutableExts[110];
|
|
| 14 | 14 | #endif
|
| 15 | 15 | |
| 16 | 16 | #endif |