From d4e8cbd4a9b95a244b16b470f8272ad54bd272fd Mon Sep 17 00:00:00 2001 From: harveyshao Date: Wed, 15 Feb 2023 19:32:17 +0800 Subject: [PATCH] opt some --- frame.js | 4 ++-- plugin/input.js | 2 +- plugin/local/code/vimer.js | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frame.js b/frame.js index 4c315bc5..77af8ac3 100644 --- a/frame.js +++ b/frame.js @@ -149,7 +149,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }), can.base.isFunc(cb) && cb(sub) }); return sub }, - _option: function(can, meta, option, skip) { meta = meta||{}; var index = -1, args = can.base.Obj(meta.args||meta.arg||meta.opt, []), opts = can.base.Obj(meta.opts, {}) + _option: function(can, meta, option, skip) { var index = -1, args = can.base.Obj(meta.args||meta.arg, []), opts = can.base.Obj(meta.opts, {}) function add(item, next) { item = can.base.isString(item)? {type: html.TEXT, name: item}: item, item.type != html.BUTTON && index++ return Volcanos(item.name, {_root: can._root, _follow: can.core.Keys(can._follow, item.name), _target: can.onappend.input(can, item, args[index]||opts[item.name], option||can._option), @@ -167,7 +167,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { can.onmotion.focus(can, sub._target, value), can.onmotion.delay(can, function() { can.Update() }) }) }) - } can.core.Next(can.base.getValid(can.core.Value(can, [chat.ONIMPORT, mdb.LIST]), can.base.Obj(meta.inputs, []))||[], add) + } can.core.Next(can.core.Value(can, [chat.ONIMPORT, mdb.LIST])||meta.inputs, add) }, _action: function(can, list, action, meta) { meta = meta||can.onaction||{}, action = action||can._action, can.onmotion.clear(can, action) function run(event, button) { can.misc.Event(event, can, function(msg) { diff --git a/plugin/input.js b/plugin/input.js index dfb49a58..be3572eb 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -1,5 +1,5 @@ Volcanos(chat.ONACTION, { - _init: function(can, meta, target) { meta.type == html.BUTTON && meta.action == ice.AUTO && can.sup._delay_init == undefined && target.click() }, + _init: function(can, meta, target) { meta.type == html.BUTTON && meta.action == ice.AUTO && can.base.isUndefined(can.sup._delay_init) && target.click() }, run: function(event, can) { can.run(event) }, refresh: function(event, can) { can.run(event) }, list: function(event, can) { can.sup.isSimpleMode() || can.run(event) }, back: function(event, can) { can.sup.onimport._back(can.sup) }, diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 091b01bd..e202ae46 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -284,11 +284,11 @@ Volcanos(chat.ONKEYMAP, { y: shy("向上滚屏", function(can) { can.current.scroll(-1) }), }, insert_ctrl: { - f: shy("光标右移", function(can, target) { can.onkeymap.cursorMove(target, 1) }), - b: shy("光标左移", function(can, target) { can.onkeymap.cursorMove(target, -1) }), - a: shy("光标行首", function(can, target) { can.onkeymap.cursorMove(target, 0, 0) }), - e: shy("光标行尾", function(can, target) { can.onkeymap.cursorMove(target, 0, -1) }), - d: shy("删除字符", function(can, target) { can.onkeymap.deleteText(target, target.selectionStart, 1) }), + f: shy("光标右移", function(can, target) { can.user.isWindows && can.onkeymap.cursorMove(target, 1) }), + b: shy("光标左移", function(can, target) { can.user.isWindows && can.onkeymap.cursorMove(target, -1) }), + a: shy("光标行首", function(can, target) { can.user.isWindows && can.onkeymap.cursorMove(target, 0, 0) }), + e: shy("光标行尾", function(can, target) { can.user.isWindows && can.onkeymap.cursorMove(target, 0, -1) }), + d: shy("删除字符", function(can, target) { can.user.isWindows && can.onkeymap.deleteText(target, target.selectionStart, 1) }), }, insert: { Escape: shy("退出编辑", function(event, can) { can.onkeymap._normal(can) }),