From da0c773b02ecb079d9121a318544d157014169ad Mon Sep 17 00:00:00 2001 From: harveyshao Date: Tue, 15 Nov 2022 10:42:36 +0800 Subject: [PATCH] opt chat --- frame.js | 2 +- panel/action.js | 2 +- panel/footer.js | 3 ++- panel/header.js | 2 +- plugin/local/code/vimer.js | 7 +++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frame.js b/frame.js index c07d5cf8..1145f698 100644 --- a/frame.js +++ b/frame.js @@ -276,7 +276,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }), sub.onaction.close = function() { can.page.Remove(can, sub._target) } }, can._root._target) }, - figure: function(can, meta, target, cb) { if (meta.action == ice.AUTO || meta.type == html.BUTTON) { return } + figure: function(can, meta, target, cb) { if (meta.action == ice.AUTO || meta.type == html.BUTTON || meta.type == html.SELECT) { return } var input = meta.action||mdb.KEY, path = chat.PLUGIN_INPUT+input+nfs._JS; can.require([path], function(can) { function _cb(sub, value, old) { if (value == old) { return } can.base.isFunc(cb)? cb(sub, value, old): target.value = value||"", can.onmotion.delay(can, function() { can.onmotion.focus(can, target) }) } can.core.ItemCB(can.onfigure[input], function(key, on) { var last = target[key]||function(){}; target[key] = function(event) { diff --git a/panel/action.js b/panel/action.js index 993f9ab0..6d95767d 100644 --- a/panel/action.js +++ b/panel/action.js @@ -7,7 +7,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { can.onmotion.clear(can) }), can.onimport._tabs(can, sub, meta), skip || next() }) }, function() { can.onaction.layout(can, can.misc.SearchOrConf(can, html.LAYOUT), true) }) }, - _share: function(can, share) { share && can.run({}, [web.SHARE, share], function(msg) { + _share: function(can, share) { share && can.runAction({}, web.SHARE, [share], function(msg) { can.Mode(web.SHARE), msg.Length() > 1? can.onlayout._init(can): can.onengine.signal(can, chat.ONACTION_CMD) can.user.title(msg.SearchOrOption(chat.TITLE)), can.setHeader(chat.TOPIC, msg.SearchOrOption(chat.TOPIC)) can.Conf(chat.RIVER, web.SHARE, chat.STORM, share), can.onimport._init(can, msg) diff --git a/panel/footer.js b/panel/footer.js index 3747bc1d..cccef197 100644 --- a/panel/footer.js +++ b/panel/footer.js @@ -4,6 +4,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onimport._state(can, msg, target) can.onimport._toast(can, msg, target) can.onimport._command(can, msg, target) + can["cli"] = {} }, _title: function(can, msg, target) { can.user.isMobile || can.core.List(msg.result, function(item) { can.page.Append(can, target, [{view: [chat.TITLE, html.DIV, item], title: "联系站长"}]) }) }, _state: function(can, msg, target) { can.core.List(can.base.Obj(can.Conf(chat.STATE)||msg.Option(chat.STATE), [NTIP, NCMD, NLOG]).reverse(), function(item) { @@ -16,7 +17,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { case cli.CLOSE: can.cli && can.cli.close(); break case cli.CLEAR: can.cli && can.cli.close(); break default: - can.runAction(event, ice.RUN, can.core.Split(event.target.value, ice.SP), function(msg) { can.cli && can.cli.close(); var ui = can.onexport.float(can, msg, "cli") + can.runAction(event, ice.RUN, can.core.Split(event.target.value, ice.SP), function(msg) { can.cli && can.cli.close && can.cli.close(); var ui = can.onexport.float(can, msg, "cli") can.getActionSize(function(left) { can.page.style(can, ui._target, html.LEFT, left, html.RIGHT, "", html.BOTTOM, can.onexport.height(can)) }) }) } }}, "", target, [chat.TITLE, ice.CMD]) }, diff --git a/panel/header.js b/panel/header.js index 5e7c799d..362c7a8e 100644 --- a/panel/header.js +++ b/panel/header.js @@ -105,7 +105,7 @@ Volcanos(chat.ONACTION, { can.page.Select(can, can._output, can.core.Keys(html.DIV, aaa.USERNICK), function(item) { can.page.Modify(can, item, can.Conf(aaa.USERNICK, list[0])) }), can.user.toastSuccess(can) }) }) }, password: function(event, can) { var ui = can.user.input(event, can, [{name: html.PASSWORD, type: html.PASSWORD, action: ice.AUTO}, {name: html.PASSWORD, type: html.PASSWORD, action: ice.AUTO}], function(list) { - if (list[0] != list[1]) { return can.user.toast(can, "密码不一致"), ui.focus(), true } can.runAction(event, aaa.PASSWORD, [list[0]]) + if (list[0] != list[1]) { return can.user.toast(can, "密码不一致"), ui.focus(), true } can.runAction(event, aaa.PASSWORD, [list[0]], function() { can.user.toastSuccess(can) }) }) }, chinese: function(event, can) { can.runAction(event, aaa.LANGUAGE, ["zh"], function(msg) { can.user.reload() }) }, english: function(event, can) { can.runAction(event, aaa.LANGUAGE, ["en"], function(msg) { can.user.reload() }) }, diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 94208a44..1e5cf3b6 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -269,16 +269,15 @@ Volcanos(chat.ONACTION, { save: function(event, can, button) { can.request(event, {file: can.Option(nfs.FILE), content: can.onexport.content(can)}) can.onaction._run(event, can, button, [can.parse, can.Option(nfs.FILE), can.Option(nfs.PATH)], function() { can.user.toastSuccess(can, button) }) }, - compile: function(event, can, button) { - can.runAction(can.request(event, {_toast: "编译中..."}), button, [], function(msg) { + compile: function(event, can, button) { var _toast = can.user.toastProcess(can, "编译中...") + can.runAction(can.request(event), button, [], function(msg) { _toast.close() if (msg.Length() > 0 || msg.Result()) { return can.onimport.exts(can, "inner/search.js", function() { can.onmotion.delay(can, function() { can.ui.search._show(msg) }, 300) }) } - var toast = can.user.toastProcess(can, "重启中...") - can.onmotion.delay(can, function() { toast.close(), can.onaction[ice.SHOW]({}, can) }, 3000) + can.onmotion.delay(can, function() { toast.close(), can.user.toastSuccess(can) }, 3000) }) }, autogen: function(event, can, button) { can.onaction._runs(can.request(event, {path: "src/"}), can, button, function(msg) {