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

Merge pull request #136 from malash/fix/util-extend

Browse Source 
Rewrite util.extend to a clone version
This commit is contained in:
Faisal Salman 2016-02-25 10:54:54 +07:00
commit 3a457f9bd9
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/ua-parser.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/ua-parser.pack.js vendored
View File

File diff suppressed because one or more lines are too long

12
src/ua-parser.js
View File

@ -45,12 +45,15 @@
var util = { var util = {
extend : function (regexes, extensions) { extend : function (regexes, extensions) {
for (var i in extensions) { var margedRegexes = {};
if ("browser cpu device engine os".indexOf(i) !== -1 && extensions[i].length % 2 === 0) { for (var i in regexes) {
regexes[i] = extensions[i].concat(regexes[i]); if (extensions[i] && extensions[i].length % 2 === 0) {
margedRegexes[i] = extensions[i].concat(regexes[i]);
} else {
margedRegexes[i] = regexes[i];
} }
} }
return regexes; return margedRegexes;
}, },
has : function (str1, str2) { has : function (str1, str2) {
if (typeof str1 === "string") { if (typeof str1 === "string") {
@ -801,7 +804,6 @@
ua = uastring; ua = uastring;
return this; return this;
}; };
this.setUA(ua);
return this; return this;
}; };