diff --git a/panel/header.js b/panel/header.js index fb505a91..e8e64acd 100644 --- a/panel/header.js +++ b/panel/header.js @@ -111,10 +111,9 @@ Volcanos(chat.ONACTION, {_init: function(can) {}, msg.Option(mdb.PLUGIN) && can.onappend.plugin(can, {index: msg.Option(mdb.PLUGIN)}, function(sub) { can.onmotion.hidden(can, sub._target) }, document.body) msg.Option(nfs.SCRIPT) && can.require(can.base.Obj(msg.Option(nfs.SCRIPT)), function(can) { can.onaction.source(can, msg) }) var tool = can._root.Action._conf.tool - if (can.Conf(aaa.USERNICK, (msg.Option(aaa.USERNICK)||msg.Option(ice.MSG_USERNICK)||msg.Option(ice.MSG_USERNAME)).slice(0, 8)) || can.misc.Search(can, web.SHARE) - || tool && can.base.isIn(tool[0]._command, web.PORTAL, aaa.OFFER, aaa.APPLY)) { return show(msg) } - can.onlayout._init(can) - can.user.login(can, function() { can.onengine.signal(can, chat.ONMAIN, msg) }, msg) + if (can.Conf(aaa.USERNICK, (msg.Option(aaa.USERNICK)||msg.Option(ice.MSG_USERNICK)||msg.Option(ice.MSG_USERNAME)).slice(0, 8)) + || can.misc.Search(can, web.SHARE) || tool && can.base.isIn(can.user.info._cmd = tool[0]._command, "web.chat.oauth.client", web.PORTAL, aaa.OFFER, aaa.APPLY)) { return show(msg) } + can.onlayout._init(can), can.user.login(can, function() { can.onengine.signal(can, chat.ONMAIN, msg) }, msg) }) }) }, diff --git a/plugin/state.js b/plugin/state.js index afd87adf..4dff8ea5 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -42,7 +42,9 @@ Volcanos(chat.ONIMPORT, { }, _float: function(can, msg) { can.onimport._field(can, msg, function(sub) { can.onmotion.float(sub) }) }, _hold: function(can, msg, arg) { can.user.toast(can, arg||ice.SUCCESS) }, - _back: function(can) { can.onimport.back({}, can) }, + _back: function(can, msg, arg) { + debugger + arg? (history.go(arg), can.onmotion.delay(can, function() { can.onimport.back({}, can) })): can.onimport.back({}, can) }, _rich: function(can, msg) { var sub = can.sub function _rich() { if (sub._rich_list.length == 0) { return } if (sub._rich_running) { return } sub._rich_running = true