wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-04 06:48:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

[widget] Require user interaction when picking files or folders v2

Browse source 
Now with extra sauce to make it work cross-platform and cross-versions and
for HTML input elements only.
This commit is contained in:
Moonchild 2021-02-21 10:32:47 +00:00 • committed by roytam1
commit d867f26c0e
9 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
widget/windows/nsFilePicker.cpp
View file

@ -30,6 +30,7 @@
using mozilla::IsVistaOrLater;
using mozilla::IsWin8OrLater;
using mozilla::IsWin10OrLater;
using mozilla::MakeUnique;
using mozilla::mscom::EnsureMTA;
using mozilla::UniquePtr;
@ -194,11 +195,13 @@ nsFilePicker::~nsFilePicker()
NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker)
NS_IMETHODIMP nsFilePicker::Init(mozIDOMWindowProxy *aParent, const nsAString& aTitle, int16_t aMode)
NS_IMETHODIMP nsFilePicker::Init(mozIDOMWindowProxy *aParent, const nsAString& aTitle, int16_t aMode,
bool aRequireInteraction)
{
nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryInterface(aParent);
nsIDocShell* docShell = window ? window->GetDocShell() : nullptr;
mLoadContext = do_QueryInterface(docShell);
mRequireInteraction = aRequireInteraction;
return nsBaseFilePicker::Init(aParent, aTitle, aMode);
}
@ -603,6 +606,13 @@ nsFilePicker::ShowFolderPicker(const nsString& aInitialDir, bool &aWasInitError)
// options
FILEOPENDIALOGOPTIONS fos = FOS_PICKFOLDERS;
// Require interaction if the folder picker is triggered by an element that
// is potentially unsafe to use the default value in.
// Win 10+ only, because this dialog flag is broken in earlier versions.
if (IsWin10OrLater() && mRequireInteraction) {
fos |= FOS_OKBUTTONNEEDSINTERACTION;
}
dialog->SetOptions(fos);
// initial strings
@ -923,6 +933,13 @@ nsFilePicker::ShowFilePicker(const nsString& aInitialDir, bool &aWasInitError)
FILEOPENDIALOGOPTIONS fos = 0;
fos |= FOS_SHAREAWARE | FOS_OVERWRITEPROMPT |
FOS_FORCEFILESYSTEM;
// Require interaction if the file picker is triggered by an element that
// is potentially unsafe to use the default value in.
// Win 10+ only, because this dialog flag is broken in earlier versions.
if (IsWin10OrLater() && mRequireInteraction) {
fos |= FOS_OKBUTTONNEEDSINTERACTION;
}
// Handle add to recent docs settings
if (IsPrivacyModeEnabled() || !mAddToRecentDocs) {