github_mirrors/ua-parser-js
3
0
Fork 1
mirror of https://github.com/faisalman/ua-parser-js.git synced 2025-12-31 19:39:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix #640 - Self-return thenable causing infinite-loop when awaited

Browse Source
This commit is contained in:
Faisal Salman
2023-04-02 05:53:45 +07:00
parent 1e80cf3533
commit 359cbecd32
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ua-parser.js
View File

@@ -888,8 +888,21 @@
if (!NAVIGATOR_UADATA) {
UAParserData.prototype.then = function (cb) {
cb(this);
return this;
var that = this;
var UAParserDataResolve = function () {
for (var prop in that) {
if (that.hasOwnProperty(prop)) {
this[prop] = that[prop];
}
}
};
UAParserDataResolve.prototype = {
is : UAParserData.prototype.is,
toString : UAParserData.prototype.toString
};
var resolveData = new UAParserDataResolve();
cb(resolveData);
return resolveData;
};
}
@@ -991,8 +1004,8 @@
if (brands) {
for (var i in brands) {
var brandName = brands[i].brand,
brandVersion = brands[i].version
if (!/not.a.brand/i.test(brandName) && i < 1 || /chromi/i.test(this.get(NAME))) {
brandVersion = brands[i].version;
if (!/not.a.brand/i.test(brandName) && (i < 1 || /chromi/i.test(this.get(NAME)))) {
this.set(NAME, strip(GOOGLE+' ', brandName))
.set(VERSION, brandVersion)
.set(MAJOR, majorize(brandVersion));