From e522bc26a501b0b15d92f9144d32bab71d200e80 Mon Sep 17 00:00:00 2001 From: Huangjianjeng Date: Sun, 15 Nov 2015 19:05:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=B4=E8=AF=84=E8=AE=BAUA=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BE=AE=E4=BF=A1=E6=B5=8F=E8=A7=88=E5=99=A8=E5=92=8C?= =?UTF-8?q?IOS=20Firefox=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/js/hook-duoshuo.js | 4 +++- source/js/ua-parser.min.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/js/hook-duoshuo.js b/source/js/hook-duoshuo.js index bb682f3f8..d0112039a 100644 --- a/source/js/hook-duoshuo.js +++ b/source/js/hook-duoshuo.js @@ -47,7 +47,7 @@ function showUa(string) { var browserName = sua.browser.name; if (checkMobile()) br = '

'; - if (osName == 'Android') osIco = ' '; + if (osName.match(/Android/i)) osIco = ' '; if (osName.match(/linux/i)) osIco = ' '; if (osName.match(/mac os|ios/i)) osIco = ' '; if (sua.os.version == 'x86_64') sua.os.version = 'x64'; @@ -57,6 +57,8 @@ function showUa(string) { if (browserName.match(/opera/i)) browserIco = ' '; if (browserName.match(/safari/i)) browserIco = ' '; if (browserName.match(/ie/i)) browserIco = ' '; + if (browserName.match(/WeChat/i)) browserIco = ' '; + if (browserName.match(/QQBrowser/i)) browserIco = ' '; return br + '' + osIco + sua.os.name + ' ' + sua.os.version + '' + br + diff --git a/source/js/ua-parser.min.js b/source/js/ua-parser.min.js index 31db88014..80ce7f750 100644 --- a/source/js/ua-parser.min.js +++ b/source/js/ua-parser.min.js @@ -1,9 +1,9 @@ /** - * UAParser.js v0.7.9 + * UAParser.js * Lightweight JavaScript-based User-Agent string parser * https://github.com/faisalman/ua-parser-js * * Copyright © 2012-2015 Faisal Salman * Dual licensed under GPLv2 & MIT */ -(function(window,undefined){"use strict";var LIBVERSION="0.7.9",EMPTY="",UNKNOWN="?",FUNC_TYPE="function",UNDEF_TYPE="undefined",OBJ_TYPE="object",STR_TYPE="string",MAJOR="major",MODEL="model",NAME="name",TYPE="type",VENDOR="vendor",VERSION="version",ARCHITECTURE="architecture",CONSOLE="console",MOBILE="mobile",TABLET="tablet",SMARTTV="smarttv",WEARABLE="wearable",EMBEDDED="embedded";var util={extend:function(regexes,extensions){for(var i in extensions){if("browser cpu device engine os".indexOf(i)!==-1&&extensions[i].length%2===0){regexes[i]=extensions[i].concat(regexes[i])}}return regexes},has:function(str1,str2){if(typeof str1==="string"){return str2.toLowerCase().indexOf(str1.toLowerCase())!==-1}else{return false}},lowerize:function(str){return str.toLowerCase()},major:function(version){return typeof version===STR_TYPE?version.split(".")[0]:undefined}};var mapper={rgx:function(){var result,i=0,j,k,p,q,matches,match,args=arguments;while(i0){if(q.length==2){if(typeof q[1]==FUNC_TYPE){result[q[0]]=q[1].call(this,match)}else{result[q[0]]=q[1]}}else if(q.length==3){if(typeof q[1]===FUNC_TYPE&&!(q[1].exec&&q[1].test)){result[q[0]]=match?q[1].call(this,match,q[2]):undefined}else{result[q[0]]=match?match.replace(q[1],q[2]):undefined}}else if(q.length==4){result[q[0]]=match?q[3].call(this,match.replace(q[1],q[2])):undefined}}else{result[q]=match?match:undefined}}}}i+=2}return result},str:function(str,map){for(var i in map){if(typeof map[i]===OBJ_TYPE&&map[i].length>0){for(var j=0;j35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(F(f,g){\'8f 8e\';I h=\'0.7.9\',2i=\'\',1E=\'?\',1y=\'F\',1l=\'8d\',1w=\'24\',2e=\'2f\',1I=\'1o\',y=\'1h\',u=\'8c\',C=\'85\',B=\'1P\',t=\'M\',R=\'84\',14=\'83\',H=\'Z\',J=\'1Q\',16=\'2y\',1k=\'82\',1U=\'81\';I l={28:F(a,b){1b(I i 1p b){G("V 1v Y 1t X".2d(i)!==-1&&b[i].W%2===0){a[i]=b[i].80(a[i])}}E a},1V:F(a,b){G(L a==="2f"){E b.1T().2d(a.1T())!==-1}U{E 7Z}},1f:F(a){E a.1T()},1o:F(a){E L(a)===2e?a.7Y(".")[0]:g}};I m={17:F(){I a,i=0,j,k,p,q,19,O,1r=7X;2L(i<1r.W&&!19){I b=1r[i],1a=1r[i+1];G(L a===1l){a={};1b(p 1p 1a){G(1a.7W(p)){q=1a[p];G(L q===1w){a[q[0]]=g}U{a[q]=g}}}}j=k=0;2L(j0){G(q.W==2){G(L q[1]==1y){a[q[0]]=q[1].1L(D,O)}U{a[q[0]]=q[1]}}U G(q.W==3){G(L q[1]===1y&&!(q[1].37&&q[1].7V)){a[q[0]]=O?q[1].1L(D,O,q[2]):g}U{a[q[0]]=O?O.2c(q[1],q[2]):g}}U G(q.W==4){a[q[0]]=O?q[3].1L(D,O.2c(q[1],q[2])):g}}U{a[q]=O?O:g}}}}i+=2}E a},15:F(a,b){1b(I i 1p b){G(L b[i]===1w&&b[i].W>0){1b(I j=0;j