From 91c12528f2eb32f44cbff7712e5159b45bf94f31 Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 3 Jul 2024 14:32:10 +0800 Subject: [PATCH] opt some --- index.css | 2 +- lib/page.js | 2 +- plugin/input/key.js | 1 - plugin/local/wiki/feel.js | 22 +++++++--------------- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/index.css b/index.css index f7206bc8..a60d3e73 100644 --- a/index.css +++ b/index.css @@ -558,7 +558,7 @@ fieldset.input tr:hover { background-color:var(--tr-hover-bg-color); } fieldset.input td:hover { background-color:var(--td-hover-bg-color); } fieldset.input table.checkbox.content td:first-child { box-shadow:none; } fieldset.input table.checkbox.content th.select { border:none; } -fieldset.input>span.close { padding:var(--input-padding); position:absolute; top:0; right:0; line-height:16px; } +fieldset.input>span.close { line-height:16px; padding:var(--input-padding); position:absolute; top:0; right:0; z-index:5; } fieldset.input>span.close:hover { background-color:var(--hover-bg-color); color:var(--hover-fg-color); cursor:pointer; } div.float { background-color:var(--float-bg-color); } div.carte div.item:hover { background-color:var(--hover-bg-color); } diff --git a/lib/page.js b/lib/page.js index 5c6a1038..b5f49482 100644 --- a/lib/page.js +++ b/lib/page.js @@ -93,7 +93,7 @@ Volcanos("page", { } else if (item.td) { type = html.TR, item.list = item.td.map(function(text) { return can.base.isObject(text)? text: {text: [text||"", html.TD]} }) } // if (type == html.SELECT) { data.title = can.user.trans(can, data.title||name) } if (type == html.INPUT) { - if (data.type == html.TEXT || data.type == html.PASSWORD || !data.type) { data.autocomplete = data.autocomplete||"off" + if (data.type == html.TEXT || data.type == html.PASSWORD || !data.type) { data.autocomplete = data.autocomplete||"new-password" data.placeholder = (data.placeholder||name||"").split(nfs.PT).pop(), data.title = can.user.trans(can, data.title||data.placeholder, null, html.INPUT) } else if (data.type == html.BUTTON) { // data.value = can.user.trans(can, data.value) diff --git a/plugin/input/key.js b/plugin/input/key.js index 506e70a0..3ff54c71 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -64,7 +64,6 @@ Volcanos(chat.ONFIGURE, {key: { meta.msg && meta.msg.Length() > 0? sub._show(sub, meta.msg, cb, target, meta.name): sub._load(event, sub, cb, target, meta.name, target.value) }) }, onblur: function(event, can, sub, cb, target) { if (target._hold) { return } - return can.onengine.signal(can, "onevent", can.request(event, {query: can.page.getquery(can, target)+","+target.value})) sub && can.onmotion.delay(can, sub.close, 300) }, diff --git a/plugin/local/wiki/feel.js b/plugin/local/wiki/feel.js index 608c3246..5a0a5f08 100644 --- a/plugin/local/wiki/feel.js +++ b/plugin/local/wiki/feel.js @@ -1,8 +1,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg, cb) { can.onappend.style(can, wiki.FEEL) - can.user.isMobile && (can.onaction.list = [web.UPLOAD]) can.run({}, [], function(_msg) { can.db.albums = _msg - can.ui = can.onappend.layout(can), cb && cb(msg) + can.ui = can.onappend.layout(can), can.user.isMobile && (can.onaction.list = [web.UPLOAD]), cb && cb(msg) if (can.base.isIn(can.Action("sort")||"", mdb.TIME, "")) { can.onimport._project(can, msg) } else { @@ -26,8 +25,6 @@ Volcanos(chat.ONIMPORT, { can.Update(event, [ctx.ACTION, mdb.CREATE]) }}]) can.ui.filter = can.onappend.filter(can, can.ui.project) - // var action = can.page.Append(can, can.ui.project, ["action"])._target - // can.onappend._action(can, can.onaction.list, action) msg.Table(function(item) { item.name = can.base.trimPrefix(item.path, can.Option(nfs.PATH)) can.base.endWith(item.path, "/") && (item.nick = [{img: can.misc.Resource(can, "usr/icons/dir.png")}, {text: [item.name, "", mdb.NAME]}]) can.base.endWith(item.path, nfs.PS)? can.onimport.item(can, item, function(event) { can.Option(nfs.PATH, item.path) && can.Update(event) }): can.db.list.push(item) @@ -54,8 +51,7 @@ Volcanos(chat.ONIMPORT, { if (can.misc.isImage(can, item.path)) { can.onmotion.delay(can, function() { can.onaction.playnext(can) }, 5000) } if (!can.onmotion.cache(can, function() { return item.path }, can.ui.content)) { var progress item._cb = function(event, video) { can.ui.video = item._video = video - var p = parseInt(video.currentTime*100/video.duration) - can.page.Select(can, target, "span.progress", function(target) { target.innerText = p+"%" }) + var p = parseInt(video.currentTime*100/video.duration); can.page.Select(can, target, "span.progress", function(target) { target.innerText = p+"%" }) if (!progress) { progress = can.page.Append(can, can.ui.content, ["progress"])._target } can.page.style(can, progress, html.WIDTH, can.ui.content.offsetWidth*p/100) } var _target = can.onimport.file(can, item.path, item, index, can.ui.content, true); _target.focus() @@ -116,17 +112,10 @@ Volcanos(chat.ONFIGURE, { mp3: function(can, item, auto) { return can.onfigure.audio(can, item, auto) }, }) Volcanos(chat.ONACTION, { - _trans: { - "fullscreen": "全屏", - icons: { - "fullscreen": "bi bi-fullscreen", - }, - }, list: [ - // "fullscreen", "mkdir", "upload", "record1", "record2", ["sort", mdb.TIME, nfs.PATH, nfs.SIZE], - ["order", "loop", "range", "random"], + ["order", "repeat", "range", "loop", "random"], ], record0: function(event, can, name, cb) { can.user.input(event, can, [{name: nfs.FILE, value: name}], function(list) { var height = window.innerHeight, width = window.innerWidth @@ -177,12 +166,15 @@ Volcanos(chat.ONACTION, { } can.onimport._project(can, can._msg) }, playnext: function(can) { - if (can.Action("order") == "loop") { + if (can.Action("order") == "repeat") { if (can.ui.video) { can.ui.video.currentTime = 0, can.ui.video.play() } } if (can.Action("order") == "range") { var next = can.ui.current._target.nextSibling next && can.onmotion.delay(can, function() { next.click() }, 300) } + if (can.Action("order") == "loop") { var next = can.ui.current._target.nextSibling + next? can.onmotion.delay(can, function() { next.click() }, 300): can.db.list[0]._target.click() + } if (can.Action("order") == "random") { can.db.list[parseInt(Math.random()*can.db.list.length)]._target.click() }