diff --git a/lib/user.js b/lib/user.js index df3efaf9..ba14f2c8 100644 --- a/lib/user.js +++ b/lib/user.js @@ -121,11 +121,10 @@ Volcanos("user", {info: {}, agent: { item.type = item.type||(item.values? html.SELECT: item.name == html.TEXT? html.TEXTAREA: html.TEXT), need[item.name] = item.need item._init = function(target) { if (item.type == html.PASSWORD || item.type == html.USERNAME) { return } if (item.name && item.name != ctx.ACTION) { target.value = msg.Option(item.name)||can.Option(item.name)||target.value||"" } - item.run = item.run||function(event, cmds, cb) { var _msg = can.request(event, {_handle: ice.TRUE, action: msg.Option(html.ACTION)}, msg, can.Option()) + item.mode = chat.SIMPLE, can.onappend.figure(can, can.base.Copy({run: function(event, cmds, cb) { var _msg = can.request(event, {_handle: ice.TRUE, action: msg.Option(html.ACTION)}, msg, can.Option()) can.page.Select(can, ui.table, html.OPTION_ARGS, function(item) { item.name && item.value && _msg.Option(item.name, item.value) }) can.run(event, cmds, cb, true) - }, item._enter = function(event) { return action.submit(event, can, html.SUBMIT), true } - item.mode = chat.SIMPLE, can.onappend.figure(can, item, target) + }, _enter: function(event) { return action.submit(event, can, html.SUBMIT), true }}, item), target) }; return {type: html.TR, list: [{type: html.TD, list: [{text: item.name||""}, {text: item.need == "must"? "*": "", style: {color: cli.RED}}]}, {type: html.TD, list: [can.page.input(can, item)]}]} })}]}, html.ACTION, ]}]) diff --git a/page/index.css b/page/index.css index 38516904..8e04d571 100644 --- a/page/index.css +++ b/page/index.css @@ -127,7 +127,7 @@ select:hover { background-color:gray; color:cyan; } input[type=button]:hover { background-color:gray; } input:not([type=button]):not([type=file]):hover { background-color:white; } input[name=cmd]:hover { background-color:cyan; color:black; } -div.tabs:hover, div.tabs.select, div.item:hover, div.item.select, table.content tr:hover, table.content tr.select, h1:hover, h2:hover, h3:hover, .select { background-color:steelblue; } +div.tabs:hover, div.tabs.select, div.item:hover, div.item.select, table.content tr:hover, table.content tr.select, h1:hover, h2:hover, h3:hover { background-color:steelblue; } div.story[data-type=spark] span:hover { background-color:deepskyblue; box-shadow:4px 4px 20px 4px #29318e; } table.content th:hover, table.content td:hover, table.content td.select { background-color:cornflowerblue; } body>div.carte div.item:hover { background-color:cornflowerblue; } @@ -141,7 +141,7 @@ fieldset:not(.float):not(.full)>form.option input[type=button][name=close]{ disp div.output, div.status, div.project div.item, div.content, div.item.textarea, div.code, div.story[data-type=spark] { clear:both; } div.action, div.output, div.status, div.project, div.display, div.profile, div.content, div.code, div.story, table.content, table.content td, body>div.toast { overflow:auto; } legend, form.option, form.option>div.item, div.action, div.action>div.item, div.action>div.tabs, div.status>div.item { float:left; } -div.status>legend { margin-left:5px; margin-right:0; float:right; clear:none; } +div.status>legend { margin-left:2px; margin-right:0; float:right; clear:none; } fieldset.auto, fieldset.full, fieldset.float, body>div.float { position:fixed; z-index:10; } /* white */ body.black a { color:yellow; } diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 251eab86..8460c6b5 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -197,7 +197,7 @@ Volcanos(chat.ONACTION, { }, _selectLine: function(can) { if (!can.current) { return } can.page.Select(can, can.current.line, "td.text", function(td) { var target = can.ui.current; target.value = td.innerText - can.current.line.appendChild(target), can.page.style(can, target, html.LEFT, td.offsetLeft-1, html.TOP, td.offsetTop, html.WIDTH, can.base.Min(td.offsetWidth, can.ui._content.offsetWidth)) + can.current.line.appendChild(target), can.page.style(can, target, html.LEFT, td.offsetLeft-2, html.TOP, td.offsetTop-1, html.WIDTH, can.base.Min(td.offsetWidth, can.ui._content.offsetWidth)) if (event && event.type == "click") { can.onkeymap._insert(event, can, 0, (event.offsetX)/12-1) } else { can.onaction.scrollHold(can, 0) } }) },