From ca1818a1015bf4dd8402423fcc529ec9f9aeddbf Mon Sep 17 00:00:00 2001 From: shy Date: Sat, 9 Dec 2023 10:33:06 +0800 Subject: [PATCH] add some --- frame.js | 5 ++++- index.css | 2 +- lib/misc.js | 8 +++----- lib/page.js | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/frame.js b/frame.js index 71aeaed6..13d1e744 100644 --- a/frame.js +++ b/frame.js @@ -70,7 +70,9 @@ Volcanos(chat.ONDAEMON, {_init: function(can, name) { if (can.user.isLocalFile) }) }, _list: [""], pwd: function(can, arg) { can._wss_name = can.ondaemon._list[0] = arg[0] }, close: function(can, msg, sub) { can.user.close() }, exit: function(can, msg, sub) { can.user.close() }, - toast: function(can, sub, arg) { can.core.CallFunc(can.user.toast, [sub].concat(arg)) }, + toast: function(can, sub, arg, cb) { + can.core.CallFunc(can.user.toast, [sub].concat(arg)) + }, grow: function(can, msg, sub, arg) { if (sub._fields && sub.sup && sub.sup.onimport._grow) { return sub.sup.onimport._grow(sub.sup, msg, arg.join("")) } if (!sub._fields && sub && sub.onimport._grow) { return sub.onimport._grow(sub, msg, arg.join("")) } @@ -156,6 +158,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { prev: {name: mdb.PREV, cb: function(event) { var sub = can.sub; sub.onaction && sub.onaction.prev? sub.onaction.prev(event, sub): can.onaction.prev(event, can) }}, next: {name: mdb.NEXT, cb: function(event) { var sub = can.sub; sub.onaction && sub.onaction.next? sub.onaction.next(event, sub): can.onaction.next(event, can) }}, play: {name: web.PLAY}, + favor: {name: "favor"}, }[item.name||""]; if (!icon) { return } item.style = "icons" can.page.Append(can, option, [{view: [[html.ITEM, html.ICON, icon.name, item.name], html.DIV, can.page.unicode[icon.name]], title: can.user.trans(can, item.name), onclick: icon.cb||function(event) { var msg = can.request(event), cmds = [ctx.ACTION, item.name]; msg.RunAction(event, can.sub, cmds) || msg.RunAction(event, can, cmds) || can.Update(event, cmds) diff --git a/index.css b/index.css index 2d7aa29a..9759b87e 100644 --- a/index.css +++ b/index.css @@ -133,7 +133,7 @@ body>div.toast div.title { word-break:break-all; color:var(--notice-bg-color); f body>div.toast div.delete { color:var(--notice-bg-color); float:right; cursor:pointer; } body>div.toast div.delete:hover { background-color:var(--hover-bg-color); } body>div.toast div.duration { color:var(--disable-fg-color); float:right; } -body>div.toast div.content { color:var(--notice-bg-color); text-align:center; min-height:48px; } +body>div.toast div.content { color:var(--notice-bg-color); text-align:center; min-height:48px; margin-bottom:5px; } body>div.toast div.progress { border:var(--box-notice); margin-left:0px; height:20px; clear:both; } body>div.toast div.progress div.current { background-color:var(--progress-bg-color); height:18px; } body>div.toast div.action:not(.hide) { width:100%; display:block; } diff --git a/lib/misc.js b/lib/misc.js index 30c980b5..7b3a28ba 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -117,11 +117,9 @@ Volcanos("misc", { } try { xhr.send(data) } catch(e) { can.misc.Warn(e), cbs && cbs(e) } }, WSS: function(can, args, cb, onopen, onclose, onerror, _msg) { if (can.user.isIE) { return } - var msg = can.request(); can.page.exportValue(can, msg) - can.core.List(msg.Option(), function(value) { args[value] = msg.Option(value) }) - var url = location.protocol.replace(ice.HTTP, "ws")+"//"+location.host+"/space/" - if (url.indexOf(html.CHROME) == 0) { url = "ws://localhost:9020/space/" } args.text = location.pathname+location.search, args.module = "shylinux.com/x/volcanos", args.version = can.base.trimPrefix(window._version, "?_v=") + var msg = can.request(); can.page.exportValue(can, msg), can.core.List(msg.Option(), function(value) { args[value] = msg.Option(value) }) + var url = location.protocol.replace(ice.HTTP, "ws")+"//"+location.host+"/space/"; if (url.indexOf(html.CHROME) == 0) { url = "ws://localhost:9020/space/" } try { var socket = new WebSocket(can.base.MergeURL(url, args)); _msg = _msg || can.request()._caller() } catch {} can._socket = socket, socket.onclose = function() { can.misc.Log(html.WSS, cli.CLOSE, args) if (socket._close) { return } @@ -277,5 +275,5 @@ Volcanos("misc", { _args: function(level, arg) { var args = [this._time(), this.FileLine(this._skip+1, 3)].concat(level? [level]: []) for (var i in arg) { arg[i] != undefined && args.push(arg[i]) } return args }, - _signal: function(args) { this._list.push(args) }, _list: [], _skip: navigator.userAgent.indexOf("Chrome") > -1? 4: 1, + _signal: function(args) { this._list.push(args) }, _list: [], _skip: navigator.userAgent.indexOf("Chrome") > -1? 3: 3, }) diff --git a/lib/page.js b/lib/page.js index 0aafb3d1..93a727ba 100644 --- a/lib/page.js +++ b/lib/page.js @@ -290,6 +290,7 @@ Volcanos("page", { push: "⇈", pull: "⇊", lt: "❮", gt: "❯", inner: "..", + favor: "\u2606", }, inputs: function(can, list, type) { var _list = []; for (var i = 0; i < list.length; i++) { switch (list[i]) { case "": _list.push(""); break