From fdd78486162b99fbe4a374ef169379e3bc06d8a0 Mon Sep 17 00:00:00 2001 From: shylinux Date: Tue, 16 May 2023 09:23:12 +0800 Subject: [PATCH] opt some --- frame.js | 2 +- lib/misc.js | 2 +- plugin/local/wiki/word.js | 2 +- plugin/state.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frame.js b/frame.js index ce14977b..df34a703 100644 --- a/frame.js +++ b/frame.js @@ -682,7 +682,7 @@ Volcanos(chat.ONMOTION, {_init: function(can, target) { if (can.page.tagis(event.target, html.INPUT)) { return } can.onkeymap.prevent(event) } - target.onmousedown = function(event) { + target.onmousedown = function(event) { if (event.which != 1) { return } for (var _target = event.target; _target; _target = _target.parentNode) { if (_target == target) { break } if (can.page.tagis(_target, html.INPUT, html.TEXTAREA, html.TR)) { return } if (can.page.ClassList.has(can, _target, html.ITEM)) { return } diff --git a/lib/misc.js b/lib/misc.js index 5f65a105..286cf3cc 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -124,7 +124,7 @@ Volcanos("misc", { var _location = location; if (can.user.isExtension) { var _location = new URL(Volcanos.meta.iceberg) } return can.base.MergeURL(_location.origin+(args.length == 1? path: nfs.PS+args.join(nfs.PS))+(clear? "": _location.search), obj)+(hash? "#"+hash: "") }, - ParseURL: function(can, url) { var args = can.base.ParseURL(url), _location = new URL(url) + ParseURL: function(can, url) { url = url||location.href; var args = can.base.ParseURL(url), _location = new URL(url) delete(args.link), delete(args.origin), delete(args._origin) var ls = can.core.Split(_location.pathname, nfs.PS); if (ls[0] == chat.SHARE) { args[chat.SHARE] = ls[1] } for (var i = 1; i < ls.length; i += 2) { if (can.base.isIn(ls[i], [ice.POD, ice.CMD, web.WEBSITE])) { args[ls[i]] = ls[i+1] } } diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 4e3cc404..3070c183 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -52,7 +52,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( can.page.style(can, target, html.MAX_WIDTH, can.ConfWidth(), html.OVERFLOW, ice.AUTO) if (!meta.fg && !meta.bg) { target.className.baseVal = "story auto" } target.onclick = function(event) { can.misc.Event(event, can, function(msg) { - meta.index && can.onappend._float(can, meta.index, [event.target.innerHTML]) + meta.index && can.onappend._float(can, meta.index, can.base.Obj(meta.args, []).concat([event.target.innerHTML])) }) } target.oncontextmenu = function(event) { can.misc.Event(event, can, function(msg) { var ui = can.user.carte(event, can, kit.Dict(mdb.EXPORT, function(event, can, button) { diff --git a/plugin/state.js b/plugin/state.js index 97ef78a3..f6a49401 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -203,7 +203,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.cmd == web.WIKI_WORD && (args.cmd = args.path) + args.pod = meta.pod, args.cmd = meta.index||can.core.Keys(meta.ctx, meta.cmd) return can.misc.MergePodCmd(can, args, true) }, })