From e3b7233b20f8504024a3c4a3d00b7ae11fe4180b Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 11 May 2019 23:36:58 -0400 Subject: [PATCH] remove emoji strings replaced with html entities/creation from unicode code-point where applicable my editor doesn't render emoji --- .gitignore | 1 + Js/Audio.js | 3 +-- Js/Main.js | 16 +++++++++++----- Player.html | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7d9fd68..7e1b2e5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ web.config /Dist /Css/main.min.css /Js/XduPlayer.min.js +/**/.*.swp diff --git a/Js/Audio.js b/Js/Audio.js index 8a6c748..bb1c33b 100644 --- a/Js/Audio.js +++ b/Js/Audio.js @@ -1,5 +1,4 @@ //(Math.exp(x)-1)/(Math.E-1) -//🔊 class bufferLoader { constructor(context, soundMap, callback) { @@ -182,4 +181,4 @@ class audioController { } this.sources = {}; } -} \ No newline at end of file +} diff --git a/Js/Main.js b/Js/Main.js index 805e612..bcd45b2 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -29,6 +29,12 @@ let volume = 0.5; let fullScreen = false; let prevMission = '{Select}'; +const emoji = { + LoudSound: String.fromCodePoint(0x1f50a), + Mute: String.fromCodePoint(0x1f507), + HeavyPlusSign: String.fromCodePoint(0x2795) +}; + function onBodyLoaded() { bodyLoaded = true; document.getElementById("title-tag").innerText = version; @@ -95,9 +101,9 @@ function loadLocalStorage() { audio.mute(isMuted); } if(isMuted) { - document.getElementById('mute-button').innerText = "🔇"; + document.getElementById('mute-button').innerText = emoji.Mute; } else { - document.getElementById('mute-button').innerText = "🔊"; + document.getElementById('mute-button').innerText = emoji.LoudSound; } //language let lang = urlParams['lang'] || localStorage.getItem('language') || "eng"; @@ -433,9 +439,9 @@ function toggleMute(event) { } localStorage.setItem('ismuted', isMuted); if(isMuted) { - document.getElementById('mute-button').innerText = "🔇"; + document.getElementById('mute-button').innerText = emoji.Mute; } else { - document.getElementById('mute-button').innerText = "🔊"; + document.getElementById('mute-button').innerText = emoji.LoudSound; } } @@ -474,7 +480,7 @@ function onFullScreenChange(event) { } else { document.getElementById('other-controls-container').style.cssText = ""; document.getElementById('title-container').style.cssText = ""; - document.getElementById('fullscreen-button').innerText = "➕"; + document.getElementById('fullscreen-button').innerText = emoji.HeavyPlusSign; } onWindowResize(event, 0); } diff --git a/Player.html b/Player.html index 0e2bcb9..7561fb8 100644 --- a/Player.html +++ b/Player.html @@ -26,7 +26,7 @@
Now Playing: None
- 🔊 + 🔊
@@ -37,7 +37,7 @@ The canvas then resizes as the canvas does and the text-container uses transform scale based off this resolution -->
-
âž•
+