diff --git a/panel/action.js b/panel/action.js index 0857257b..94739774 100644 --- a/panel/action.js +++ b/panel/action.js @@ -55,7 +55,7 @@ Volcanos(chat.ONACTION, {_init: function(can, target) { }, can._output, can._action, can._header_tabs)) { if (msg.Option("refresh") != "true") { return can.onaction.layout(can) } } - can.run({}, [river, storm], function(msg) { + can.run(msg, [river, storm], function(msg) { if (msg.Length() == 0) { return can.user.isLocalFile? can.user.toastFailure(can, "miss data"): can.onengine.signal(can, chat.ONACTION_NOTOOL, can.request({}, {river: river, storm: storm})) } return can.onimport._init(can, msg) }) diff --git a/panel/footer.js b/panel/footer.js index 6de1309d..11530ad3 100644 --- a/panel/footer.js +++ b/panel/footer.js @@ -31,7 +31,9 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.Conf(NKEY, can. }) Volcanos(chat.ONACTION, {_init: function(can) { can.ui = {}, can.db = {} }, onsize: function(can) { can.ConfHeight(can._target.offsetHeight), can.ConfWidth(can._target.offsetWidth) }, - onlogin: function(can, msg) { can.run({}, [], function(msg) { can.onmotion.clear(can), can.onimport._init(can, msg, can._output) }) }, + onlogin: function(can, msg) { + var msg = can.request(); msg._method = web.GET + can.run(msg._event, [], function(msg) { can.onmotion.clear(can), can.onimport._init(can, msg, can._output) }) }, ontoast: function(can, msg) { can.core.CallFunc(can.onimport.ntip, {can: can, msg: msg}) }, onremote: function(can, msg) { can.core.CallFunc(can.onimport.ncmd, {can: can, msg: msg}) }, onlayout: function(can, layout) { can.onmotion.toggle(can, can._target, !layout || layout == html.TABS) }, diff --git a/panel/header.js b/panel/header.js index 3ea8b497..1abcec33 100644 --- a/panel/header.js +++ b/panel/header.js @@ -65,8 +65,9 @@ Volcanos(chat.ONACTION, {_init: function(can) { // can.user.info.language = msg.SearchOrOption(aaa.LANGUAGE)||navigator.language.split("-")[0], msg.Option(nfs.SCRIPT) && can.require(can.base.Obj(msg.Option(nfs.SCRIPT)), function(can) { can.onaction.source(can, msg) }) can.onmotion.clear(can), can.onimport._init(can, can.request(), can._output), can.onengine.signal(can, chat.ONLOGIN) } + var msg = can.request(); msg._method = web.GET can.base.beginWith(location.pathname, "/wiki/portal/", "/chat/cmd/web.wiki.portal/")? show(can.request()): - can.run({}, [], function(msg) { + can.run(msg._event, [], function(msg) { if (location.pathname == "/" && can.base.beginWith(msg.Option(ice.MAIN)||"", "/wiki/portal/", "/chat/cmd/web.wiki.portal/")) { return show(msg) } if (!can.Conf(aaa.USERNICK, msg.Option(aaa.USERNICK)||msg.Option(ice.MSG_USERNICK)||msg.Option(ice.MSG_USERNAME))) { return msg.Option(chat.SSO)? can.user.jumps(msg.Option(chat.SSO)): can.user.login(can, function() { can.onengine.signal(can, chat.ONMAIN, msg) }, msg.Option(aaa.LOGIN)) diff --git a/panel/river.js b/panel/river.js index a170b473..e0e1387b 100644 --- a/panel/river.js +++ b/panel/river.js @@ -18,7 +18,9 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { can.onimport._main(can, msg _menu: function(can, msg) { can.user.isMobile || can.user.mod.isPod || can.onappend._action(can, can.onaction.list, can._action) }, }) Volcanos(chat.ONACTION, {list: [mdb.CREATE, web.SHARE, web.REFRESH], _init: function(can) { can.onmotion.hidden(can) }, - onlogin: function(can, msg) { can.run({}, [], function(msg) { if (msg.Option(ice.MSG_RIVER)) { return can.page.Remove(can, can._target) } + onlogin: function(can, msg) { + var msg = can.request(); msg._method = web.GET + can.run(msg._event, [], function(msg) { if (msg.Option(ice.MSG_RIVER)) { return can.page.Remove(can, can._target) } can.onimport._init(can, msg); if (can.user.isMobile || can.user.isExtension) { return } can.onmotion.toggle(can, can._target, true), can.onlayout._init(can) }) },