diff --git a/frame.js b/frame.js index 6357ccc0..9ff4b7b5 100644 --- a/frame.js +++ b/frame.js @@ -158,7 +158,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, "studio": {name: "研发 studio", action: [ {name: "route", help: "路由器", index: "web.route"}, {name: "tmux", help: "命令行", index: "web.code.tmux.session"}, - {name: "inner", help: "编辑器", index: "web.code.inner", args: ["src/", "main.go"]}, + {name: "vimer", help: "编辑器", index: "web.code.vimer", args: ["src/", "main.go"]}, {name: "repos", help: "代码库", index: "web.code.git.status"}, {name: "total", help: "统计量", index: "web.code.git.total"}, {name: "plan", help: "任务表", index: "web.team.plan"}, diff --git a/index.css b/index.css index 1c966524..fa352094 100644 --- a/index.css +++ b/index.css @@ -136,7 +136,7 @@ fieldset>div.output>pre.display:hover { table { border:0; white-space: pre; font-size:14px; font-family:monospace; - box-shadow: 4px 4px 10px 1px #626bd0; + /* box-shadow: 4px 4px 10px 1px #626bd0; */ cursor:pointer; overflow: auto; } table tr:hover { diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 0044a451..4589ba66 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -14,15 +14,35 @@ fieldset.editor>form.option div.item input.args[name=line] { width:40px; } +body.white fieldset.plugin.editor table { + background:#0b2c5400; +} +body.white fieldset.plugin.editor table tr { + background:#0b2c5400; +} +fieldset.editor>div.output { + background-color:#173d40ab; +} fieldset.editor { background:#0b2c54ab; } fieldset.editor>div.output { background-color:#173d40ab; } +fieldset.editor>div.output>table>tr:hover { + background-color:#99CCFF00; +} +fieldset.editor>div.output>table>tr>td { + padding:0; overflow:auto; + vertical-align:top; +} +fieldset.editor>div.output>table>tr>td:hover { + background-color:#99CCFF00; +} + fieldset.editor>div.output div.project { max-width:180px; overflow:auto; - text-align:left; padding-right:20px; + text-align:left; padding:0 10px; font-size:14px; font-family:monospace; color:white; } @@ -32,60 +52,61 @@ fieldset.editor>div.output div.project div.item { fieldset.editor>div.output div.project div.item:hover { border:solid 2px red; } +fieldset.editor>div.output div.project div.list { + padding-left:10px; +} fieldset.editor>div.output div.profile { - min-height:200px; overflow:auto; + padding:0; margin:0; + position:relative; } -fieldset.editor>div.output div.preview { - font-family:monospace; - float:left; +fieldset.editor>div.output table.content { + font-size:16px; font-family:monospace; + padding:0; margin:0; } -fieldset.editor>div.output div.preview>div.item { - text-align:right; padding:0 4px; margin:0; - height:20px; - border:solid 1px #173d4000; - color:white; +fieldset.editor>div.output table.content tr { + padding:0; margin:0; + /* background-color:#06062700; */ } -fieldset.editor>div.output div.preview>div.item:hover { - background-color:green; -} -fieldset.editor>div.output div.preview>div.item.select { +fieldset.editor>div.output table.content tr.select td.line { background-color:red; border:solid 1px yellow; } -fieldset.editor>div.output div.content { - font-size:16px; font-family:monospace; - border-left:solid 2px red; - min-height:20px; - max-width:1000px; - overflow:auto; - float:left; +fieldset.editor>div.output table.content td.line { + text-align:right; margin:0; + border-right:solid 2px red; + padding:0 6px; + color:white; } -fieldset.editor>div.output div.content>pre.item { +fieldset.editor>div.output table.content td.line:hover { + background-color:green; +} +fieldset.editor>div.output table.content td.text { text-align:left; height:20px; border:solid 1px #173d4000; padding:0; margin:0; padding-left:10px; color:white; } -fieldset.editor>div.output div.content>pre.item.select { - border-right:0px; +fieldset.editor>div.output table.content td.text:hover { + background-color:#06062700; } -fieldset.editor>div.output div.content>pre.item span.comment { +fieldset.editor>div.output table.content td.text span.comment { color:cyan; background-color:blue; } -fieldset.editor>div.output div.content>pre.item span.keyword { +fieldset.editor>div.output table.content td.text span.keyword { color:yellow; font-weight:bold; } -fieldset.editor>div.output div.content>pre.item span.function { +fieldset.editor>div.output table.content td.text span.function { color:cyan; font-weight:bold; } -fieldset.editor>div.output div.content>pre.item span.datatype { +fieldset.editor>div.output table.content td.text span.datatype { color:lightgreen; font-weight:bold; } -fieldset.editor>div.output div.content>pre.item span.string { +fieldset.editor>div.output table.content td.text span.string { color:magenta; } + fieldset.editor>div.output pre.display { padding:6px; border:solid 1px red; max-height:120px; overflow:auto; diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 83263795..4553af3e 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -1,41 +1,45 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, target) { - can.Conf("content") && (msg = can.request({}), msg.result = [can.Conf("content")]) - can.ui = can.page.Appends(can, target, [ - {view: "project", style: { - display: "none", "max-height": window.innerHeight-300, - }}, - {view: "profile", list: [ - {view: "preview"}, {view: "content"} - ], style: {"max-height": window.innerHeight-300}}, - {view: ["display", "pre"]}, - - {view: "search", style: {display: "none"}, list: [{view: "action", list: [ - {input: ["word", function(event) { - if (event.key == "Enter") { - can.onaction.searchLine(event, can, can.ui.word.value) - } - }], onfocus: function(event) { - event.target.setSelectionRange(0, -1) - }}, - {button: ["搜索", function(event) { - can.onaction.searchLine(event, can, can.ui.word.value) - }]}, - {button: ["返回", function(event) { - var last = can.history.pop(); last = can.history.pop() - last && can.onimport.tabview(can, last.path, last.file, last.line) - }]}, + {type: "table", list: [{type: "tr", list: [ + {type: "td", list: [{view: "project", style: {"max-height": window.innerHeight-300, display: "none"}} ]}, + {type: "td", list: [{view: "profile", style: {"max-height": window.innerHeight-300}, list: [ + {view: ["content", "table"]}, + ]} ], onscroll: function(event) { + }}, + ]}, + ]}, + {view: "display", style: {display: "none", "max-height": "200"}, list: [{view: "action", list: [ {button: ["关闭", function(event) { - can.page.Modify(can, can.ui.search, {style: {display: "none"}}) + can.page.Modify(can, can.ui.display, {style: {display: "none"}}) }]}, - ]}, {view: "tags"}, ]}, + ]}, {view: "output"} ]}, + {view: "search", style: {display: "none"}, list: [{view: "action", list: [ + {input: ["word", function(event) { + if (event.key == "Enter") { + can.onaction.searchLine(event, can, can.ui.word.value) + } + }], onfocus: function(event) { + event.target.setSelectionRange(0, -1) + }}, + {button: ["搜索", function(event) { + can.onaction.searchLine(event, can, can.ui.word.value) + }]}, + {button: ["返回", function(event) { + var last = can.history.pop(); last = can.history.pop() + last && can.onimport.tabview(can, last.path, last.file, last.line) + }]}, + {button: ["关闭", function(event) { + can.page.Modify(can, can.ui.search, {style: {display: "none"}}) + }]}, + ]}, + {view: "tags"}, + ]}, ]) - can.tabview = {}, can.history = [] can.tabview[can.Option("path")+can.Option("file")] = msg msg.Option({path: can.Option("path"), file: can.Option("file"), line: can.Option("line")||1}) - can.onimport.tabview(can, can.Option("path"), can.Option("file"), can.Option("line")) + can.onimport.tabview(can, can.Option("path"), can.Option("file"), can.Option("line")||1) return typeof cb == "function" && cb(msg) }, tabview: function(can, path, file, line) { @@ -46,14 +50,8 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, can._msg && can._msg.Option("line", can.Option("line")) can._msg = can.tabview[path+file] - can.Option({path: path, file: file, line: line||parseInt(can._msg.Option("line"))}) - can.file = file, can.parse = can.base.Ext(file||path), can.max = 0 + can.Option({path: path, file: file, line: line||parseInt(can._msg.Option("line"))||1}) can.onsyntax._init(can, can._msg) - - can.onaction._resize(can, can.ui.project.style.display != "none") - can.Status("文件名", can.file), can.Status("解析器", can.parse) - can.Status("当前行", can.onexport.position(can, 0)) - can.Status("模式", "normal") } if (can.tabview[path+file]) { return show() } @@ -61,7 +59,8 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, msg.Option({path: path, file: file, line: line||1}) can.tabview[path+file] = msg - can.page.EnableDrop(can, can._action, "div.file", can.page.Append(can, can._action, [{view: ["file", "div", file], onclick: function(event) { + var name = file.split("/").pop() + can.page.EnableDrop(can, can._action, "div.file", can.page.Append(can, can._action, [{view: ["file", "div", name], title: file, onclick: function(event) { can.onimport.tabview(can, path, file) }}]).first).click() }, true) @@ -77,39 +76,47 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, }, ["/plugin/local/code/inner.css"]) Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], _init: function(can, msg) { can._msg = msg can.page.Select(can, can._action, "div.file", function(item) { - item.innerText == msg.Option("file")? can.page.ClassList.add(can, item, "select"): + item.title == msg.Option("file")? can.page.ClassList.add(can, item, "select"): can.page.ClassList.del(can, item, "select") }) // caches save - can.core.List(["preview", "content", "display"], function(item) { - can.Cache(can.file+item, can.ui[item], can.ui.profile.scrollTop) + can.core.List(["content"], function(item) { + can.Cache(can.file+item, can.ui[item], { + scrollTop: can.ui.profile.parentNode.scrollTop, + current: can.current, + max: can.max, + }) }) // caches load can.file = can.base.Path(msg.Option("path"), msg.Option("file")) - var cache = false; can.core.List(["preview", "content", "display"], function(item) { - var p = can.Cache(can.file+item, can.ui[item]); if (!cache && p != undefined) { can.ui.profile.scrollTo(0, p); cache = true } - }); if (cache) { return } + can.parse = can.base.Ext(can.file) + can.Status("模式", "normal") + + var cache = false; can.core.List(["content"], function(item) { + var p = can.Cache(can.file+item, can.ui[item]); if (p != undefined) { cache = true + can.ui.profile.parentNode.scrollTo(0, p.scrollTop) + can.onaction.selectLine(can, p.current.target) + can.max = p.max + } + }); if (cache) { + return + } function init(p) { - can.core.List(can.ls = msg.Result().split("\n"), function(item) { + can.max = 0, can.core.List(can.ls = msg.Result().split("\n"), function(item) { can.onaction.appendLine(can, item) }) can.onaction.selectLine(can, can.Option("line")||1) - - can.Status("文件名", can.file), can.Status("解析器", can.parse) - can.Status("当前行", can.onexport.position(can, 0)) - can.Status("模式", "normal") } // plugin - can.parse = can.base.Ext(can.file), can.max = 0 var p = can.onsyntax[can.parse]; !p? can.run({}, ["action", "plugin", can.parse, can.Option("file"), can.Option("path")], function(msg) { init(p = can.onsyntax[can.parse] = can.base.Obj(msg.Result())) }, true): init(p) }, - _parse: function(can, line) { line = line.replace("<", "<").replace(">", ">") + _parse: function(can, line) { line = line || "", line = line.replace("<", "<").replace(">", ">") var p = can.onsyntax[can.parse]; if (!p) { return } p = can.onsyntax[p.link] || p @@ -133,52 +140,18 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], }) return p.line? p.line(can, line): line }, - png: { - line: function(can, line) { - can.page.Append(can, can.ui.display, [{img: "/share/local/"+line, height: 400}]) - can.page.Modify(can, can.ui.display, {style: {display: "block"}}) - return line - }, - }, qrc: {link: "png"}, svg: {link: "png"}, - url: { - line: function(can, line) { - return {button: [line, function(event) { - can.page.Appends(can, can.ui.display, [{type: "iframe", data: {src: line}, style: { - height: "600px", width: can.Conf("width")-80+"px", - }}]) - }]} - } - }, }) Volcanos("onaction", {help: "控件交互", list: [], "刷新": function(event, can) { can.run(event, [can.Option("path"), can.Option("file")]) }, "编辑": function(event, can) { can.onkeymap && can.onkeymap._insert(can) }, - "保存": function(event, can) { - var msg = can.request(event); msg.Option("content", can.onexport.content(can)) - can.run(event, ["action", "save", can.parse, can.Option("file"), can.Option("path")], function(msg) { - can.user.toast(can, "保存成功") - }, true) - }, "返回": function(event, can) { var last = can.history.pop(); last = can.history.pop() last && can.onimport.tabview(can, last.path, last.file, last.line) }, - "项目": function(event, can) { - var hide = can.ui.project.style.display == "none" - hide? can.onimport.project(can, can.Option("path"), function() { - can.page.Modify(can, can.ui.project, {style: {display: ""}}), can.onaction._resize(can, true) - }): ( - can.page.Modify(can, can.ui.project, {style: {display: "none"}}), can.onaction._resize(can, false) - ) - can.onaction.selectLine(can, can.current) - }, - "搜索": 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, "") - }, + "运行": function(event, can) { can.page.Modify(can, can.ui.display, {innerHTML: "", style: {display: "none"}}) can.run(event, ["action", "engine", can.parse, can.Option("file"), can.Option("path")], function(msg) { @@ -187,21 +160,39 @@ Volcanos("onaction", {help: "控件交互", list: [], can.onappend.board(can, can.ui.display, "board", msg) }, true) }, - _resize: function(can, hide) { - can.Timer(10, function() { - var width = ((parseInt(can.Conf("width"))-30)||can._target.offsetWidth) - (hide? can.ui.project.offsetWidth+10: 0) - can.page.Modify(can, can.ui.profile, {style: {width: width}}) - width -= can.ui.preview.offsetWidth + 20 - can.page.Modify(can, can.ui.content, {style: {"max-width": width}}) - }) + + "save": function(event, can) { + var msg = can.request(event); msg.Option("content", can.onexport.content(can)) + can.run(event, ["action", "save", can.parse, can.Option("file"), can.Option("path")], function(msg) { + can.user.toast(can, "保存成功") + }, true) + }, + "project": function(event, can) { + var hide = can.ui.project.style.display == "none" + hide? can.onimport.project(can, can.Option("path"), function() { + can.page.Modify(can, can.ui.project, {style: {display: ""}}) + }): ( + can.page.Modify(can, can.ui.project, {style: {display: "none"}}) + ) + // can.onaction.selectLine(can, can.current) + }, + + "search": 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, "") }, appendLine: function(can, value) { var index = ++can.max - can.page.Append(can, can.ui.preview, [{view: ["item", "div", index], onclick: function(event) { - can.onaction.selectLine(can, index) + var line = can.page.Append(can, can.ui.content, [{type: "tr", list: [{view: ["line", "td", index], onclick: function(event) { + can.onaction.selectLine(can, line) + }, ondblclick: function(event) { - can.user.input(event, can, [{_input: "text", name: "topic", value: "@key"}, "name"], function(event, button, meta, list) { - can.run(event, ["favor", "topic", meta.topic||"some", + can.user.input(event, can, [ + {_input: "text", name: "topic", value: "@key"}, + {_input: "text", name: "name", value: "@key"}, + ], function(event, button, meta, list) { + can.run(event, [ + "favor", "topic", meta.topic||"some", "type", can.parse, "name", meta.name||"some", "text", value, "path", can.Option("path"), "file", can.Option("file"), "line", can.Option("line"), ], function(msg) { @@ -209,14 +200,21 @@ Volcanos("onaction", {help: "控件交互", list: [], }, true) return true }) - }}]) - var line = can.page.Append(can, can.ui.content, [{view: ["item", "pre", ""], onclick: function(event) { - can.onkeymap && can.onkeymap._init(can, "insert") - can.onaction.selectLine(can, index) - can.ui.editor && can.ui.editor.focus() - can.editor && can.editor.setSelectionRange(event.offsetX/10, event.offsetX/10) + }}, {view: ["text", "td"], _init: function(td) { + var p = can.onsyntax._parse(can, value) + typeof p == "object"? can.page.Appends(can, td, [p]): td.innerHTML = p + }, onclick: function(event) { + can.onaction.selectLine(can, line) + + if (can.ui.editor) { + can.ui.editor.focus() + can.ui.editor.setSelectionRange(0, 0) + can.onkeymap && can.onkeymap._mode(can, "insert") + // can.ui.editor.setSelectionRange(event.offsetX/10, event.offsetX/10) + } }, ondblclick: function(event) { + return var s = document.getSelection() var str = s.baseNode.data var begin = str.indexOf(s.toString()) @@ -236,40 +234,63 @@ Volcanos("onaction", {help: "控件交互", list: [], } can.onaction.searchLine(event, can, s) - }}]).first; value && can.onaction.modifyLine(can, line, value) + }} ] }]).tr return line }, - modifyLine: function(can, target, value) { var p = can.onsyntax._parse(can, value) - typeof p == "object"? can.page.Appends(can, target, [p]): target.innerHTML = p + rerankLine: function(can, value) { can.max = 0 + can.page.Select(can, can.ui.content, "tr", function(item, index) { + can.max++, can.page.Select(can, item, "td.line", function(item) { + item.innerText = index+1 + }) + }) }, - selectLine: function(can, target) { if (target !== 0 && !target) { return } - can.page.Select(can, can.ui.content, "pre.item", function(item, index) { + modifyLine: function(can, line, value) { + can.page.Select(can, can.ui.content, "tr", function(item, index) { + if (item != line && index+1 != line) { return } + + can.page.Select(can, item, "td.text", function(item) { + var p = can.onsyntax._parse(can, value) + typeof p == "object"? can.page.Appends(can, item, [p]): item.innerHTML = p + }) + }) + }, + selectLine: function(can, line) { if (!line) { return } + can.page.Select(can, can.ui.content, "tr", function(item, index) { can.page.ClassList.del(can, item, "select") - if (item != target && index+1 != target) { return } + if (item != line && index+1 != line) { return } + + can.Status("文件名", can.file) + can.Status("解析器", can.parse) + can.Status("当前行", can.onexport.position(can, index+1)) can.page.ClassList.add(can, item, "select") can.Option("line", index+1) + line = item + }) - target = item, can.Status("当前行", can.onexport.position(can, index)) - can.Status("文件名", can.file), can.Status("解析器", can.parse) - can.Status("模式", "normal") - can.page.Select(can, can.ui.preview, "div.item", function(item, i) { - can.page.ClassList[index==i? "add": "del"](can, item, "select") - }) - }); if (typeof target != "object") { return }; can.current = target - if (target.offsetTop < can.ui.profile.scrollTop || target.offsetTop > can.ui.profile.scrollTop+can.ui.profile.offsetHeight) { - can.ui.profile.scrollTo(0, target.offsetTop-160) - } + can.page.Select(can, line, "td.text", function(item) { + can.current = { + scroll: function(x, y) { return can.ui.profile.parentNode.scrollBy(x, y) }, + offset: function() { return can.ui.profile.parentNode.scrollTop }, + window: function() { return can.ui.profile.parentNode.offsetHeight }, + height: function() { return line.offsetHeight }, + prev: function() { return line.previousSibling }, + next: function() { return line.nextSibling }, + text: function(what) { + what != undefined && can.onaction.modifyLine(can, line, what) + return item.innerText + }, + target: line, + } - can.ui.editor && can.page.Modify(can, can.ui.editor, {className: "editor "+can.mode, value: can.current.innerText, style: { - height: target.offsetHeight, width: target.offsetWidth, - left: target.offsetLeft, top: target.offsetTop - target.parentNode.parentNode.scrollTop, - display: "block", - }}) - - can.ui.command && can.page.Modify(can, can.ui.command, {style: { - height: target.offsetHeight, width: target.offsetWidth, - left: target.offsetLeft, - }}) + can.ui.editor && can.page.Modify(can, can.ui.editor, {className: "editor "+can.mode, value: item.innerText, style: { + height: item.offsetHeight, width: item.offsetWidth, + left: item.offsetLeft, top: item.offsetTop, + }}) + can.ui.command && can.page.Modify(can, can.ui.command, {className: "command "+can.mode, value: item.innerText, style: { + height: item.offsetHeight, width: item.offsetWidth, + left: item.offsetLeft, top: item.offsetTop + can.ui.profile.offsetHeight-100, + }}) + }) }, searchLine: function(event, can, value) { value = value.trim() can.page.Modify(can, can.ui.search, {style: {display: ""}}) @@ -295,11 +316,11 @@ Volcanos("onaction", {help: "控件交互", list: [], }) Volcanos("onexport", {help: "导出数据", list: ["模式", "按键", "文件名", "解析器", "当前行", "标签数"], position: function(can, index, total) { total = total || can.max - return (parseInt(index)+1)+"/"+parseInt(total)+" = "+parseInt((index+1)*100/total)+"%" + return (parseInt(index))+"/"+parseInt(total)+" = "+parseInt((index)*100/total)+"%" }, content: function(can) { - return can.page.Select(can, can._output, "div.content>pre.item", function(item) { - return can.current == item? can.editor.value: item.innerText + return can.page.Select(can, can._output, "table.content>td.text", function(item) { + return item.innerText }).join("\n") }, }) diff --git a/plugin/local/code/vimer.css b/plugin/local/code/vimer.css index 81618ba4..23860394 100644 --- a/plugin/local/code/vimer.css +++ b/plugin/local/code/vimer.css @@ -9,8 +9,16 @@ fieldset.editor>div.output input.editor { min-width:480px; display:none; } +fieldset.editor>div.output input.editor.insert { + caret-color:yellow; + display:block; +} fieldset.editor>div.output input.editor.normal { - caret-color:#00000000; + caret-color:blue; + display:block; +} +fieldset.editor>div.output input.editor.command { + display:none; } fieldset.editor>div.output input.command { clear:both; @@ -25,4 +33,11 @@ fieldset.editor>div.output input.command { border-left:solid 3px green; z-index:200; min-width:480px; + display:block; +} +fieldset.editor>div.output input.command.normal { + display:none; +} +fieldset.editor>div.output input.command.insert { + display:none; } diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 615e91ec..a537ae20 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -1,15 +1,14 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.require(["/plugin/local/code/inner.js"], function(can) { can.onimport._init(can, msg, list, function() { - // can.page.Modify(can, can._option, {style: {display: "none"}}) var ui = can.page.Append(can, can.ui.profile, [ - {view: ["editor", "input"], "rows": "1", onkeydown: function(event) { - can.onkeypop.show(event, can) - can.onkeymap.parse(event, can, "insert"), can.Timer(10, function() { - can.onaction.modifyLine(can, can.current, can.editor.value) + {view: ["editor", "input"], onkeydown: function(event) { + can.onkeymap.parse(event, can, "insert") + can.Timer(1, function() { + can.current.text(can.ui.editor.value) }) }, onblur: function(event) { - can.onaction.modifyLine(can, can.current, can.editor.value) + can.current.text(can.ui.editor.value) }, onclick: function(event) { can.onkeymap._insert(can) }}, @@ -17,48 +16,41 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onkeymap.parse(event, can, "command") }}, ]) + can.ui.editor = ui.editor can.ui.command = ui.command can.onkeymap._init(can, "insert") - can.ui.profile.onscroll = function(event) { var target = can.current - can.ui.editor && can.page.Modify(can, can.ui.editor, {className: "editor "+can.mode, value: target.innerText, style: { - height: target.offsetHeight, width: target.offsetWidth, - left: target.offsetLeft, top: target.offsetTop - target.parentNode.parentNode.scrollTop, - display: "block", - }}) - } typeof cb == "function" && cb() }, target) }) }, }, ["/plugin/local/code/vimer.css"]) Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert"], _init: function(can, mode) { - can.page.Modify(can, can.ui.command, {style: {display: "none", width: can._target.offsetWidth-20+"px"}}) - - can.history = [], can.editor = can.ui.editor + can.history = [] can.core.List(can.onkeymap.list, function(item) { var engine = {} can.core.Item(can.onkeymap[item], function(key, cb) { var map = engine for (var i = key.length-1; i > -1; i--) { map = map[key[i]] = i == 0? cb: (map[key[i]]||{}) } }), can.onkeymap[item]._engine = engine - }), can.onkeymap._mode(can, mode||"normal") + }) + can.onkeymap._mode(can, mode||"normal") }, _mode: function(can, value) { can.Status("模式", can.mode = value) - can.page.Modify(can, can.ui.editor, {className: "editor "+can.mode, style: {display: "none"}}) - can.page.Modify(can, can.ui.command, {className: "command "+can.mode, style: {display: "none"}}) + can.page.Modify(can, can.ui.editor, {className: "editor "+can.mode}) + can.page.Modify(can, can.ui.command, {className: "command "+can.mode}) return value }, _command: function(can) { can.onkeymap._mode(can, "command") - can.page.Modify(can, can.ui.command, {value: "", style: {display: "block"}}) + can.page.Modify(can, can.ui.command, {style: { + position: "absolute", top: can.current.offset()+can.current.window()-can.current.height(), + }}) can.ui.command.focus() }, _normal: function(can) { can.onkeymap._mode(can, "normal") - can.page.Modify(can, can.ui.editor, {style: {display: "block"}}) can.ui.editor.focus() }, _insert: function(can) { can.onkeymap._mode(can, "insert") - can.page.Modify(can, can.ui.editor, {style: {display: "block"}}) can.ui.editor.focus() }, @@ -67,8 +59,10 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" var msg = can.request(event); msg.Option("content", can.onexport.content(can)) can.run(event, arg||["action", key, can.Option("path"), can.Option("file")], cb||function(msg) { (msg.Result() || msg.append && msg.append.length > 0) && can.page.Modify(can, can.ui.display, {innerHTML: "", style: {display: "block"}}) - can.onappend.table(can, can.ui.display, "table", msg) - can.onappend.board(can, can.ui.display, "board", msg) + can.onappend.table(can, can.ui.output, "table", msg, function(value, key, index) { + return {text: [value, "td"]} + }) + can.onappend.board(can, can.ui.output, "board", msg) }, true) }, _engine: { @@ -104,12 +98,12 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" } }, command: { - Escape: function(event, can) { can.onkeymap._normal(can) - can.onaction.selectLine(can, can.current) + Escape: function(event, can) { + can.onkeymap._normal(can) }, Enter: function(event, can) { var line = can.ui.command.value; var ls = can.core.Split(line, " ", ",", {simple: true}) var cb = can.onkeymap._engine[ls[0]]; typeof cb == "function"? cb(event, can, line, ls): - can.onkeymap._remote(event, can, line, ["action", "cmd"].concat(ls)) + can.onkeymap._remote(event, can, line, ["action", "command"].concat(ls)) can.onkeymap.command.Escape(event, can) }, jk: function(event, can) { can.history = can.history.slice(0, -1) @@ -117,137 +111,143 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" }, }, normal: { - ":": function(event, can) { can.onkeymap._command(can) }, + ":": function(event, can) { + can.ui.command.value = "" + can.onkeymap._command(can) + }, ".": function(event, can) { can.history = can.lastcmd can.onkeymap.parse({key: ""}, can, "normal") }, h: function(event, can) { - can.editor.setSelectionnRange(can.editor.selectionStart-1, can.editor.selectionStart-1) + can.ui.editor.setSelectionnRange(can.ui.editor.selectionStart-1, can.ui.editor.selectionStart-1) }, l: function(event, can) { - can.editor.setSelectionRange(can.editor.selectionStart+1, can.editor.selectionStart+1) + can.ui.editor.setSelectionRange(can.ui.editor.selectionStart+1, can.ui.editor.selectionStart+1) }, j: function(event, can) { - can.onaction.selectLine(can, can.current.nextSibling) - var pos = can.current.offsetTop-can._target.scrollTop; if (pos > 22*15) { - can._target.scrollBy(0, 22) - can.onaction.selectLine(can, can.current) + can.onaction.selectLine(can, can.current.next()) + var pos = can.current.offset()+can.current.window()-can.ui.editor.offsetTop; if (pos < 5*can.current.height()) { + can.current.scroll(0, can.current.height()) } }, - k: function(event, can) { can.onaction.selectLine(can, can.current.previousSibling) - var pos = can.current.offsetTop-can._target.scrollTop; if (pos < 22*5) { - can._target.scrollBy(0, -22) + k: function(event, can) { + can.onaction.selectLine(can, can.current.prev()) + var pos = can.ui.editor.offsetTop-can.current.offset(); if (pos < can.current.height()*5) { + can.current.scroll(0, -can.current.height()) } }, gg: function(event, can, count) { count = count || 1 can.onaction.selectLine(can, count) - can.current.scrollIntoView() - can._target.scrollBy(0, -22*5) - can.onaction.selectLine(can, count) + var pos = can.current.offset()-can.ui.editor.offsetTop + can.current.scroll(0, -(pos+can.current.height()*5)) return true }, G: function(event, can, count) { count = count > 1? count: can.max can.onaction.selectLine(can, count) - can.current.scrollIntoView() - if (count - can.max < -5) { - can._target.scrollBy(0, -22*5) - } - can.onaction.selectLine(can, count) + var pos = can.current.offset()-can.ui.editor.offsetTop + can.current.scroll(0, -(pos+can.current.height()*5)) return true }, zt: function(event, can, count) { count = count || 2 - can.current.scrollIntoView() - can._target.scrollBy(0, -22*count) + var pos = can.current.offset()-can.ui.editor.offsetTop + can.current.scroll(0, -(pos+can.current.height()*count)) return true }, zz: function(event, can, count) { count = count || 5 - can.current.scrollIntoView() - can._target.scrollBy(0, -22*count) + var pos = can.current.offset()-can.ui.editor.offsetTop + can.current.scroll(0, -(pos+can.current.height()*count)) return true }, zb: function(event, can, count) { count = count || 3 - can._target.scrollBy(0, -(can._target.offsetHeight - (can.current.offsetTop - can._target.scrollTop))+22*count) + var pos = can.current.offset()-can.ui.editor.offsetTop + can.current.scroll(0, -(pos+can.current.window()-can.current.height()*count)) return true }, i: function(event, can) { can.onkeymap._insert(can) }, I: function(event, can) { can.onkeymap._insert(can) - can.editor.setSelectionRange(0, 0) + can.ui.editor.setSelectionRange(0, 0) }, a: function(event, can) { can.onkeymap._insert(can) }, A: function(event, can) { can.onkeymap._insert(can) - can.editor.setSelectionRange(-1, -1) + can.ui.editor.setSelectionRange(-1, -1) }, o: function(event, can) { can.onkeymap._insert(can) - can.onaction.selectLine(can, can.onkeymap.insertLine(can, can.current)) + can.onaction.selectLine(can, can.onkeymap.insertLine(can, "", can.current.next())) }, O: function(event, can) { can.onkeymap._insert(can) - can.onaction.selectLine(can, can.onkeymap.insertLine(can, can.current, "", true)) + can.onaction.selectLine(can, can.onkeymap.insertLine(can, "", can.current.target)) }, - yy: function(event, can) { can.last = can.current.innerText }, - dd: function(event, can) { can.last = can.current.innerText - var next = can.current.nextSibling || can.current.previousSibling - can.onkeymap.deleteLine(can, can.current) + yy: function(event, can) { can.last = can.current.text() }, + dd: function(event, can) { can.last = can.current.text() + var next = can.current.next() + can.onkeymap.deleteLine(can, can.current.target) can.onaction.selectLine(can, next) }, p: function(event, can) { - can.onkeymap.insertLine(can, can.current, can.last) - can.onaction.selectLine(can, can.current.nextSibling) + can.onkeymap.insertLine(can, can.last, can.current.next()) }, P: function(event, can) { - can.onkeymap.insertLine(can, can.current, can.last, true) - can.onaction.selectLine(can, can.current.previousSibling) + can.onkeymap.insertLine(can, can.last, can.current.target) }, }, insert: { Escape: function(event, can) { can.onkeymap._normal(can) - can.onaction.modifyLine(can, can.current, can.editor.value) + can.onaction.modifyLine(can, can.current, can.ui.editor.value) event.stopPropagation(), event.preventDefault() }, Enter: function(event, can) { - var before = can.editor.value.slice(0, event.target.selectionEnd) - var left = can.editor.value.slice(event.target.selectionEnd) - left && can.onaction.modifyLine(can, can.current, before) - can.onaction.selectLine(can, can.onkeymap.insertLine(can, can.current, left)) - can.editor && can.editor.setSelectionRange(0, 0) + var before = can.ui.editor.value.slice(0, event.target.selectionEnd) + var left = can.ui.editor.value.slice(event.target.selectionEnd) + can.current.text(before||"") + can.onaction.selectLine(can, can.onkeymap.insertLine(can, left, can.current.next())) + can.ui.editor && can.ui.editor.setSelectionRange(0, 0) }, - Backspace: function(event, can) { if (can.editor.selectionStart > 0) { return } - can.onkeymap.mergeLine(can, can.current.previousSibling) + Backspace: function(event, can) { + if (can.ui.editor.selectionStart > 0) { return } event.stopPropagation(), event.preventDefault() + if (!can.current.prev()) { return } + + var rest = can.current.text() + can.onaction.selectLine(can, can.current.prev()) + var pos = can.current.text().length + + rest = can.current.text()+rest + can.ui.editor.value = rest + can.current.text(rest) + can.ui.editor.setSelectionRange(pos, pos) + + can.onkeymap.deleteLine(can, can.current.next()) }, ArrowDown: function(event, can) { - can.onaction.selectLine(can, can.current.nextSibling) + can.onaction.selectLine(can, can.current.next()) + can.ui.editor.setSelectionRange(can.ui.editor.selectionStart, can.ui.editor.selectionEnd) }, ArrowUp: function(event, can) { - can.onaction.selectLine(can, can.current.previousSibling) + can.onaction.selectLine(can, can.current.prev()) + can.ui.editor.setSelectionRange(can.ui.editor.selectionStart, can.ui.editor.selectionEnd) }, jk: function(event, can) { - can.page.DelText(can.editor, can.editor.selectionStart-1, 1) + can.page.DelText(can.ui.editor, can.ui.editor.selectionStart-1, 1) can.onkeymap.insert.Escape(event, can) }, }, - insertLine: function(can, target, value, before) { var line = can.onaction.appendLine(can, value) - can.ui.content.insertBefore(line, before || target && target.nextSibling) + insertLine: function(can, value, before) { + var line = can.onaction.appendLine(can, value) + before && can.ui.content.insertBefore(line, before) + can.onaction.rerankLine(can) return line }, - deleteLine: function(can, target) { can.page.Remove(can, target) - var ls = can.page.Select(can, can.ui.preview, "div.item") - can.page.Remove(can, ls[ls.length-1]), can.max-- - }, - mergeLine: function(can, target) { if (!target) {return} - var before = target.innerText - can.onaction.modifyLine(can, target, before + target.nextSibling.innerText) - can.onkeymap.deleteLine(can, target.nextSibling) - can.onaction.selectLine(can, target) - can.ui.editor.setSelectionRange(before.length, before.length) - return target + deleteLine: function(can, target) { + can.page.Remove(can, target) + can.onaction.rerankLine(can) }, })