diff --git a/panel/action.js b/panel/action.js index 84c0acd2..93a7cab2 100644 --- a/panel/action.js +++ b/panel/action.js @@ -2,9 +2,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { var river = can.Conf(chat.RIVER), storm = can.Conf(chat.STORM), list = can.db.list can.onmotion.clear(can), can.core.Next(msg.Table(), function(item, next, index) { item.type = chat.PLUGIN, item.mode = can.Mode(); if (item.deleted == ice.TRUE) { return next() } item.width = can.ConfWidth()-can.Conf(html.MARGIN_X); if (item.style == html.OUTPUT) { item.width = can.ConfWidth()-2*html.PLUGIN_MARGIN-2*html.PLUGIN_PADDING } - if (msg.Length() == 1) { item.height = can.ConfHeight()-can.Conf(html.MARGIN_Y), can.base.isIn(item.index, - web.CHAT_MACOS_DESKTOP, web.CHAT_MESSAGE, web.WIKI_PORTAL) && (item.style = html.OUTPUT) } - list.length == 0 && item.index == "web.dream" && (list = [river, storm, item.index]) + if (msg.Length() == 1) { item.height = can.ConfHeight()-can.Conf(html.MARGIN_Y), can.base.isIn(item.index, web.CHAT_MACOS_DESKTOP, web.CHAT_MESSAGE, web.WIKI_PORTAL) && (item.style = html.OUTPUT) } + list.length == 0 && can.user.info.nodetype != web.WORKER && item.index == "web.dream" && (list = [river, storm, item.index]) can.onappend.plugin(can, item, function(sub, meta, skip) { if (meta.index == "can._notfound" && !can.misc.isDebug(can)) { return skip || next() } sub.onexport.output = function() { msg.Length() > 1 && can.onexport.isauto(can) && can.page.style(can, sub._output, html.HEIGHT, "", html.MAX_HEIGHT, "") } sub.onaction._close = function() { can.onengine.signal(can, chat.ONACTION_REMOVE, can.request({river: river, storm: storm}, item)), can.page.Remove(can, sub._target) } diff --git a/plugin/story/trends.js b/plugin/story/trends.js index e75eb961..63eb9b38 100644 --- a/plugin/story/trends.js +++ b/plugin/story/trends.js @@ -2,9 +2,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { can.page.requireDraw(can, function() { can.base.isFunc(cb) && cb(msg) can.Conf(html.VIEW) && can.Action(html.VIEW, can.Conf(html.VIEW)) can.onmotion.toggle(can, can._option, !can.user.isMobile) - can.onmotion.toggle(can, can._action, !can.user.isMobile) + can.onmotion.toggle(can, can._action, !can.user.isMobile && can.isCmdMode()) can.db.data = msg.Table(), can.onimport.layout(can) - can.onmotion.hidden(can, can._action) }) }, _sum: function(can) { if (can.db.list) { return can.db.list }