corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge mozilla-inbound to mozilla-central a=merge

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2016-07-21 16:24:36 +02:00
parent ba27247b23 49865a8de6
commit 9265f02f72
653 changed files with 10390 additions and 7474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dom/html/HTMLInputElement.cpp
View File

@@ -7838,15 +7838,15 @@ HTMLInputElement::SetFilePickerFiltersFromAccept(nsIFilePicker* filePicker)
// First, check for image/audio/video filters...
if (token.EqualsLiteral("image/*")) {
filterMask = nsIFilePicker::filterImages;
filterBundle->GetStringFromName(MOZ_UTF16("imageFilter"),
filterBundle->GetStringFromName(u"imageFilter",
getter_Copies(extensionListStr));
} else if (token.EqualsLiteral("audio/*")) {
filterMask = nsIFilePicker::filterAudio;
filterBundle->GetStringFromName(MOZ_UTF16("audioFilter"),
filterBundle->GetStringFromName(u"audioFilter",
getter_Copies(extensionListStr));
} else if (token.EqualsLiteral("video/*")) {
filterMask = nsIFilePicker::filterVideo;
filterBundle->GetStringFromName(MOZ_UTF16("videoFilter"),
filterBundle->GetStringFromName(u"videoFilter",
getter_Copies(extensionListStr));
} else if (token.First() == '.') {
if (token.Contains(';') || token.Contains('*')) {