From 56d7ecc7ad33bc966b0bd79e0d0f71d0bbfd047c Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 23 Oct 2023 22:30:29 +0800 Subject: [PATCH] add some --- lib/user.js | 7 ++++--- plugin/state.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/user.js b/lib/user.js index 84fa11e9..d46a0323 100644 --- a/lib/user.js +++ b/lib/user.js @@ -41,12 +41,13 @@ Volcanos("user", { reload: function(force) { (force || confirm("重新加载页面？")) && location.reload() }, jumps: function(url) { location.href = url }, opens: function(url) { + if (window.parent && window.parent.openurl) { return window.parent.openurl(url) } + window.openurl? window.openurl(url): this.open(url) + }, + open: function(url) { if (location.search.indexOf("debug=true") > 0 && url.indexOf("debug=true") == -1) { var ls = url.split("#"); ls[0] += (ls[0].indexOf("?") > 0? "&": "?") + "debug=true", url = ls.join("#") } - window.openurl? window.openurl(url): window.parent && window.parent.openurl? window.parent.openurl(url): this.open(url) - }, - open: function(url) { if (window.open(url)) { return } this.isMobile? location.href = url: null }, diff --git a/plugin/state.js b/plugin/state.js index cd1b2412..8736aca3 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -92,7 +92,7 @@ Volcanos(chat.ONACTION, {list: [ }) }, "远程控制": function(event, can) { can.onaction.keyboard(event, can) }, "共享工具": function(event, can) { var meta = can.Conf(); can.onmotion.share(event, can, [], [mdb.NAME, meta.index, mdb.TEXT, JSON.stringify(can.Input())]) }, - "打开链接": function(event, can) { can.user.opens(can.onexport.link(can)) }, + "打开链接": function(event, can) { can.user.open(can.onexport.link(can)) }, "生成链接": function(event, can) { can.onmotion.share(event, can, [], [mdb.LINK, can.user.copy(event, can, can.onexport.link(can))]) }, "生成脚本": function(event, can) { var args = can.Input().join(lex.SP), list = [ "export ctx_dev="+location.origin+"; ctx_temp=$(mktemp); curl -o $ctx_temp -fsSL $ctx_dev;"+" source $ctx_temp cmd "+(can.Conf(ctx.INDEX))+lex.SP+args,