diff --git a/frame.js b/frame.js index 4d5c39b0..affe56bb 100644 --- a/frame.js +++ b/frame.js @@ -167,6 +167,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, }, }) Volcanos("ondaemon", {help: "解析引擎", list: [], _init: function(can) { + if (can.user.isLocalFile) { return } can.misc.WSS(can, {type: "chrome", name: can.user.Search(can, "daemon")||""}, function(event, msg, cmd, arg) { if (!msg) { return } if (can.base.isFunc(can.ondaemon[cmd])) { can.core.CallFunc(can.ondaemon[cmd], { diff --git a/lib/user.js b/lib/user.js index 21959da2..b1623e74 100644 --- a/lib/user.js +++ b/lib/user.js @@ -15,6 +15,7 @@ Volcanos("user", {help: "用户模块", agent: { typeof cb == "function" && cb([]) }, }, + isLandscape: window.innerWidth>window.innerHeight, isWeiXin: navigator.userAgent.indexOf("MicroMessenger") > -1, isMobile: navigator.userAgent.indexOf("Mobile") > -1, isIPhone: navigator.userAgent.indexOf("iPhone") > -1, diff --git a/panel/Header.js b/panel/Header.js index 7a24fd59..8cbabdf4 100644 --- a/panel/Header.js +++ b/panel/Header.js @@ -28,7 +28,6 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onimport._state(can, msg, target) can.onimport._search(can, msg, target) can.onimport._background(can, msg, target) - can.onimport._daemon(can, msg, target) can.onimport._agent(can, msg, target) can.onimport._menu(can, msg, target) @@ -77,20 +76,6 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, if (can.user.isExtension) { return } can.onlayout.background(can, msg.Option(can._BACKGROUND), document.body) }, - _daemon: function(can, msg, target) { - can.misc.WSS(can, {type: "chrome", name: can.user.Search(can, "daemon")||""}, function(event, msg, cmd, arg) { if (!msg) { return } - switch (cmd) { - case "pwd": - can.base.Log(msg) - msg.Reply() - break - default: - can.run(event, [can._SEARCH].concat(msg["detail"]||[]), function(msg) { - msg.Reply() - }) - } - }) - }, _agent: function(can, msg, target) { if (can.user.isMobile) { can.onaction.River(can) @@ -248,7 +233,7 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, }, pack: function(event, can) { can.user.input(event, can, [ - {_input: "text", name: "name", value: "demo"}, + {name: "name", value: can.user.title()}, ], function(ev, button, meta, list) { can.core.Item(Volcanos.meta.pack, function(key, msg) { can.core.List(["_event", "_can", "_xhr", "sessid", ""], function(key) { delete(msg[key]) }) diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 1b90e694..32dc6772 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -164,7 +164,7 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], return p.line? p.line(can, line): line }, }) -Volcanos("onaction", {help: "控件交互", list: ["项目", "收藏", "搜索", "运行"], +Volcanos("onaction", {help: "控件交互", list: ["项目"], "返回": function(event, can) { var last = can.history.pop(); last = can.history.pop() last && can.onimport.tabview(can, last.path, last.file, last.line) diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index ee3391f8..1e740507 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -297,7 +297,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" can.onaction.rerankLine(can) }, }) -Volcanos("onaction", {help: "控件交互", list: ["项目", "收藏", "搜索", "运行"], +Volcanos("onaction", {help: "控件交互", list: ["项目"], save: function(event, can) { var msg = can.request(event, {content: can.onexport.content(can)}) can.run(event, ["action", "save", can.parse, can.Option("file"), can.Option("path")], function(msg) { can.user.toast(can, "保存成功") diff --git a/plugin/story/trend.js b/plugin/story/trend.js index 11b6b328..d9850c70 100644 --- a/plugin/story/trend.js +++ b/plugin/story/trend.js @@ -4,7 +4,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, if (msg.Option("branch")) { return can.onappend.table(can, msg) } can.msg = msg, can.data = msg.Table(), can.onimport._sum(can) - can.Action("height", parseInt(msg.Option("height")||"400")) + can.Action("height", parseInt(msg.Option("height")||can.user.isMobile&&can.user.isLandscape? "200": "400")) can.Action("speed", parseInt(msg.Option("speed")||"100")) can.onappend.plugins(can, {index: "web.wiki.draw"}, function(sub) {