diff --git a/frame.js b/frame.js index ea73e459..f0eeebb6 100644 --- a/frame.js +++ b/frame.js @@ -364,8 +364,10 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { field: function(can, type, item, target) { type = type||html.STORY, item = item||{} var name = can.core.Split(item.nick||item.name||"").pop()||""; can.base.isIn(name, tcp.SERVER, tcp.CLIENT, web.STUDIO, web.SERVICE, mdb.SEARCH, - web.MESSAGE, - ) && (name = (item.index||"").split(".").slice(-2).join(".")), (type != html.PLUG && !can.base.isIn(can.ConfIndex(), web.DESKTOP, web.MESSAGE)) && (name = can.core.Keys(item.space||item._space, name)) + ) && (name = (item.index||"").split(".").slice(-2).join(".")), (type != html.PLUG && !can.base.isIn(can.ConfIndex(), + web.DESKTOP, + web.MESSAGE, + )) && (name = can.core.Keys(item.space||item._space, name)) var title = item.title || can.user.isMobile && (can.user.isEnglish(can)? name: (item.help||name)) || (!item.help || name == item.help || can.user.isEnglish(can)? name: name+"("+can.core.Split(item.help)[0]+")") target = can.base.isFunc(target)? target(): target return can.page.Append(can, target||can._output, [{view: [type, html.FIELDSET], style: item.style, list: [{type: html.LEGEND, list: [item.icon && {icon: item.icon}, {text: title}]}, {view: [html.OPTION, html.FORM]}, html.ACTION, html.OUTPUT, html.STATUS]}]) diff --git a/index.css b/index.css index c3aa8404..426f9a6a 100644 --- a/index.css +++ b/index.css @@ -538,9 +538,9 @@ fieldset.plug>div.status { height:31px; } i.bi.bi-toggle-on { color:var(--notice-bg-color); } i.bi.bi-toggle-on:hover { color:var(--notice-bg-color); } fieldset>legend>i { margin-right:var(--input-margin); } -form.option>div.item.icon { position:relative; height:var(--action-height); overflow:hidden; user-select:none; } +form.option>div.item.icon { position:relative; height:30px; overflow:hidden; user-select:none; } form.option>div.item.icon { font-size:var(--icon-font-size); padding:0 var(--input-padding); } -form.option>div.item.icon.menu { font-size:28px; line-height:24px; display:flex; align-items:flex-start; display:none; } +form.option>div.item.icon.menu { font-size:28px; line-height:26px; display:flex; align-items:flex-start; display:none; } form.option>div.item.icon.refresh { font-size:28px; line-height:26px; display:flex; align-items:flex-start; } form.option>div.item.icon.goback { font-size:28px; line-height:26px; display:flex; align-items:flex-start; } form.option>div.icon.delete { font-size:20px; line-height:32px; display:flex; align-items:flex-start; } diff --git a/lib/misc.js b/lib/misc.js index 43464b55..043985d3 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -203,7 +203,7 @@ Volcanos("misc", { var ls = obj.pod.split("#"); ls[0] += (ls[0].indexOf("?") > 0? "&": "?") + "debug=true", obj.pod = ls.join("#") } return obj.pod } - obj.pod = obj.pod||can.misc.Search(can, ice.POD); return can.misc.MergeURL(can, obj, true) + obj.pod = obj.pod == undefined? can.misc.Search(can, ice.POD): obj.pod; return can.misc.MergeURL(can, obj, true) }, MergeURL: function(can, obj, clear) { var path = location.pathname; obj._path && (path = obj._path), delete(obj._path) can.misc.Search(can, log.DEBUG) && (obj.debug = ice.TRUE); var hash = obj._hash||""; delete(obj._hash) diff --git a/plugin/state.js b/plugin/state.js index de3717e1..1ff926a0 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -297,7 +297,7 @@ Volcanos(chat.ONEXPORT, {_output: function(can, msg) {}, return can.page.ClassList.has(can, can._target, html.OUTPUT) || !can.page.isDisplay(can._status) || (can._target.offsetHeight > 0 && can._status.offsetHeight == 0) || can._status.innerHTML == "" && !can.page.ClassList.has(can, can._target, html.PLUG)? 0: html.STATUS_HEIGHT }, link: function(can) { var args = can.Option(); args.pod = can.ConfSpace(), args.cmd = can.ConfIndex() - can.core.Item(args, function(key, value) { !value && delete(args[key]) }) + can.core.Item(args, function(key, value) { key != ice.POD && !value && delete(args[key]) }) return can.misc.MergePodCmd(can, args, true) }, args: function(can) { return can.Option() }, close: function(can, msg) {},