diff --git a/lib/misc.js b/lib/misc.js index e645d7ea..576f75a7 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -279,6 +279,6 @@ Volcanos("misc", {help: "通信协议", Message: function(event, can) { var msg if (minute < 10) { minute = "0"+minute } var second = now.getSeconds() if (second < 10) { second = "0"+second } - return hour+":"+minute+":"+second + return hour+":"+minute+":"+second+"."+now.getMilliseconds() }, }) diff --git a/lib/user.js b/lib/user.js index 8d8bf8d5..4f6be94b 100644 --- a/lib/user.js +++ b/lib/user.js @@ -141,7 +141,7 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { }, function() { action.close() }), _target: ui._target, ui: ui, }); can.onmotion.story.auto(can, ui._target) - can.onengine.signal(can, chat.ONTOAST, can.request({}, {time: can.base.Time(), title: meta.title, content: meta.content, fileline: can.misc.FileLine(2, 2)})) + can.onengine.signal(can, chat.ONTOAST, can.request({}, {time: can.misc._time(), title: meta.title, content: meta.content, fileline: can.misc.FileLine(2, 2)})) return !meta.action && can.onmotion.float.add(can, chat.TOAST, action), action }, share: function(can, msg, cmd) { diff --git a/panel/footer.js b/panel/footer.js index 1b033cc5..675fa9af 100644 --- a/panel/footer.js +++ b/panel/footer.js @@ -37,7 +37,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar toast: function(can, msg, title, content, fileline, time) { can._tips = can._tips||can.request() can._tips.Push({time: time, fileline: fileline, title: title, content: content}) can.onimport.count(can, "ntip") - can.page.Modify(can, can.toast, [time.split(ice.SP).pop(), title, content].join(ice.SP)) + can.page.Modify(can, can.toast, [time, title, content].join(ice.SP)) }, count: function(can, name) { can.page.Select(can, can._output, can.core.Keys(html.SPAN, name), function(item) { diff --git a/panel/header.js b/panel/header.js index 6a6314d1..62f4756a 100644 --- a/panel/header.js +++ b/panel/header.js @@ -73,7 +73,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar }, topic: function(can, topic) { topic && (can._topic = topic) topic = can._topic || can.misc.Search(can, chat.TOPIC) || Volcanos.meta.args.topic || (can.base.isNight()? chat.BLACK: chat.WHITE) - can.require(["/chat/topic/"+topic+".css"]) + // can.require(["/chat/topic/"+topic+".css"]) can.user.topic(can, topic) }, background: function(event, can, background) { if (can.user.isExtension || can.user.isLocalFile) { return } @@ -147,6 +147,7 @@ Volcanos(chat.ONACTION, {help: "交互数据", _init: function(can, cb, target) "logout": "退出登录", }, onmain: function(can, msg) { + debugger can.run({}, [], function(msg) { if (!can.Conf(aaa.USERNICK, msg.Option(aaa.USERNICK)||msg.Option(ice.MSG_USERNAME))) { msg.Option(chat.SSO)? can.user.jumps(msg.Option(chat.SSO)): can.user.login(can, function() {