Merge branch 'master' into gh-pages

JannisX11 · Oct 24, 2024 · c87d6ab · c87d6ab
2 parents e33736c + afd621a
commit c87d6ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: focal
 
 language: node_js
 node:

diff --git a/js/file_system.js b/js/file_system.js
@@ -48,7 +48,7 @@ Object.assign(Blockbench, {
 			let isIOS =  ['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'].includes(navigator.platform) ||
 				(navigator.userAgent.includes("Mac") && "ontouchend" in document);
 
-			if (isIOS && options.extensions && options.extensions.length > 1) {
+			if ((isIOS || Blockbench.isTouch) && options.extensions && options.extensions.length > 1) {
 				let ext_options = {};
 				options.extensions.forEach(extension => {
 					ext_options[extension] = extension;