From 736c6ce2a98b969007648fe55ac8d294f24158eb Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 26 Oct 2019 15:10:01 +0800 Subject: [PATCH] innerHTML -> innerText --- libs/core.js | 6 +++--- libs/events.js | 2 +- libs/loader.js | 2 +- libs/utils.js | 3 ++- project/functions.js | 8 ++++---- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libs/core.js b/libs/core.js index 895b0834..0268bb5a 100644 --- a/libs/core.js +++ b/libs/core.js @@ -238,10 +238,10 @@ core.prototype._init_flags = function () { core.firstData = core.clone(core.data.firstData); this._init_sys_flags(); - core.dom.versionLabel.innerHTML = core.firstData.version; - core.dom.logoLabel.innerHTML = core.firstData.title; + core.dom.versionLabel.innerText = core.firstData.version; + core.dom.logoLabel.innerText = core.firstData.title; document.title = core.firstData.title + " - HTML5魔塔"; - document.getElementById("startLogo").innerHTML = core.firstData.title; + document.getElementById("startLogo").innerText = core.firstData.title; (core.firstData.shops||[]).forEach(function (t) { core.initStatus.shops[t.id] = t; }); // 初始化自动事件 for (var floorId in core.floors) { diff --git a/libs/events.js b/libs/events.js index d4425ff7..ae0c3467 100644 --- a/libs/events.js +++ b/libs/events.js @@ -539,7 +539,7 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback floorId = info.floorId; info.locked = core.status.lockControl; - core.dom.floorNameLabel.innerHTML = core.status.maps[floorId].title; + core.dom.floorNameLabel.innerText = core.status.maps[floorId].title; core.lockControl(); core.stopAutomaticRoute(); core.clearContinueAutomaticRoute(); diff --git a/libs/loader.js b/libs/loader.js index 74435cd6..489d9ea4 100644 --- a/libs/loader.js +++ b/libs/loader.js @@ -19,7 +19,7 @@ loader.prototype._setStartProgressVal = function (val) { ////// 设置加载进度条提示文字 ////// loader.prototype._setStartLoadTipText = function (text) { - core.dom.startTopLoadTips.innerHTML = text; + core.dom.startTopLoadTips.innerText = text; } loader.prototype._load = function (callback) { diff --git a/libs/utils.js b/libs/utils.js index fe9c93c0..8d07534e 100644 --- a/libs/utils.js +++ b/libs/utils.js @@ -641,7 +641,8 @@ utils.prototype.setStatusBarInnerHTML = function (name, value, css) { var length = this.strlen(value) || 1; style += 'font-size: ' + Math.min(1, 7 / length) + 'em; '; if (css) style += css; - core.statusBar[name].innerHTML = "" + value + ""; + core.statusBar[name].innerHTML = ""; + core.statusBar[name].children[0].innerText = value; } utils.prototype.strlen = function (str) { diff --git a/project/functions.js b/project/functions.js index eb865fb0..ee55d2f7 100644 --- a/project/functions.js +++ b/project/functions.js @@ -1052,9 +1052,9 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = // 设置魔力值 if (core.flags.enableMana) { // status:manamax 只有在非负时才生效。 - if (core.status.hero.manamax != null && core.status.hero.manamax >= 0) { - core.status.hero.mana = Math.min(core.status.hero.mana, core.status.hero.manamax); - core.setStatusBarInnerHTML('mana', core.status.hero.mana + "/" + core.status.hero.manamax); + if (core.status.hero.manamax != null && core.getRealStatus('manamax') >= 0) { + core.status.hero.mana = Math.min(core.status.hero.mana, core.getRealStatus('manamax')); + core.setStatusBarInnerHTML('mana', core.status.hero.mana + "/" + core.getRealStatus('manamax')); } else { core.setStatusBarInnerHTML("mana", core.status.hero.mana); @@ -1099,7 +1099,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = } // 难度 - core.statusBar.hard.innerHTML = core.status.hard; + core.statusBar.hard.innerText = core.status.hard; // 自定义状态栏绘制 core.drawStatusBar();