diff --git a/plugin/table.js b/plugin/table.js index a858c841..5d6c0bf0 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -78,8 +78,10 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( _icon: function(can, name, button, target) { can.page.Append(can, target, [{text: [can.page.unicode[name]||name, html.SPAN, html.ICON], onclick: function(event) { can.base.isFunc(button)? button(event, button): can.onaction[button](event, can, button), can.onkeymap.prevent(event) }}]) }, - icon: function(can, msg, target, cb) { return msg.Table(function(value) { value.icon = can.misc.PathJoin(value.icon||can.page.drawText(can, value.name, 80)) - return can.page.Append(can, target, [{view: html.ITEM, list: [{view: html.ICON, list: [{img: value.icon+(value.space? "?pod="+value.space: "")}]}, {view: [mdb.NAME, "", value.name]}], _init: function(target) { + icon: function(can, msg, target, cb) { return msg.Table(function(value) { + var space = value.space||can.ConfSpace(); value.icon && (value.icon = can.base.MergeURL(value.icon, ice.POD, space)) + value.icon = can.misc.PathJoin(value.icon||can.page.drawText(can, value.name, 80)) + return can.page.Append(can, target, [{view: html.ITEM, list: [{view: html.ICON, list: [{img: value.icon}]}, {view: [mdb.NAME, "", value.name]}], _init: function(target) { cb && cb(target, value) }, onclick: function(event) { can.sup.onexport.record(can.sup, value.name, mdb.NAME, value) }}])._target }) }, diff --git a/proto.js b/proto.js index 503b2f38..03b27e52 100644 --- a/proto.js +++ b/proto.js @@ -101,8 +101,8 @@ var Volcanos = shy({ ConfDefault: function(value) { can.core.Item(value, function(k, v) { can.Conf(k) || can.Conf(k, v) }) }, ConfHeight: function(value) { return can.Conf(html.HEIGHT, value) }, ConfWidth: function(value) { return can.Conf(html.WIDTH, value) }, - ConfSpace: function() { return can.Conf(web.SPACE) }, - ConfIndex: function() { return can.Conf(ctx.INDEX) }, + ConfSpace: function() { return can.Conf(web.SPACE)||can.Conf("_space") }, + ConfIndex: function() { return can.Conf(ctx.INDEX)||can.Conf("_index") }, Conf: function(key, value) { var res = can._conf for (var i = 0; i < arguments.length; i += 2) { if (typeof key == code.OBJECT) { res = can.core.Value(can._conf, arguments[i]), i--; continue }