diff --git a/changelog.md b/changelog.md index 20d4c76..ebacc7d 100644 --- a/changelog.md +++ b/changelog.md @@ -35,12 +35,20 @@ Edition: ORIZIN Agent HTML ## リリース -### [v5.0.142.9dev-Eagle] - 2021-03-07 +### [v5.0.142.9dev-Eagle] - 2021-03-08 #### 変更 - HTMLファイルに直書きとなっていたCSSとJavaScriptを別ファイルに切り出しました [#93](https://github.com/Robot-Inventor/ORIZIN-Agent-HTML/issues/93) +#### セキュリティー + +- プロトタイプ汚染脆弱性を修正しました [#96](https://github.com/Robot-Inventor/ORIZIN-Agent-HTML/issues/96) + +#### 修正 + +- リファクタリングを行いました + ### [v5.0.141.8-Eagle] - 2021-03-07 #### 追加 diff --git a/resource/information.txt b/resource/information.txt index d175ad2..c5b1ebf 100644 --- a/resource/information.txt +++ b/resource/information.txt @@ -2,4 +2,4 @@ Series Name:ORIZIN Agent Edition:ORIZIN Agent HTML Version:v5.0.142.9dev Code Name:Eagle -Date:2021-03-07 JST +Date:2021-03-08 JST diff --git a/resource/javascript/index.js b/resource/javascript/index.js index 8de8584..3dccf51 100644 --- a/resource/javascript/index.js +++ b/resource/javascript/index.js @@ -59,7 +59,7 @@ function add_chat(content, is_user = false, is_youtube = false) { } function chat_and_speak(chat_content, speak_content = "") { - if (arguments[1] === undefined) { + if (speak_content === undefined) { speak_content = chat_content; } add_chat(chat_content); @@ -132,7 +132,7 @@ async function read_setting() { } function listening_status(status = false) { - if (arguments[0] !== undefined) { + if (status !== undefined) { if (status) { document.getElementById("listening_message").style.opacity = 1; document.getElementById("start_recognition").classList.add("listening"); diff --git a/resource/javascript/timer.js b/resource/javascript/timer.js index 06b9b00..719f6b9 100644 --- a/resource/javascript/timer.js +++ b/resource/javascript/timer.js @@ -24,16 +24,16 @@ function update_time(time) { function timer_status() { if (is_stopped) { - return "stopped" + return "stopped"; } else { - return "started" + return "started"; } } function reset_status() { const result = is_reseted; is_reseted = false; - return result + return result; } function set_time() { @@ -41,11 +41,19 @@ function set_time() { } window.addEventListener("load", () => { - let settings = new Object; + let settings = {}; + settings.h = 0; + settings.m = 0; + settings.s = 0; + const pair = location.search.substring(1).split("&"); for (var i = 0; pair[i]; i++) { - var kv = pair[i].split("="); - settings[kv[0]] = kv[1]; + const kv = pair[i].split("="); + + const name = kv[0]; + const value = settings.hasOwnProperty(name) ? kv[1] : null; + + settings[name] = value; } hour = settings.h; minute = settings.m;