diff --git a/lib/user.js b/lib/user.js index 8625d1f2..e97ae9f1 100644 --- a/lib/user.js +++ b/lib/user.js @@ -13,6 +13,7 @@ Volcanos("user", { }, }, info: {}, isTesla: navigator.userAgent.indexOf("Tesla") > -1, + isChrome: navigator.userAgent.indexOf("Chrome") > -1, isMailMaster: navigator.userAgent.indexOf("MailMaster") > -1, isWeiXin: navigator.userAgent.indexOf("MicroMessenger") > -1, isIPhone: navigator.userAgent.indexOf("iPhone") > -1, @@ -214,8 +215,10 @@ Volcanos("user", { {type: html.TD, list: [{text: can.user.trans(can, name, trans)}]}, {type: html.TD, list: [{type: html.INPUT, name: name, data: {type: type||html.TEXT}}]}, ]} } - can.misc.POST(can, can.request(), "http://localhost:9020/code/git/token/get/"+location.host, {}, function(msg) { - can.misc.POST(can, can.request(), "/code/git/token/sid/"+msg.result[0]+ice.PS+msg.result[1], {}, function(msg) { + can.require(["http://localhost:9020/code/git/token/get/"+location.host], function() { + }) + can.user.isChrome && can.misc.POST(can, can.request(), "http://localhost:9020/code/git/token/get/"+location.host, {}, function(msg) { + msg.Results() && can.misc.POST(can, can.request(), "/code/git/token/sid/"+msg.result[0]+ice.PS+msg.result[1], {}, function(msg) { if (msg.Result() == ice.OK) { can.page.Remove(can, ui._target), can.base.isFunc(cb) && cb() } }) }) diff --git a/proto.js b/proto.js index 8e1000fd..ac67235c 100644 --- a/proto.js +++ b/proto.js @@ -368,6 +368,7 @@ try { if (typeof(window) == lang.OBJECT) { var meta = Volcanos.meta switch (url.split("?")[0].split(ice.PT).pop().toLowerCase()) { case nfs.CSS: var item = document.createElement(mdb.LINK); item.href = url+v, item.rel = "stylesheet", item.onload = cb, document.head.appendChild(item); break case nfs.JS: var item = document.createElement(nfs.SCRIPT); item.src = url+v, item.onerror = cb, item.onload = cb, document.body.appendChild(item); break + default: var item = document.createElement(nfs.SCRIPT); item.src = url+v, item.onerror = cb, item.onload = cb, document.body.appendChild(item) } } window.onerror = function(message, source, lineno, colno, error) { window._version && alert([[source, lineno, colno].join(ice.DF), message].join(ice.NL)) } meta._init = function(can) { window.onerror = function(message, source, lineno, colno, error) {