From ac78f738ffe20d7189e7de05f76cf76decd92905 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 23 May 2020 21:40:13 +0800 Subject: [PATCH] Fix bug --- _server/editor_blockly.js | 2 +- _server/table/data.comment.js | 6 +++--- libs/control.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index c7789296..9ab7f75b 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -613,7 +613,7 @@ Blockly.FieldColour.prototype.createWidget_ = function() { setTimeout(function () { document.getElementById("colorPicker").value = getValue(); // 设置位置 - openColorPicker(Blockly.WidgetDiv.DIV.style.left, Blockly.WidgetDiv.DIV.style.top, setValue); + openColorPicker(Blockly.WidgetDiv.DIV.style.left.replace(/[^\d.]/g, ''), Blockly.WidgetDiv.DIV.style.top.replace(/[^\d.]/g, ''), setValue); }); return document.createElement('table'); diff --git a/_server/table/data.comment.js b/_server/table/data.comment.js index 0cadf638..76256d83 100644 --- a/_server/table/data.comment.js +++ b/_server/table/data.comment.js @@ -23,7 +23,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { "_range": "editor.mode.checkImages(thiseval, './project/images/')", "_directory": "./project/images/", "_transform": (function (one) { - if (one.endsWith('.png') || one.endsWith('.jpg') || one.endsWith('.jpeg') || end.endsWith('.gif')) + if (one.endsWith('.png') || one.endsWith('.jpg') || one.endsWith('.jpeg') || one.endsWith('.gif')) return one; return null; }).toString(), @@ -71,7 +71,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { "_range": "editor.mode.checkUnique(thiseval)", "_directory": "./project/bgms/", "_transform": (function (one) { - if (one.endsWith('.mp3') || one.endsWith('.wmv') || one.endsWith('.ogg') || end.endsWith('.wav')) + if (one.endsWith('.mp3') || one.endsWith('.wmv') || one.endsWith('.ogg') || one.endsWith('.wav')) return one; return null; }).toString(), @@ -84,7 +84,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { "_range": "editor.mode.checkUnique(thiseval)", "_directory": "./project/sounds/", "_transform": (function (one) { - if (one.endsWith('.mp3') || one.endsWith('.wmv') || one.endsWith('.ogg') || end.endsWith('.wav')) + if (one.endsWith('.mp3') || one.endsWith('.wmv') || one.endsWith('.ogg') || one.endsWith('.wav')) return one; return null; }).toString(), diff --git a/libs/control.js b/libs/control.js index 448571c9..9ccbbfe3 100644 --- a/libs/control.js +++ b/libs/control.js @@ -2807,7 +2807,7 @@ control.prototype._resize_status = function (obj) { core.dom.statusLabels[i].style.marginLeft = 6 * core.domStyle.scale + "px"; } for (var i = 0; i < core.dom.statusTexts.length; ++i) { - core.dom.statusTexts[i].style.color = obj.globalAttribute.statusBarColor; + core.dom.statusTexts[i].style.color = core.arrayToRGBA(obj.globalAttribute.statusBarColor); } // keys if (core.flags.statusBarItems.indexOf('enableGreenKey')>=0) {