1
0
mirror of https://github.com/lancedikson/bowser synced 2024-10-27 20:34:22 +00:00

Merge branch 'yconoclast-ucbrowser' into develop

# Conflicts:
#	src/useragents.js
This commit is contained in:
Denis Demchenko 2016-04-14 23:45:04 +03:00
commit ffe414a319
3 changed files with 30 additions and 1 deletions

View File

@ -32,6 +32,7 @@ if (bowser.msie && bowser.version <= 6) {
* Bada browser as `bada`[`webkit`]
* Tizen browser as `tizen`[`webkit`]
* Sailfish browser as `sailfish`[`gecko`]
* UC Browser as `ucbrowser`[`webkit`]
For all detected browsers the browser version is set in the `version` field.

View File

@ -53,6 +53,13 @@
, version: versionIdentifier || getFirstMatch(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i)
}
}
else if (/ucbrowser/i.test(ua)) {
result = {
name: 'UC Browser'
, ucbrowser: t
, version: getFirstMatch(/(?:ucbrowser)[\s\/](\d+(?:\.\d+)+)/i)
}
}
else if (windowsphone) {
result = {
name: 'Windows Phone'

View File

@ -1035,4 +1035,25 @@ module.exports.useragents = {
, x: true
}
}
};
, "UC Browser": {
'Mozilla/5.0 (iPad; U; CPU OS 9 like Mac OS X; en-us; iPad4,4) AppleWebKit/534.46 (KHTML, like Gecko) UCBrowser/2.4.0.367 U3/1 Safari/7543.48.3': {
ucbrowser: true,
version: '2.4.0.367',
webkit: true,
ipad: true,
ios: true,
osversion: 9,
tablet: true,
a: true
},
'Mozilla/5.0 (Linux; U; Android 4.1.2; en-us; SM-T210R Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 UCBrowser/2.3.2.300': {
android: true,
osversion: '4.1.2',
tablet: true,
ucbrowser: true,
version: '2.3.2.300',
webkit: true,
x: true
}
}
}