From 7bf56b3a6fc0d888ca0c1d42df5f0b7bf3e0f4b7 Mon Sep 17 00:00:00 2001 From: oc Date: Fri, 1 Feb 2019 16:05:36 +0800 Subject: [PATCH] Fix insert Bug --- libs/events.js | 6 +++++- libs/loader.js | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/events.js b/libs/events.js index 2cf0da0d..6dd7c25b 100644 --- a/libs/events.js +++ b/libs/events.js @@ -915,7 +915,11 @@ events.prototype.doAction = function() { var toX=core.calValue(data.loc[0], prefix), toY=core.calValue(data.loc[1], prefix); var floorId = data.floorId || core.status.floorId; var event = core.floors[floorId].events[toX+","+toY]; - if (core.isset(event)) core.insertAction(event); + if (core.isset(event)) { + if (core.isset(event.data)) event = event.data; + if (typeof event == 'string' || event instanceof Array || core.isset(event.type)) + core.insertAction(event); + } this.doAction(); break; } diff --git a/libs/loader.js b/libs/loader.js index 597c30d9..3b3f6942 100644 --- a/libs/loader.js +++ b/libs/loader.js @@ -88,8 +88,6 @@ loader.prototype.loadIcons = function () { core.statusBar.image[key].src = core.statusBar.icons[key].src; } } - core.statusBar.image.keyboard.src = - core.platform.extendKeyboard ? core.statusBar.icons.keyboard.src : core.statusBar.icons.shop.src; }); }