diff --git a/core/chat/header.go b/core/chat/header.go index 62896b0c..915a6201 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -103,7 +103,7 @@ func init() { aaa.LOGOUT: {Hand: aaa.SessLogout}, web.ONLINE: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(web.STREAM, web.ONLINE) }}, cli.QRCODE: {Hand: func(m *ice.Message, arg ...string) { - link := tcp.PublishLocalhost(m, m.Option(ice.MSG_USERWEB)) + link := m.OptionDefault(mdb.LINK, tcp.PublishLocalhost(m, m.Option(ice.MSG_USERWEB))) m.Push(mdb.NAME, link).PushQRCode(mdb.TEXT, kit.MergeURL(link, ice.FROM_DAEMON, m.Option(ice.MSG_DAEMON))) }}, mdb.CREATE: {Name: "create type*=plugin,qrcode,oauth name* help icons link order space index args", Hand: func(m *ice.Message, arg ...string) { mdb.HashCreate(m, m.OptionSimple()) }}, diff --git a/core/wiki/portal.js b/core/wiki/portal.js index f50f868f..75c5d453 100644 --- a/core/wiki/portal.js +++ b/core/wiki/portal.js @@ -4,7 +4,7 @@ Volcanos(chat.ONIMPORT, { var p = "/c/"+web.PORTAL; can.db.prefix = location.pathname.indexOf(p) > -1? location.pathname.split(p)[0]+p: nfs.WIKI_PORTAL can.db.current = can.isCmdMode()? can.base.trimPrefix(location.pathname, can.db.prefix+nfs.PS, can.db.prefix): can.Option(nfs.PATH) if (can.base.isIn(can.db.current, "", nfs.PS)) { - can.onappend.style(can, ice.HOME) + can.page.ClassList.add(can, can._fields, ice.HOME) can.page.ClassList.add(can, can._root.Action._target, ice.HOME) } else { can.page.ClassList.del(can, can._fields, ice.HOME) @@ -23,7 +23,7 @@ Volcanos(chat.ONIMPORT, { can.page.styleWidth(can, can.ui.nav, 230), can.page.styleWidth(can, can.ui.aside, 200) if (can.ConfWidth() < 1000) { can.onmotion.hidden(can, can.ui.aside) } } - can.onmotion.delay(can, function() { can.Conf(html.PADDING, can.page.styleValueInt(can, "--portal-main-padding", can._output)), cb(msg) + can.onmotion.delay(can, function() { cb && cb(msg), can.Conf(html.PADDING, can.page.styleValueInt(can, "--portal-main-padding", can._output)) can.user.isMobile && can.Conf(html.PADDING, can.isCmdMode()? 5: 15) var file = can.isCmdMode()? can.db.hash[0]: can.Option(nfs.FILE); can.base.beginWith(file, nfs.SRC, nfs.USR) || (file = can.db.current+file) can.db.nav = {}, can.page.Select(can, can._output, wiki.STORY_ITEM, function(target) { var meta = target.dataset||{}