diff --git a/index.css b/index.css index 106e585b..b4f19c12 100644 --- a/index.css +++ b/index.css @@ -23,14 +23,13 @@ body.light { } body.dark { --plugin-bg-color:black; --plugin-fg-color:silver; - --code-keyword:royalblue; --code-comment:green; + --code-keyword:dodgerblue; --code-comment:green; --code-function:lightgreen; --code-constant:gray; --code-string:orange; --code-package:lightskyblue; --code-datatype:lavender; --code-object:silver; } body { --shadow-color:var(--disable-fg-color); --border-color:var(--disable-fg-color); - --notice-color:blue; --danger-color:red; - + --notice-color:blue; --danger-color:red; --code-bg-color:black; --code-fg-color:silver; --notice-bg-color:var(--notice-color); --notice-fg-color:white; --danger-bg-color:var(--danger-color); --danger-fg-color:var(--notice-fg-color); diff --git a/lib/misc.js b/lib/misc.js index f2d14c89..6ac3fe49 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -84,6 +84,9 @@ Volcanos("misc", { Dump: function(can) { can = can||msg._can; if (can.user.isNodejs) { return } can.onmotion.clear(can), can.onappend.table(can, msg), can.onappend.board(can, msg), can.onmotion.story.auto(can) }, + Show: function(can) { can = can||msg._can; if (can.user.isNodejs) { return } + can.onmotion.clear(can), can.onappend.table(can, msg), can.onappend.board(can, msg), can.onmotion.story.auto(can) + }, Defer: function(cb) { msg._defer = msg._defer||[] if (arguments.length == 0) { msg._defer = can.core.List(msg._defer.reverse(), function(cb) { can.base.isFunc(cb) && cb() }) } else { msg._defer.push(cb) } }, diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 27bdbcea..82451946 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -63,8 +63,13 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(html.PADDI }) } }, field: function(can, meta, target) { var item = can.base.Obj(meta.meta), padding = can.Conf(html.PADDING) - if (!item.width || parseInt(item.width) > can.ConfWidth()) { item.width = can.ConfWidth()-2*padding } - var width = item.width + if (!item.width || parseInt(item.width) > can.ConfWidth()) { item.width = can.ConfWidth()-2*padding } var width = item.width + can.core.Item(item, function(key, value) { + if (can.base.beginWith(key, "meta.")) { + can.core.Value(item, key, value) + delete(item[key]) + } + }) can.onappend.plugin(can, item, function(sub) { can._plugins = (can._plugins||[]).concat([sub]) sub.onimport.size(sub, can.base.Max(html.STORY_HEIGHT, can.ConfHeight()), sub.Conf("_width", width), true) var size = sub.onimport.size; sub.onimport.size = function(can, height, width, auto, mode) { size(can, height, width, auto, mode), can.page.style(can, sub._output, html.MAX_HEIGHT, "", "overflow-y", "hidden") }