diff --git a/web/js-src/plugin-polyfill.js b/web/js-src/plugin-polyfill.js index d215d78e7..da2397085 100644 --- a/web/js-src/plugin-polyfill.js +++ b/web/js-src/plugin-polyfill.js @@ -131,6 +131,8 @@ class RufflePluginArray { export const FLASH_PLUGIN = new RufflePlugin("Shockwave Flash", "Shockwave Flash 32.0 r0", "ruffle.js", [ new RuffleMimeType("application/futuresplash", "Shockwave Flash", "spl"), new RuffleMimeType("application/x-shockwave-flash", "Shockwave Flash", "swf"), + new RuffleMimeType("application/x-shockwave-flash2-preview", "Shockwave Flash", "swf"), + new RuffleMimeType("application/vnd.adobe.flash-movie", "Shockwave Flash", "swf") ]); /** @@ -161,4 +163,4 @@ export function install_plugin(plugin) { for (var i = 0; i < plugin.length; i += 1) { navigator.mimeTypes.install(plugin[i]); } -} \ No newline at end of file +} diff --git a/web/js-src/ruffle-embed.js b/web/js-src/ruffle-embed.js index e5100a471..2dd446f82 100644 --- a/web/js-src/ruffle-embed.js +++ b/web/js-src/ruffle-embed.js @@ -1,4 +1,4 @@ -import { FLASH_MIMETYPE, FUTURESPLASH_MIMETYPE, is_swf_filename, RufflePlayer } from "./ruffle-player.js"; +import { FLASH_MIMETYPE, FUTURESPLASH_MIMETYPE, FLASH7_AND_8_MIMETYPE, FLASH_MOVIE_MIMETYPE, is_swf_filename, RufflePlayer } from "./ruffle-player.js"; import { register_element } from "./register-element"; export default class RuffleEmbed extends RufflePlayer { @@ -34,7 +34,7 @@ export default class RuffleEmbed extends RufflePlayer { } static is_interdictable(elem) { - if (elem.type === FLASH_MIMETYPE || elem.type === FUTURESPLASH_MIMETYPE) { + if (elem.type === FLASH_MIMETYPE || elem.type === FUTURESPLASH_MIMETYPE || elem.type == FLASH7_AND_8_MIMETYPE || elem.type == FLASH_MOVIE_MIMETYPE) { return true; } else if (elem.type === undefined || elem.type === "") { return is_swf_filename(elem.src); @@ -50,4 +50,4 @@ export default class RuffleEmbed extends RufflePlayer { return ruffle_obj; } -} \ No newline at end of file +} diff --git a/web/js-src/ruffle-object.js b/web/js-src/ruffle-object.js index bae947874..2f276d6eb 100644 --- a/web/js-src/ruffle-object.js +++ b/web/js-src/ruffle-object.js @@ -1,4 +1,4 @@ -import { FLASH_MIMETYPE, FUTURESPLASH_MIMETYPE, FLASH_ACTIVEX_CLASSID, is_swf_filename, RufflePlayer } from "./ruffle-player.js"; +import { FLASH_MIMETYPE, FUTURESPLASH_MIMETYPE, FLASH7_AND_8_MIMETYPE, FLASH_MOVIE_MIMETYPE, FLASH_ACTIVEX_CLASSID, is_swf_filename, RufflePlayer } from "./ruffle-player.js"; import { register_element } from "./register-element"; export default class RuffleObject extends RufflePlayer { @@ -28,7 +28,7 @@ export default class RuffleObject extends RufflePlayer { } static is_interdictable(elem) { - if (elem.type === FLASH_MIMETYPE || elem.type === FUTURESPLASH_MIMETYPE) { + if (elem.type === FLASH_MIMETYPE || elem.type === FUTURESPLASH_MIMETYPE || elem.type == FLASH7_AND_8_MIMETYPE || elem.type == FLASH_MOVIE_MIMETYPE) { return true; } else if (elem.attributes && elem.attributes.classid && elem.attributes.classid.value === FLASH_ACTIVEX_CLASSID) { return true; @@ -61,4 +61,4 @@ export default class RuffleObject extends RufflePlayer { return ruffle_obj; } -} \ No newline at end of file +} diff --git a/web/js-src/ruffle-player.js b/web/js-src/ruffle-player.js index fe41166bc..cd4e9c9c0 100644 --- a/web/js-src/ruffle-player.js +++ b/web/js-src/ruffle-player.js @@ -4,6 +4,8 @@ import { lookup_element } from "./register-element"; export let FLASH_MIMETYPE = "application/x-shockwave-flash"; export let FUTURESPLASH_MIMETYPE = "application/futuresplash"; +export let FLASH7_AND_8_MIMETYPE = "application/x-shockwave-flash2-preview"; +export let FLASH_MOVIE_MIMETYPE = "application/vnd.adobe.flash-movie"; export let FLASH_ACTIVEX_CLASSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"; const DIMENSION_REGEX = /^\s*(\d+(\.\d+)?(%)?)/;