diff --git a/frame.js b/frame.js index 8beadeae..30ba5be2 100644 --- a/frame.js +++ b/frame.js @@ -209,8 +209,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { Update: can.Update, Option: can.Option, Action: can.Action, Status: can.Status, }, [display, chat.PLUGIN_TABLE_JS], function(sub) { sub.Conf(can.Conf()) sub.run = function(event, cmds, cb, silent) { - can.request(event).RunAction(event, sub, cmds) || can.Update(event, can.Input(cmds, !silent), cb||function(msg) { - }, silent) + can.request(event).RunAction(event, sub, cmds) || can.Update(event, can.Input(cmds, !silent), cb, silent) }, can._outputs && can._outputs.push(sub), sub.sup = can sub._index = can._index, sub._msg = msg, sub.Conf(sub._args = can.base.ParseURL(display)) diff --git a/plugin/local/code/inner/syntax.js b/plugin/local/code/inner/syntax.js index 72a0b64e..54adb113 100644 --- a/plugin/local/code/inner/syntax.js +++ b/plugin/local/code/inner/syntax.js @@ -77,10 +77,10 @@ Volcanos(chat.ONSYNTAX, { }, regexp: { "^u_\\w $": code.DATATYPE, - "^\\w _t$": code.DATATYPE, - "^\\w _pt$": code.DATATYPE, - "^[-]*\\d $": code.CONSTANT, - "^[A-Z0-9_] $": code.CONSTANT, + "^\\w+_t$": code.DATATYPE, + "^\\w+_pt$": code.DATATYPE, + "^[-]*\\d+$": code.CONSTANT, + "^[A-Z0-9_]+$": code.CONSTANT, }, keyword: { "#include": code.KEYWORD, diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index e3fde085..bacd0e45 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -19,7 +19,7 @@ fieldset.word ul.story[data-type=endmenu] { clear:both; } fieldset.word p.story[data-name=inner] { background-color:#4b6c8a7a; padding:4px 10px; border-left:solid 4px blue; margin:10px 0px; } fieldset.word p.story[data-name=inner]:hover { background-color:#c10c8a; cursor:copy; } fieldset.word table.content { display:block; max-height:400px; } -fieldset.word fieldset.story { margin:10px; background-color:#58a4d37d; } +fieldset.word>div.output>fieldset.story { margin:10px; background-color:#58a4d37d; } fieldset.word fieldset.story.full { margin:0px; } fieldset.word fieldset.story.float { margin:0px; } diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 9b0f982b..5940593c 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -79,9 +79,11 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( }, field: function(can, meta, target, width) { var item = can.base.Obj(meta.meta) can.onappend._init(can, item, [chat.PLUGIN_STATE_JS], function(sub) { - sub.run = function(event, cmds, cb, silent) { var msg = can.request(event) + sub.run = function(event, cmds, cb, silent) { var msg = sub.request(event) if (msg.Option(nfs.PATH) == can.Option(nfs.PATH)) { msg.Option(nfs.PATH, "") } - can.runAction(event, chat.STORY, can.misc.concat(can, [meta.type, meta.name, meta.text], cmds), cb, true) + can.runAction(event, chat.STORY, can.misc.concat(can, [meta.type, meta.name, meta.text], cmds), cb||function(msg) { + if (msg._can == sub && can.core.CallFunc([sub, chat.ONIMPORT, ice.MSG_PROCESS], {can: sub, msg: msg})) { return } + }, true) }, can._plugins = (can._plugins||[]).concat([sub]) sub.ConfHeight(can.base.Min(300, can.ConfHeight()-300)), sub.ConfWidth(item.width = (width||can.ConfWidth())-(can.user.isWindows? 40: 20)) diff --git a/plugin/state.js b/plugin/state.js index 7c452b06..0a9abf3e 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -70,7 +70,7 @@ Volcanos(chat.ONIMPORT, {_process: function(can, msg) { }, _grow: function(can, msg, _arg) { var sub = can.core.Value(can, chat._OUTPUTS_CURRENT) if (sub && sub.onimport && sub.onimport.grow) { return sub.onimport.grow(sub, msg, _arg), true } - + _arg = can.page.Color(_arg) if (can.page.Select(can, can._output, html.DIV_CODE, function(div) { return can.page.style(can, div, html.MAX_HEIGHT, 400), can.page.Append(can, div, [{text: _arg}]), div.scrollBy(0, 10000), true }).length == 0) { can.onappend.board(can, _arg) } return true