diff --git a/lib/misc.js b/lib/misc.js index 1395f4ec..60376504 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -107,8 +107,9 @@ Volcanos("misc", { can.onappend.style(can, "warn", can.user.toastFailure(can, msg.Result())._target) input.focus() } else { - can.Update() input.cancel() + var sup = can._fields? can.sup: can; if (sup.onimport._process(sup, msg)) { return } + can.Update() } }); return true }); return true diff --git a/plugin/input/key.js b/plugin/input/key.js index 9be6e2d4..1dea0ea2 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -29,7 +29,8 @@ Volcanos(chat.ONFIGURE, {key: { target.value = value, can.onmotion.hidden(can, can._target) } can.core.CallFunc([can.oninputs, "_show"], {event: event, can: can, msg: msg, target: target, name: name}) - can.core.CallFunc([can.sup.sub, "oninputs", name], {event: event, can: can, msg: msg, target: target, name: name}) + var style = msg.Option(ice.MSG_DISPLAY)? can.base.ParseURL(msg.Option(ice.MSG_DISPLAY)).style||name: name + can.core.CallFunc([can.sup.sub, "oninputs", style], {event: event, can: can, msg: msg, target: target, name: name}) can.layout(msg) }, onfocus: function(event, can, meta, target, cbs, mod) { meta._force && mod.onclick(event, can, meta, target, cbs) }, diff --git a/plugin/table.js b/plugin/table.js index 90ed3725..64522331 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -290,15 +290,16 @@ Volcanos(chat.ONACTION, { }, }) Volcanos(chat.ONINPUTS, { - dream: function(event, can, msg, target, name) { + _nameicon: function(event, can, msg, target, name) { can.page.Appends(can, can._output, msg.Table(function(value) { return {view: html.ITEM, list: [{img: can.misc.Resource(can, value.icons)}, - {view: html.CONTAINER, list: [{view: [html.TITLE, "", value[name]]}, + {view: html.CONTAINER, list: [{view: [html.TITLE, "", value[name]||value[mdb.NAME]]}, can.onappend.label(can, value, {version: icon.version, time: icon.compile}), ]}, - ], onclick: function(event) { can.showIcons(value[name], value.icons) }} + ], onclick: function(event) { can.showIcons(value[name]||value[mdb.NAME], value.icons) }} })) }, + dream: function(event, can, msg, target, name) { can.sup.sub.oninputs._nameicon(event, can, msg, target, name) }, }) Volcanos(chat.ONKEYMAP, { escape: function(event, can) {}, enter: function(event, can) {},