diff --git a/frame.js b/frame.js index 53faed3f..412e8a06 100644 --- a/frame.js +++ b/frame.js @@ -430,9 +430,14 @@ Volcanos(chat.ONMOTION, {_init: function(can, target) { spark: function(can, meta, target) { meta[mdb.NAME] == html.INNER? can.onmotion.copy(can, target): can.page.Select(can, target, html.SPAN, function(item) { can.onmotion.copy(can, item) }) }, + audio: function(can, meta, target) { + }, }, auto: function(can, target) { var that = this; target = target||can._output - can.page.Select(can, target, wiki.STORY_ITEM, function(item) { var meta = item.dataset; can.page.style(can, item, can.base.Obj(meta.style)), can.core.CallFunc(that._hash[meta.type], [can, meta, target]) }) + can.page.Select(can, target, wiki.STORY_ITEM, function(item) { var meta = item.dataset; can.page.style(can, item, can.base.Obj(meta.style)), + can.core.CallFunc(that._hash[meta.type]||that._hash[target.tagName], [can, meta, target]) + can.core.CallFunc(that._hash[meta.type], [can, meta, target]) + }) can.page.Select(can, target, html.INPUT_BUTTON, function(target) { if (target.value == target.name) { target.value = can.user.trans(can, target.name) } }) can.page.Select(can, target, html.IFRAME, function(item) { can.page.style(can, item, html.HEIGHT, can.ConfHeight()-88, html.WIDTH, can.ConfWidth()-30) }) }, diff --git a/lib/user.js b/lib/user.js index 8d5860b8..4954719d 100644 --- a/lib/user.js +++ b/lib/user.js @@ -54,7 +54,7 @@ Volcanos("user", {info: {}, agent: { "create": "创建", "remove": "删除", "insert": "添加", "delete": "删除", "modify": "修改", "prunes": "清理", "export": "导出", "import": "导入", "link": "链接", "copy": "复制", "edit": "编辑", "save": "保存", "trash": "删除", "share": "共享", "toimage": "截图", "download": "下载", "run": "执行", "list": "查看", "back": "返回", "prev": "上一页", "next": "下一页", - "source": "源码", "module": "模块", "recent": "最近", + "source": "源码", "module": "模块", "action": "操作", "recent": "最近", "open": "打开", "close": "关闭", "start": "启动", "stop": "停止", diff --git a/page/index.css b/page/index.css index 040fc0c7..e23c434d 100644 --- a/page/index.css +++ b/page/index.css @@ -39,9 +39,9 @@ table.content.action td:last-child { background-color:steelblue; position:sticky div.code { background-color:#343a3445; color:white; padding:10px; border:solid 2px green; } div.story[data-type=spark] { background-color:#2169a9a6; color:white; padding:5px 10px; border-left:solid 5px blue; margin:10px; } -form.option>div.item { height:31px; } form.option>div.item.textarea { height:unset; } -div.action>div.item { height:31px; } +// form.option>div.item { height:31px; } +// div.action>div.item { height:31px; } div.output { position:relative; } div.output div.project div.item { padding:2px 10px; } div.output div.project div.list { margin-left:10px; } @@ -65,7 +65,8 @@ fieldset.float>form.option input[type=button][name=close]{ display:block; } fieldset.full>form.option input[type=button][name=close]{ display:block; } fieldset.plug>form.option input[type=button][name=close]{ display:block; } -fieldset.plugin>div.status { border-top:1px solid darkcyan; height:30px; } +// fieldset.plugin>div.status { border-top:1px solid darkcyan; height:30px; } +fieldset.plugin>div.status { border-top:1px solid darkcyan; } fieldset.story>div.status { border-top:1px solid darkcyan; } fieldset.output { padding:0; margin:0; } fieldset.output>form.option { display:none; } diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index bc0aa362..3aa89ea4 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -6,7 +6,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar can.page.Modify(can, target, msg.Result()) can.page.Select(can, target, wiki.STORY_ITEM, function(item) { var data = item.dataset||{} can.page.style(can, item, can.base.Obj(data.style)) - can.core.CallFunc([can.onimport, data.type], [can, data, item]) + can.core.CallFunc([can.onimport, data.type||item.tagName.toLowerCase()], [can, data, item]) }) can.user.isMobile && can.isCmdMode() && can.page.style(can, can._output, html.MAX_HEIGHT, can.ConfHeight()+2*html.ACTION_HEIGHT) }, @@ -121,6 +121,11 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar // can.page.style(can, target, html.MAX_HEIGHT, can.ConfHeight()/(can.user.isMobile? 2: 1), html.MAX_WIDTH, can.ConfWidth()) can.page.style(can, target, html.MAX_WIDTH, can.ConfWidth()) }, + audio: function(can, data, target) { + can.page.insertBefore(can, [{name: "play", value: "play", button: ["play", function(event) { + target.play() + }]}], target) + }, field: function(can, data, target, width) { var item = can.base.Obj(data.meta) can.onappend._init(can, item, [chat.PLUGIN_STATE_JS], function(sub) { can._plugins = (can._plugins||[]).concat([sub])