diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 471df72e..efb00aaa 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -12,6 +12,9 @@ fieldset.editor>div.action>div.file:hover { fieldset.editor>div.action>div.file.select { background-color:green; } +fieldset.editor>form.option div.item input.args[name=line] { + width:40px; +} fieldset.editor>div.output { max-height:560px; overflow:auto; @@ -93,14 +96,8 @@ fieldset.editor>div.output pre.display:hover { } fieldset.editor>div.output div.search { padding:6px; border:solid 1px red; - max-height:120px; overflow:auto; - position:sticky; bottom:0; + height:120px; overflow:auto; clear:both; - margin:0; -} -fieldset.editor>div.output div.search:hover { - background-color:black; - z-index:10; } fieldset.editor>div.output div.holdon { max-height:400px; overflow:auto; diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 443fa180..031073ab 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -4,8 +4,8 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, // can.page.Modify(can, target, {style: {"max-height": height-160+"px"}}) can.onappend.table(can, target, "table", msg), can.ui = can.page.Append(can, target, [ - {view: "search", style: {display: "none"}}, - {view: "project"}, {view: "profile"}, + {view: "project", style: {display: "none"}}, + {view: "profile"}, {view: "holdon", list: [ {view: "preview"}, {view: "content", style: {"max-width": can.Conf("width")-260+"px"}}, @@ -26,6 +26,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, can.onkeymap.parse(event, can, "command") }}, {type: "code", list: [{view: ["display", "pre"]}]}, + {view: "search", style: {display: "none"}}, ]) can.history = [{ @@ -429,6 +430,8 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], }, }, man2: {link: "man3"}, + man1: {link: "man3"}, + man8: {link: "man3"}, png: { display: true, @@ -685,7 +688,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" }, }) Volcanos("onaction", {help: "控件交互", list: [ - "搜索", + "项目", "搜索", // "运行", "收藏", // "", "项目", "上传", "", "保存", "运行", @@ -738,12 +741,16 @@ Volcanos("onaction", {help: "控件交互", list: [ var str = s.baseNode.data var begin = str.indexOf(s.toString()) var end = begin+s.toString().length + s = s.toString() for (var i = begin; i >= 0; i--) { - if (!str[i].match(/[a-zA-Z0-9.]/) || i <= 0) { + if (!str[i].match(/[a-zA-Z0-9.]/)) { s = str.slice(i+1, end) break } } + if (s.indexOf(".") == 0) { + s = s.slice(1) + } if (s.indexOf("kit.") == 0) { s = s.replace("kit.", "toolkits.") } @@ -761,14 +768,16 @@ Volcanos("onaction", {help: "控件交互", list: [ can.onaction.deleteLine(can, target.nextSibling) return target }, - searchLine: function(event, can, value) { can.ui.search.innerHTML = "" + searchLine: function(event, can, value) { can.ui.search.innerHTML = "", value = value.trim() can.page.Modify(can, can.ui.search, {style: {display: ""}}) var ui = can.page.Append(can, can.ui.search, [{view: "action", list: [ {input: ["word", function(event) { if (event.key == "Enter") { can.onaction.searchLine(event, can, ui.word.value) } - }], value: value||"main"}, + }], onfocus: function(event) { + event.target.setSelectionRange(0, -1) + }, value: value}, {button: ["搜索", function(event) { can.onaction.searchLine(event, can, ui.word.value) }]}, @@ -786,8 +795,9 @@ Volcanos("onaction", {help: "控件交互", list: [ value && can.run(event, ["action", "search", can.parse, value, ""], function(msg) { can.onappend.table(can, can.ui.search, "table", msg, function(value, key, index, line) { value = value.replace("<", "<").replace(">", ">") + value = value.replace("./", "") return {text: [value, "td"], onclick: function(event) { - line.line && can.onimport.tabview(can, can.Option("path"), line.file, parseInt(line.line)) + line.line && can.onimport.tabview(can, can.Option("path"), line.file.replace("./", ""), parseInt(line.line)) }} }) can.page.Select(can, can.ui.search, "tr", function(item, index) { @@ -817,7 +827,7 @@ Volcanos("onaction", {help: "控件交互", list: [ "上传": function(event, can) { can.user.upload(event, can) }, "搜索": function(event, can) { var hide = can.ui.search.style.display == "none" can.page.Modify(can, can.ui.search, {style: {display: hide? "": "none"}}) - hide && can.onaction.searchLine(event, can, can.Option("file")) + hide && can.onaction.searchLine(event, can, "") }, "记录": function(event, can) { var sub = can.request(event) can.core.Item(can.Option(), sub.Option) diff --git a/client/history/chat.js b/trash/chat.js similarity index 100% rename from client/history/chat.js rename to trash/chat.js diff --git a/client/mp/app.js b/trash/client/mp/app.js similarity index 100% rename from client/mp/app.js rename to trash/client/mp/app.js diff --git a/client/mp/app.json b/trash/client/mp/app.json similarity index 100% rename from client/mp/app.json rename to trash/client/mp/app.json diff --git a/client/mp/app.wxml b/trash/client/mp/app.wxml similarity index 100% rename from client/mp/app.wxml rename to trash/client/mp/app.wxml diff --git a/client/mp/app.wxss b/trash/client/mp/app.wxss similarity index 100% rename from client/mp/app.wxss rename to trash/client/mp/app.wxss diff --git a/client/mp/pages/action/action.js b/trash/client/mp/pages/action/action.js similarity index 100% rename from client/mp/pages/action/action.js rename to trash/client/mp/pages/action/action.js diff --git a/client/mp/pages/action/action.json b/trash/client/mp/pages/action/action.json similarity index 100% rename from client/mp/pages/action/action.json rename to trash/client/mp/pages/action/action.json diff --git a/client/mp/pages/action/action.wxml b/trash/client/mp/pages/action/action.wxml similarity index 100% rename from client/mp/pages/action/action.wxml rename to trash/client/mp/pages/action/action.wxml diff --git a/client/mp/pages/action/action.wxss b/trash/client/mp/pages/action/action.wxss similarity index 100% rename from client/mp/pages/action/action.wxss rename to trash/client/mp/pages/action/action.wxss diff --git a/client/mp/pages/active/active.js b/trash/client/mp/pages/active/active.js similarity index 100% rename from client/mp/pages/active/active.js rename to trash/client/mp/pages/active/active.js diff --git a/client/mp/pages/active/active.json b/trash/client/mp/pages/active/active.json similarity index 100% rename from client/mp/pages/active/active.json rename to trash/client/mp/pages/active/active.json diff --git a/client/mp/pages/active/active.wxml b/trash/client/mp/pages/active/active.wxml similarity index 100% rename from client/mp/pages/active/active.wxml rename to trash/client/mp/pages/active/active.wxml diff --git a/client/mp/pages/active/active.wxss b/trash/client/mp/pages/active/active.wxss similarity index 100% rename from client/mp/pages/active/active.wxss rename to trash/client/mp/pages/active/active.wxss diff --git a/client/mp/pages/favor/favor.js b/trash/client/mp/pages/favor/favor.js similarity index 100% rename from client/mp/pages/favor/favor.js rename to trash/client/mp/pages/favor/favor.js diff --git a/client/mp/pages/favor/favor.json b/trash/client/mp/pages/favor/favor.json similarity index 100% rename from client/mp/pages/favor/favor.json rename to trash/client/mp/pages/favor/favor.json diff --git a/client/mp/pages/favor/favor.wxml b/trash/client/mp/pages/favor/favor.wxml similarity index 100% rename from client/mp/pages/favor/favor.wxml rename to trash/client/mp/pages/favor/favor.wxml diff --git a/client/mp/pages/favor/favor.wxss b/trash/client/mp/pages/favor/favor.wxss similarity index 100% rename from client/mp/pages/favor/favor.wxss rename to trash/client/mp/pages/favor/favor.wxss diff --git a/client/mp/pages/river/river.js b/trash/client/mp/pages/river/river.js similarity index 100% rename from client/mp/pages/river/river.js rename to trash/client/mp/pages/river/river.js diff --git a/client/mp/pages/river/river.json b/trash/client/mp/pages/river/river.json similarity index 100% rename from client/mp/pages/river/river.json rename to trash/client/mp/pages/river/river.json diff --git a/client/mp/pages/river/river.wxml b/trash/client/mp/pages/river/river.wxml similarity index 100% rename from client/mp/pages/river/river.wxml rename to trash/client/mp/pages/river/river.wxml diff --git a/client/mp/pages/river/river.wxss b/trash/client/mp/pages/river/river.wxss similarity index 100% rename from client/mp/pages/river/river.wxss rename to trash/client/mp/pages/river/river.wxss diff --git a/client/mp/pages/scans/scans.js b/trash/client/mp/pages/scans/scans.js similarity index 100% rename from client/mp/pages/scans/scans.js rename to trash/client/mp/pages/scans/scans.js diff --git a/client/mp/pages/scans/scans.json b/trash/client/mp/pages/scans/scans.json similarity index 100% rename from client/mp/pages/scans/scans.json rename to trash/client/mp/pages/scans/scans.json diff --git a/client/mp/pages/scans/scans.wxml b/trash/client/mp/pages/scans/scans.wxml similarity index 100% rename from client/mp/pages/scans/scans.wxml rename to trash/client/mp/pages/scans/scans.wxml diff --git a/client/mp/pages/scans/scans.wxss b/trash/client/mp/pages/scans/scans.wxss similarity index 100% rename from client/mp/pages/scans/scans.wxss rename to trash/client/mp/pages/scans/scans.wxss diff --git a/client/mp/pages/storm/storm.js b/trash/client/mp/pages/storm/storm.js similarity index 100% rename from client/mp/pages/storm/storm.js rename to trash/client/mp/pages/storm/storm.js diff --git a/client/mp/pages/storm/storm.json b/trash/client/mp/pages/storm/storm.json similarity index 100% rename from client/mp/pages/storm/storm.json rename to trash/client/mp/pages/storm/storm.json diff --git a/client/mp/pages/storm/storm.wxml b/trash/client/mp/pages/storm/storm.wxml similarity index 100% rename from client/mp/pages/storm/storm.wxml rename to trash/client/mp/pages/storm/storm.wxml diff --git a/client/mp/pages/storm/storm.wxss b/trash/client/mp/pages/storm/storm.wxss similarity index 100% rename from client/mp/pages/storm/storm.wxss rename to trash/client/mp/pages/storm/storm.wxss diff --git a/client/mp/project.config.json b/trash/client/mp/project.config.json similarity index 100% rename from client/mp/project.config.json rename to trash/client/mp/project.config.json diff --git a/client/mp/sitemap.json b/trash/client/mp/sitemap.json similarity index 100% rename from client/mp/sitemap.json rename to trash/client/mp/sitemap.json diff --git a/client/mp/utils/kit.js b/trash/client/mp/utils/kit.js similarity index 100% rename from client/mp/utils/kit.js rename to trash/client/mp/utils/kit.js diff --git a/client/mp/utils/util.js b/trash/client/mp/utils/util.js similarity index 100% rename from client/mp/utils/util.js rename to trash/client/mp/utils/util.js diff --git a/client/history/frame_old.js b/trash/frame_old.js similarity index 100% rename from client/history/frame_old.js rename to trash/frame_old.js diff --git a/client/history/index.html b/trash/index.html similarity index 100% rename from client/history/index.html rename to trash/index.html diff --git a/client/history/index.js b/trash/index.js similarity index 100% rename from client/history/index.js rename to trash/index.js diff --git a/client/history/lib b/trash/lib similarity index 100% rename from client/history/lib rename to trash/lib diff --git a/client/history/pane/Action.css b/trash/pane/Action.css similarity index 100% rename from client/history/pane/Action.css rename to trash/pane/Action.css diff --git a/client/history/pane/Action.js b/trash/pane/Action.js similarity index 100% rename from client/history/pane/Action.js rename to trash/pane/Action.js diff --git a/client/history/pane/Footer.css b/trash/pane/Footer.css similarity index 100% rename from client/history/pane/Footer.css rename to trash/pane/Footer.css diff --git a/client/history/pane/Footer.js b/trash/pane/Footer.js similarity index 100% rename from client/history/pane/Footer.js rename to trash/pane/Footer.js diff --git a/client/history/pane/Header.css b/trash/pane/Header.css similarity index 100% rename from client/history/pane/Header.css rename to trash/pane/Header.css diff --git a/client/history/pane/Header.js b/trash/pane/Header.js similarity index 100% rename from client/history/pane/Header.js rename to trash/pane/Header.js diff --git a/client/history/pane/Ocean.css b/trash/pane/Ocean.css similarity index 100% rename from client/history/pane/Ocean.css rename to trash/pane/Ocean.css diff --git a/client/history/pane/Ocean.js b/trash/pane/Ocean.js similarity index 100% rename from client/history/pane/Ocean.js rename to trash/pane/Ocean.js diff --git a/client/history/pane/River.css b/trash/pane/River.css similarity index 100% rename from client/history/pane/River.css rename to trash/pane/River.css diff --git a/client/history/pane/River.js b/trash/pane/River.js similarity index 100% rename from client/history/pane/River.js rename to trash/pane/River.js diff --git a/client/history/pane/Source.css b/trash/pane/Source.css similarity index 100% rename from client/history/pane/Source.css rename to trash/pane/Source.css diff --git a/client/history/pane/Source.js b/trash/pane/Source.js similarity index 100% rename from client/history/pane/Source.js rename to trash/pane/Source.js diff --git a/client/history/pane/Steam.css b/trash/pane/Steam.css similarity index 100% rename from client/history/pane/Steam.css rename to trash/pane/Steam.css diff --git a/client/history/pane/Steam.js b/trash/pane/Steam.js similarity index 100% rename from client/history/pane/Steam.js rename to trash/pane/Steam.js diff --git a/client/history/pane/Storm.css b/trash/pane/Storm.css similarity index 100% rename from client/history/pane/Storm.css rename to trash/pane/Storm.css diff --git a/client/history/pane/Storm.js b/trash/pane/Storm.js similarity index 100% rename from client/history/pane/Storm.js rename to trash/pane/Storm.js diff --git a/client/history/pane/Target.css b/trash/pane/Target.css similarity index 100% rename from client/history/pane/Target.css rename to trash/pane/Target.css diff --git a/client/history/pane/Target.js b/trash/pane/Target.js similarity index 100% rename from client/history/pane/Target.js rename to trash/pane/Target.js diff --git a/client/history/pane/float/Carte.css b/trash/pane/float/Carte.css similarity index 100% rename from client/history/pane/float/Carte.css rename to trash/pane/float/Carte.css diff --git a/client/history/pane/float/Carte.js b/trash/pane/float/Carte.js similarity index 100% rename from client/history/pane/float/Carte.js rename to trash/pane/float/Carte.js diff --git a/client/history/pane/float/Debug.css b/trash/pane/float/Debug.css similarity index 100% rename from client/history/pane/float/Debug.css rename to trash/pane/float/Debug.css diff --git a/client/history/pane/float/Debug.js b/trash/pane/float/Debug.js similarity index 100% rename from client/history/pane/float/Debug.js rename to trash/pane/float/Debug.js diff --git a/client/history/pane/float/Favor.css b/trash/pane/float/Favor.css similarity index 100% rename from client/history/pane/float/Favor.css rename to trash/pane/float/Favor.css diff --git a/client/history/pane/float/Favor.js b/trash/pane/float/Favor.js similarity index 100% rename from client/history/pane/float/Favor.js rename to trash/pane/float/Favor.js diff --git a/client/history/pane/float/Login.css b/trash/pane/float/Login.css similarity index 100% rename from client/history/pane/float/Login.css rename to trash/pane/float/Login.css diff --git a/client/history/pane/float/Login.js b/trash/pane/float/Login.js similarity index 100% rename from client/history/pane/float/Login.js rename to trash/pane/float/Login.js diff --git a/client/history/pane/float/Toast.css b/trash/pane/float/Toast.css similarity index 100% rename from client/history/pane/float/Toast.css rename to trash/pane/float/Toast.css diff --git a/client/history/pane/float/Toast.js b/trash/pane/float/Toast.js similarity index 100% rename from client/history/pane/float/Toast.js rename to trash/pane/float/Toast.js diff --git a/client/history/pane/float/Tutor.css b/trash/pane/float/Tutor.css similarity index 100% rename from client/history/pane/float/Tutor.css rename to trash/pane/float/Tutor.css diff --git a/client/history/pane/float/Tutor.js b/trash/pane/float/Tutor.js similarity index 100% rename from client/history/pane/float/Tutor.js rename to trash/pane/float/Tutor.js diff --git a/client/history/plugin/chrome/chrome.html b/trash/plugin/chrome/chrome.html similarity index 100% rename from client/history/plugin/chrome/chrome.html rename to trash/plugin/chrome/chrome.html diff --git a/client/history/plugin/chrome/chrome.js b/trash/plugin/chrome/chrome.js similarity index 100% rename from client/history/plugin/chrome/chrome.js rename to trash/plugin/chrome/chrome.js diff --git a/client/history/plugin/chrome/config.js b/trash/plugin/chrome/config.js similarity index 100% rename from client/history/plugin/chrome/config.js rename to trash/plugin/chrome/config.js diff --git a/client/history/plugin/chrome/popup.html b/trash/plugin/chrome/popup.html similarity index 100% rename from client/history/plugin/chrome/popup.html rename to trash/plugin/chrome/popup.html diff --git a/client/history/plugin/chrome/popup.js b/trash/plugin/chrome/popup.js similarity index 100% rename from client/history/plugin/chrome/popup.js rename to trash/plugin/chrome/popup.js diff --git a/client/history/plugin/inner.js b/trash/plugin/inner.js similarity index 100% rename from client/history/plugin/inner.js rename to trash/plugin/inner.js diff --git a/client/history/plugin/input.js b/trash/plugin/input.js similarity index 100% rename from client/history/plugin/input.js rename to trash/plugin/input.js diff --git a/client/history/plugin/input/city.js b/trash/plugin/input/city.js similarity index 100% rename from client/history/plugin/input/city.js rename to trash/plugin/input/city.js diff --git a/client/history/plugin/input/date.js b/trash/plugin/input/date.js similarity index 100% rename from client/history/plugin/input/date.js rename to trash/plugin/input/date.js diff --git a/client/history/plugin/input/key.js b/trash/plugin/input/key.js similarity index 100% rename from client/history/plugin/input/key.js rename to trash/plugin/input/key.js diff --git a/client/history/plugin/input/province.js b/trash/plugin/input/province.js similarity index 100% rename from client/history/plugin/input/province.js rename to trash/plugin/input/province.js diff --git a/client/history/plugin/input/upload.js b/trash/plugin/input/upload.js similarity index 100% rename from client/history/plugin/input/upload.js rename to trash/plugin/input/upload.js diff --git a/client/history/plugin/local/mall/input.js b/trash/plugin/local/mall/input.js similarity index 100% rename from client/history/plugin/local/mall/input.js rename to trash/plugin/local/mall/input.js diff --git a/client/history/plugin/local/team/plan.css b/trash/plugin/local/team/plan.css similarity index 100% rename from client/history/plugin/local/team/plan.css rename to trash/plugin/local/team/plan.css diff --git a/client/history/plugin/local/team/plan.js b/trash/plugin/local/team/plan.js similarity index 100% rename from client/history/plugin/local/team/plan.js rename to trash/plugin/local/team/plan.js diff --git a/client/history/plugin/local/wiki/data.js b/trash/plugin/local/wiki/data.js similarity index 100% rename from client/history/plugin/local/wiki/data.js rename to trash/plugin/local/wiki/data.js diff --git a/client/history/plugin/local/wiki/draw.css b/trash/plugin/local/wiki/draw.css similarity index 100% rename from client/history/plugin/local/wiki/draw.css rename to trash/plugin/local/wiki/draw.css diff --git a/client/history/plugin/local/wiki/draw.js b/trash/plugin/local/wiki/draw.js similarity index 100% rename from client/history/plugin/local/wiki/draw.js rename to trash/plugin/local/wiki/draw.js diff --git a/client/history/plugin/local/wiki/draw/heart.js b/trash/plugin/local/wiki/draw/heart.js similarity index 100% rename from client/history/plugin/local/wiki/draw/heart.js rename to trash/plugin/local/wiki/draw/heart.js diff --git a/client/history/plugin/local/wiki/feel.js b/trash/plugin/local/wiki/feel.js similarity index 100% rename from client/history/plugin/local/wiki/feel.js rename to trash/plugin/local/wiki/feel.js diff --git a/client/history/plugin/local/wiki/walk.js b/trash/plugin/local/wiki/walk.js similarity index 100% rename from client/history/plugin/local/wiki/walk.js rename to trash/plugin/local/wiki/walk.js diff --git a/client/history/plugin/local/wiki/word.css b/trash/plugin/local/wiki/word.css similarity index 100% rename from client/history/plugin/local/wiki/word.css rename to trash/plugin/local/wiki/word.css diff --git a/client/history/plugin/local/wiki/word.js b/trash/plugin/local/wiki/word.js similarity index 100% rename from client/history/plugin/local/wiki/word.js rename to trash/plugin/local/wiki/word.js diff --git a/client/history/plugin/state.js b/trash/plugin/state.js similarity index 100% rename from client/history/plugin/state.js rename to trash/plugin/state.js diff --git a/client/history/plugin/story/trend.js b/trash/plugin/story/trend.js similarity index 100% rename from client/history/plugin/story/trend.js rename to trash/plugin/story/trend.js diff --git a/client/history/plugin/table.js b/trash/plugin/table.js similarity index 100% rename from client/history/plugin/table.js rename to trash/plugin/table.js diff --git a/client/history/proto_old.js b/trash/proto_old.js similarity index 100% rename from client/history/proto_old.js rename to trash/proto_old.js diff --git a/client/history/share.html b/trash/share.html similarity index 100% rename from client/history/share.html rename to trash/share.html diff --git a/client/history/share.js b/trash/share.js similarity index 100% rename from client/history/share.js rename to trash/share.js diff --git a/client/history/style_old.css b/trash/style_old.css similarity index 100% rename from client/history/style_old.css rename to trash/style_old.css diff --git a/client/history/topic/black.css b/trash/topic/black.css similarity index 100% rename from client/history/topic/black.css rename to trash/topic/black.css diff --git a/client/history/topic/gray.css b/trash/topic/gray.css similarity index 100% rename from client/history/topic/gray.css rename to trash/topic/gray.css diff --git a/client/history/topic/miss.css b/trash/topic/miss.css similarity index 100% rename from client/history/topic/miss.css rename to trash/topic/miss.css diff --git a/client/history/topic/miss.svg b/trash/topic/miss.svg similarity index 100% rename from client/history/topic/miss.svg rename to trash/topic/miss.svg