From 619e35c71a18718948b063118d6a6eabb37e1394 Mon Sep 17 00:00:00 2001 From: shylinux Date: Sat, 22 Jul 2023 10:57:10 +0800 Subject: [PATCH] opt some --- panel/action.js | 8 ++------ panel/river.js | 2 +- plugin/state.js | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/panel/action.js b/panel/action.js index bfbbafcb..0857257b 100644 --- a/panel/action.js +++ b/panel/action.js @@ -42,9 +42,7 @@ Volcanos(chat.ONACTION, {_init: function(can, target) { }); if (!can.Conf(chat.TOOL) && !can.user.mod.isCmd) { return } can._names = location.pathname can.Conf(chat.TOOL)? can.onappend.layout(can, can.core.List(can.Conf(chat.TOOL), function(item, index, list) { item.type = chat.PLUGIN if (list.length == 1) { - if (!can.base.isIn(item.index, web.CHAT_MACOS_DESKTOP)) { - can.user.title(item.index) - } + can.base.isIn(item.index, web.CHAT_MACOS_DESKTOP) || can.user.title(item.index) can.onaction._onaction_cmd(can), item.mode = chat.CMD, item.opts = can.misc.Search(can) } return item }), FLOW).layout(window.innerHeight, window.innerWidth): can.runAction(can.request(), ctx.COMMAND, [], function(msg) { @@ -55,9 +53,7 @@ Volcanos(chat.ONACTION, {_init: function(can, target) { if (can.onmotion.cache(can, function(cache, old) { old && (cache[old] = can._plugins) var key = can.core.Keys(can.Conf(chat.RIVER, river), can.Conf(chat.STORM, storm)); return can._plugins = cache[key]||[], key }, can._output, can._action, can._header_tabs)) { - if (msg.Option("refresh") != "true") { - return can.onaction.layout(can) - } + if (msg.Option("refresh") != "true") { return can.onaction.layout(can) } } can.run({}, [river, storm], function(msg) { if (msg.Length() == 0) { return can.user.isLocalFile? can.user.toastFailure(can, "miss data"): can.onengine.signal(can, chat.ONACTION_NOTOOL, can.request({}, {river: river, storm: storm})) } diff --git a/panel/river.js b/panel/river.js index e02b4087..65c880b4 100644 --- a/panel/river.js +++ b/panel/river.js @@ -44,7 +44,7 @@ Volcanos(chat.ONACTION, {list: [mdb.CREATE, web.SHARE, web.REFRESH], _init: func if (msg.Length() == 0) { return can.user.isLocalFile? can.user.toastFailure(can, "miss data"): can.onengine.signal(can, chat.ONACTION_NOSTORM, can.request({}, {river: river})) } var select = 0; list = can.page.Append(can, can._output, [{view: html.LIST, list: msg.Table(function(item, index) { return river == can._main_river && item.hash == can._main_storm && (select = index), can.onimport._storm(can, item, river) - }) }])._target, can.ui.sublist[river] = list, list.children.length > 0 && list.children[select].click(), next && can._output.insertBefore(list, next) + }) }])._target, next && can._output.insertBefore(list, next), can.ui.sublist[river] = list, list.children.length > 0 && list.children[select].click() }) }, action: function(event, can, river, storm) { diff --git a/plugin/state.js b/plugin/state.js index ab5ac5bd..43005576 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -200,7 +200,7 @@ Volcanos(chat.ONEXPORT, { statusHeight: function(can) { return can.page.ClassList.has(can, can._target, html.OUTPUT) || !can.page.isDisplay(can._status) || can._status.innerHTML == "" || (can._target.offsetHeight > 0 && can._status.offsetHeight == 0)? 0: html.ACTION_HEIGHT }, title: function(can, title) { can.isCmdMode() && can.user.title(title) }, link: function(can) { var meta = can.Conf(), args = can.Option(); can.misc.Search(can, log.DEBUG) == ice.TRUE && (args[log.DEBUG] = ice.TRUE) - args.pod = meta.pod, args.cmd = meta.index||can.core.Keys(meta.ctx, meta.cmd) + args.pod = meta.space||meta.pod, args.cmd = meta.index||can.core.Keys(meta.ctx, meta.cmd) return can.misc.MergePodCmd(can, args, true) }, })