Skip to content

A platform for community discussion. Free, open, simple.

DEV: Remove IE-related code, remove isAppleDevice helper (#39008)

Jarek Radosz3e4db41d6614
diff --git a/frontend/discourse/app/lib/uploads.js b/frontend/discourse/app/lib/uploads.js
index a49005f6a8f..052c530aeed 100644
--- a/frontend/discourse/app/lib/uploads.js
+++ b/frontend/discourse/app/lib/uploads.js
@@ -1,7 +1,7 @@
import deprecated from "discourse/lib/deprecated";
import { getOwnerWithFallback } from "discourse/lib/get-owner";
import { humanizeList } from "discourse/lib/text";
-import { isAppleDevice } from "discourse/lib/utilities";
+import { capabilities } from "discourse/services/capabilities";
import I18n, { i18n } from "discourse-i18n";
function isGUID(value) {
@@ -32,16 +32,6 @@ export const dialog = {
},
};
-export function markdownNameFromFileName(fileName) {
- let name = fileName.slice(0, fileName.lastIndexOf("."));
-
- if (isAppleDevice() && isGUID(name)) {
- name = i18n("upload_selector.default_image_alt_text");
- }
-
- return name.replace(/\[|\]|\|/g, "");
-}
-
export function validateUploadedFiles(files, opts) {
if (!files || files.length === 0) {
return false;
@@ -287,6 +277,16 @@ export function uploadIcon(staff, siteSettings) {
return allowsAttachments(staff, siteSettings) ? "upload" : "far-image";
}
+function markdownNameFromFileName(fileName) {
+ let name = fileName.slice(0, fileName.lastIndexOf("."));
+
+ if (capabilities.isIOS && isGUID(name)) {
+ name = i18n("upload_selector.default_image_alt_text");
+ }
+
+ return name.replace(/\[|\]|\|/g, "");
+}
+
function imageMarkdown(upload) {
return `![${markdownNameFromFileName(upload.original_filename)}|${
upload.thumbnail_width
diff --git a/frontend/discourse/app/lib/uppy-checksum-plugin.js b/frontend/discourse/app/lib/uppy-checksum-plugin.js
index f3fad38f758..11d0278cf81 100644
--- a/frontend/discourse/app/lib/uppy-checksum-plugin.js
+++ b/frontend/discourse/app/lib/uppy-checksum-plugin.js
@@ -18,12 +18,6 @@ export default class UppyChecksum extends UploadPreProcessorPlugin {
);
return false;
}
- if (this.capabilities.isIE11) {
- this._consoleWarn(
- "The required cipher suite is unavailable in Internet Explorer 11."
- );
- return false;
- }
if (!Blob.prototype.arrayBuffer) {
this._consoleWarn(
"The required File API is unavailable in this browser."
diff --git a/frontend/discourse/app/lib/utilities.js b/frontend/discourse/app/lib/utilities.js
index 9fe5138415c..091e66fdf8b 100644
--- a/frontend/discourse/app/lib/utilities.js
+++ b/frontend/discourse/app/lib/utilities.js
@@ -272,13 +272,6 @@ export function determinePostReplaceSelection({
}
}
-export function isAppleDevice() {
- // IE has no DOMNodeInserted so can not get this hack despite saying it is like iPhone
- // This will apply hack on all iDevices
- let caps = capabilities;
- return caps.isIOS && !window.navigator.userAgent.match(/Trident/g);
-}
-
export function safariHacksDisabled() {
deprecated(
"`safariHacksDisabled()` is deprecated, it now always returns `false`",
diff --git a/frontend/discourse/tests/unit/lib/uppy-checksum-plugin-test.js b/frontend/discourse/tests/unit/lib/uppy-checksum-plugin-test.js
index 4ccd0e0ad22..82790c79384 100644
--- a/frontend/discourse/tests/unit/lib/uppy-checksum-plugin-test.js
+++ b/frontend/discourse/tests/unit/lib/uppy-checksum-plugin-test.js
@@ -110,25 +110,6 @@ module("Unit | Utility | UppyChecksum Plugin", function (hooks) {
}
);
- test("it does nothing if the browser is IE11", function (assert) {
- const capabilities = { isIE11: true };
- const fakeUppy = new FakeUppy();
- const plugin = new UppyChecksum(fakeUppy, {
- capabilities,
- });
- plugin.install();
-
- const fileId =
- "uppy-test/file/vv2/xvejg5w/blah/png-1d-1d-2v-1d-1e-image/jpeg-9043429-1624921727764";
- return plugin.uppy.preprocessors[0]([fileId]).then(() => {
- assert.strictEqual(
- plugin.uppy.emitted.length,
- 1,
- "only the complete event was fired by the checksum plugin because it skipped the file"
- );
- });
- });
-
withCrypto("it does nothing if the file is > 100MB", function (assert) {
const capabilities = {};
const fakeUppy = new FakeUppy();