From 0f9954a976d9178d853ba2420296715413b3da79 Mon Sep 17 00:00:00 2001 From: Michael Green <84688932+michael-j-green@users.noreply.github.com> Date: Sun, 13 Jul 2025 12:32:41 +1000 Subject: [PATCH] Fix for context menu (#1045) * Fix for context menu * Formatting fix * Refined EJS_browserMode * Moved browserMode from loader.js into emulator.js * Revert loader.js to original * Change single quotes to double quotes * Removal of EJS_browserMode from emulator.js * Show desktop mode messages only if debug is true. * Block changes to all but the visible property of the contextMenu --- data/loader.js | 1 + data/src/emulator.js | 37 ++++++++++++++++++++++++++++++------- index.html | 18 +++++++++++++----- 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/data/loader.js b/data/loader.js index 3ea69f2..62d2281 100644 --- a/data/loader.js +++ b/data/loader.js @@ -122,6 +122,7 @@ config.noAutoFocus = window.EJS_noAutoFocus; config.videoRotation = window.EJS_videoRotation; config.hideSettings = window.EJS_hideSettings; + config.browserMode = window.EJS_browserMode; config.shaders = Object.assign({}, window.EJS_SHADERS, window.EJS_shaders ? window.EJS_shaders : {}); let systemLang; diff --git a/data/src/emulator.js b/data/src/emulator.js index 60156b4..9266893 100644 --- a/data/src/emulator.js +++ b/data/src/emulator.js @@ -209,6 +209,22 @@ class EmulatorJS { this.config = config; this.config.buttonOpts = this.buildButtonOptions(this.config.buttonOpts); this.config.settingsLanguage = window.EJS_settingsLanguage || false; + switch (this.config.browserMode) { + case 1: // Force mobile + case "1": + case "mobile": + if (this.debug) { console.log("Force mobile mode is enabled"); } + this.config.browserMode = 1; + break; + case 2: // Force desktop + case "2": + case "desktop": + if (this.debug) { console.log("Force desktop mode is enabled"); } + this.config.browserMode = 2; + break; + default: // Auto detect + config.browserMode = undefined; + } this.currentPopup = null; this.isFastForward = false; this.isSlowMotion = false; @@ -230,7 +246,15 @@ class EmulatorJS { this.config.adSize = (Array.isArray(this.config.adSize)) ? this.config.adSize : ["300px", "250px"]; this.setupAds(this.config.adUrl, this.config.adSize[0], this.config.adSize[1]); } - this.isMobile = (function() { + this.isMobile = (() => { + // browserMode can be either a 1 (force mobile), 2 (force desktop) or undefined (auto detect) + switch (this.config.browserMode) { + case 1: + return true; + case 2: + return false; + } + let check = false; (function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true; })(navigator.userAgent || navigator.vendor || window.opera); return check; @@ -1341,10 +1365,6 @@ class EmulatorJS { searchKey = this.defaultButtonAliases[key]; } - // prevent the contextMenu button from being overridden - if (searchKey === "contextMenu") - continue; - // Check if the button exists in the default buttons, and update its properties // If the button does not exist, create a custom button if (!mergedButtonOptions[searchKey]) { @@ -1370,7 +1390,10 @@ class EmulatorJS { } else if (typeof buttonUserOpts[searchKey] === "object") { // If the value is an object, merge it with the default button properties - if (this.defaultButtonOptions[searchKey]) { + // if the button is the contextMenu, only allow the visible property to be set + if (searchKey === "contextMenu") { + mergedButtonOptions[searchKey].visible = buttonUserOpts[searchKey].visible !== undefined ? buttonUserOpts[searchKey].visible : true; + } else if (this.defaultButtonOptions[searchKey]) { // copy properties from the button definition if they aren't null for (const prop in buttonUserOpts[searchKey]) { if (buttonUserOpts[searchKey][prop] !== null) { @@ -2288,7 +2311,7 @@ class EmulatorJS { pauseButton.style.display = "none"; playButton.style.display = "none"; } - if (this.config.buttonOpts.contextMenuButton === false && this.config.buttonOpts.rightClick !== false && this.isMobile === false) contextMenuButton.style.display = "none" + if (this.config.buttonOpts.contextMenu.visible === false && this.config.buttonOpts.rightClick !== false && this.isMobile === false) contextMenuButton.style.display = "none" if (this.config.buttonOpts.restart.visible === false) restartButton.style.display = "none" if (this.config.buttonOpts.settings.visible === false) settingButton[0].style.display = "none" if (this.config.buttonOpts.fullscreen.visible === false) { diff --git a/index.html b/index.html index ea464fe..93a3e05 100644 --- a/index.html +++ b/index.html @@ -111,16 +111,17 @@