diff --git a/frame.js b/frame.js index f5c165f4..fc8ccdb3 100644 --- a/frame.js +++ b/frame.js @@ -4,6 +4,10 @@ Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, return (can.onengine[cmds[0]]||can.onengine._remote)(event, can, msg, can, cmds, cb) } if (can.user.isExtension) { Volcanos.meta.args = can.base.Obj(localStorage.getItem(ctx.ARGS), {}) } + if (can.misc.Search(can, ice.MSG_SESSID)) { + can.misc.CookieSessid(can, can.misc.Search(can, ice.MSG_SESSID)) + return can.misc.Search(can, ice.MSG_SESSID, "") + } can.core.Next(list, function(item, next) { item.type = chat.PANEL can.onappend._init(can, can.base.Copy(item, can.core.Value(can._root, [chat.RIVER, item.name])), item.list, function(panel) { diff --git a/page/index.css b/page/index.css index 5e6e24c9..10cdfb2c 100644 --- a/page/index.css +++ b/page/index.css @@ -241,7 +241,7 @@ body.white fieldset.Action fieldset.plugin legend:hover { background-color:#6ee4 body.print fieldset.River>div.output div.item.select { background-color:white; border:solid 2px red; } body.mobile select { font-size:1.4rem; height:1.8rem; } -body.mobile legend { font-size:2rem; } +body.mobile legend { font-size:1.5rem; } body.mobile input { font-size:1.2rem; } body.mobile input[type=text] { height:1.6rem; } body.mobile fieldset.Header.head { width:-webkit-fill-available; } diff --git a/panel/action.js b/panel/action.js index 2e9f375f..8b3d744e 100644 --- a/panel/action.js +++ b/panel/action.js @@ -9,9 +9,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) can.onappend.plugin(can, item, function(sub, meta, skip) { can.onimport._plugin(can, river, storm, sub, meta), skip || next() }) - }, function() { can.onimport._menu(can, msg), can.onkeymap._init(can) - can.onaction.onstorm_select(can, msg, river, storm) - }) + }, function() { can.onimport._menu(can, msg), can.onkeymap._init(can) }) }, _plugin: function(can, river, storm, sub, meta) { sub._target._meta = meta sub.run = function(event, cmds, cb) { var msg = sub.request(event) @@ -37,16 +35,20 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg) _share: function(can, share) { share && can.run({}, ["_share", share], function(msg) { can.user.title(msg.OptionOrSearch(chat.TITLE)) can.setHeader(chat.TOPIC, msg.OptionOrSearch(chat.TOPIC)) - // can.page.Select(can, document.body, html.FIELDSET_PANEL, function(item) { - // item != can._target && can.onmotion.hidden(can, item) - // }) + + if (msg.Length() == 1) { + can.search(event, ["Header.onmotion.hidden"]) + can.search(event, ["Footer.onmotion.hidden"]) + can.page.ClassList.add(can, can._target, "cmd") + can.Conf(html.HEIGHT, window.innerHeight) + can.Conf(html.WIDTH, window.innerWidth) + } can.Conf(html.MARGIN_X, 0, html.MARGIN_Y, 2*html.ACTION_HEIGHT) - // can.page.ClassList.add(can, can._target, ice.CMD) - can.onlayout._init(can) + can.onlayout._init(can, document.body) can.Conf(chat.RIVER, "_share", chat.STORM, share) - can.onimport._init(can, msg) + msg.Length() > 0 && can.onimport._init(can, msg) }) }, _cmd: function(can, item, next) { can.base.Copy(item, { @@ -135,7 +137,7 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, cb, t } can.run({}, [river, storm], function(msg) { if (msg.Length() > 0) { return can.onimport._init(can, msg) } - river != "_share" && can.onengine.signal(can, "onaction_notool", can.request({}, {river: river, storm: storm})) + can.onengine.signal(can, "onaction_notool", can.request({}, {river: river, storm: storm})) }) }, onsearch: function(can, msg, word) { diff --git a/panel/header.js b/panel/header.js index 399d745c..a232e6dd 100644 --- a/panel/header.js +++ b/panel/header.js @@ -127,6 +127,7 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, t "white": "白色主题", "print": "打印主题", "toimage": "生成图片", + "refresh": "刷新页面", "shareuser": "共享用户", "setnick": "设置昵称", @@ -140,10 +141,6 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, t can.base.Copy(can.onaction._trans, can.base.Obj(msg.Option(chat.TRANS), {})) can.onimport._init(can, msg, function(msg) { can.onengine.signal(can, chat.ONLOGIN, msg) }, can._output) }) } - if (can.misc.Search(can, ice.MSG_SESSID)) { - can.misc.CookieSessid(can, can.misc.Search(can, ice.MSG_SESSID)) - return can.misc.Search(can, ice.MSG_SESSID, "") - } // 登录检查 can.user.isLocalFile? init(): can.run({}, [chat.CHECK], function(msg) { diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index e38d5914..44434756 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -1,5 +1,6 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { can.require(["inner.js"], function(can) { can.onimport.inner_init(can, msg, function() { + can.page.ClassList.add(can, can._fields, "inner") can.onkeymap._build(can), can.onimport._input(can), can.onkeymap._plugin({}, can), can.base.isFunc(cb) && cb(msg) }, target) }, function(can, name, sub) { name == chat.ONIMPORT && (can.onimport.inner_init = sub._init) if (name == chat.ONKEYMAP) { @@ -124,7 +125,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], }, }, _engine: {}, }) -Volcanos("onaction", {help: "控件交互", list: ["autogen", "compile", "website", "binpack"], +Volcanos("onaction", {help: "控件交互", list: ["autogen", "compile", "website"], _trans: {website: "网页"}, "刷新": function(event, can) { can.onimport.tabview(can, "src/", "main.go", "", function() {}, true)