diff --git a/frame.js b/frame.js index a86735a7..316b2e32 100644 --- a/frame.js +++ b/frame.js @@ -114,8 +114,8 @@ Volcanos("ondaemon", {help: "推荐引擎", list: [], _init: function(can, name) }): can.onengine._search({}, can, msg, can, ["_search", cmd].concat(arg), function() { msg.Reply() }) }) }, _list: [""], - refresh: function(can, msg, sub) { sub.Update() }, exit: function(can, msg, sub) { window.close() }, + refresh: function(can, msg, sub) { sub.Update() }, pwd: function(can, msg, arg) { can.ondaemon._list[0] = arg[0] }, grow: function(can, msg, sub, arg) { sub.onimport._grow(sub, can.page.Color(arg.join(""))) }, toast: function(can, msg, arg) { can.core.CallFunc(can.user.toast, {can: can, msg: msg, cmds: arg}) }, @@ -681,7 +681,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, can.onappend._action(sub, [cli.CLOSE, cli.CLEAR, cli.REFRESH], sub._action, kit.Dict( cli.REFRESH, function(event) { can.base.isFunc(cb) && cb(sub) }, cli.CLEAR, function(event) { target.value = "" }, - cli.CLOSE, function(event) { sub.close() }, + cli.CLOSE, function(event) { sub.close() } )), can.onappend._status(sub, [mdb.TOTAL, mdb.INDEX]) can.page.style(sub, sub._target, meta.style), can.onmotion.hidden(can, sub._target) diff --git a/lib/misc.js b/lib/misc.js index 776d4a80..df15fd52 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -166,7 +166,7 @@ Volcanos("misc", {help: "通信协议", Message: function(event, can) { var msg }, CookieSessid: shy("会话变量", function(can, value, path) { - return can.misc.Cookie(can, ice.MSG_SESSID+"_"+location.host.replaceAll(ice.PT, "_").replaceAll(ice.DF, "_"), value, path) + return can.misc.Cookie(can, ice.MSG_SESSID+"_"+can.base.replaceAll(location.host, ice.PT, "_", ice.DF, "_"), value, path) }), Cookie: shy("会话变量", function(can, key, value, path) { function set(k, v) { document.cookie = k+"="+v+";path="+(path||ice.PS) } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index df0f5ca9..a1cf4540 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -95,7 +95,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.profile_size[can.onexport.keys(can)] = can.ConfWidth()*parseInt(data.width)/100 can.onaction["展示"](event, can) }) - }, + } )) target._toggle = function(event, show) { action[show? cli.SHOW: cli.CLOSE](event) } }, @@ -116,7 +116,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.profile_size[can.onexport.keys(can)] = can.ConfHeight()*parseInt(data.height)/100 can.onaction["执行"](event, can) }) - }, + } )) target._toggle = function(event, show) { action[show? cli.EXEC: cli.CLOSE](event) } }, @@ -448,7 +448,7 @@ Volcanos("onaction", {help: "控件交互", list: ["搜索", "打开", "添加", _trans: {width: "宽度", height: "高度", website: "网页"}, "加载": function(event, can) { var file = can.base.Path("/require/", can.Option(nfs.PATH), can.Option(nfs.FILE)) - delete(Volcanos.meta.cache[file]), eval(`\n_can_name = "`+file+`"\n`+can.onexport.content(can)+`\n_can_name = ""\nconsole.log("once")`) + delete(Volcanos.meta.cache[file]), eval("\n_can_name = \""+file+"\"\n"+can.onexport.content(can)+"\n_can_name = \"\"\nconsole.log(\"once\")") }, "刷新": function(event, can) { can.onimport.tabview(can, "src/", "main.go", "", function() {}, skip) }, "搜索": function(event, can) { diff --git a/plugin/local/code/inner/template.js b/plugin/local/code/inner/template.js index 53ce786b..9debc38b 100644 --- a/plugin/local/code/inner/template.js +++ b/plugin/local/code/inner/template.js @@ -13,7 +13,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, args, cb) { }, true) }, true) }) - }, + } ))) { return } can.run(event, [ctx.ACTION, ice.RUN, "web.code.template"].concat(cmds), function(msg) { can.base.isFunc(cb) && cb(msg) diff --git a/proto.js b/proto.js index b150742d..62f813d3 100644 --- a/proto.js +++ b/proto.js @@ -157,14 +157,7 @@ var chat = { WEBSITE: "website", HEAD: "head", LEFT: "left", MAIN: "main", AUTO: "auto", HIDE: "hide", FOOT: "foot", HEADER: "header", FOOTER: "footer", - ACTION_LAYOUT_FMT: ` -fieldset.Action.grid>div.output fieldset.plugin { - width:_width; height:_height; -} -fieldset.Action.grid>div.output fieldset.plugin>div.output { - width:_width; height:_height; -} -`, + ACTION_LAYOUT_FMT: " fieldset.Action.grid>div.output fieldset.plugin { width:_width; height:_height; } fieldset.Action.grid>div.output fieldset.plugin>div.output { width:_width; height:_height; } ", PLUGIN_STATE_JS: "/plugin/state.js", PLUGIN_INPUT_JS: "/plugin/input.js",