use shared play menu

This commit is contained in:
Luke Pulverenti 2016-07-17 16:08:04 -04:00
parent f3cde16786
commit 83adc06fa2
15 changed files with 222 additions and 164 deletions

View file

@ -23,15 +23,14 @@
"spec"
],
"homepage": "https://github.com/Valve/fingerprintjs2",
"version": "1.4.0",
"_release": "1.4.0",
"version": "1.4.1",
"_release": "1.4.1",
"_resolution": {
"type": "version",
"tag": "1.4.0",
"commit": "75cbd474158f8ecce43e00f198c76e486b896937"
"tag": "1.4.1",
"commit": "6320cfa19c89aca0eb39e811d101336a2812ad61"
},
"_source": "https://github.com/Valve/fingerprintjs2.git",
"_target": "^1.4.0",
"_originalSource": "fingerprintjs2",
"_direct": true
"_originalSource": "fingerprintjs2"
}

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
/*
* Fingerprintjs2 1.4.0 - Modern & flexible browser fingerprint library v2
* Fingerprintjs2 1.4.1 - Modern & flexible browser fingerprint library v2
* https://github.com/Valve/fingerprintjs2
* Copyright (c) 2015 Valentin Vasilyev (valentin.vasilyev@outlook.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
@ -58,7 +58,8 @@
swfContainerId: "fingerprintjs2",
swfPath: "flash/compiled/FontList.swf",
detectScreenOrientation: true,
sortPluginsFor: [/palemoon/i]
sortPluginsFor: [/palemoon/i],
userDefinedFonts: []
};
this.options = this.extend(options, defaultOptions);
this.nativeForEach = Array.prototype.forEach;
@ -395,6 +396,8 @@
fontList = fontList.concat(extendedFontList);
}
fontList = fontList.concat(that.options.userDefinedFonts);
//we use m or w because these two characters take up the maximum width.
// And we use a LLi so that the same matching fonts can get separated
var testString = "mmmmmmmmmmlli";
@ -1283,6 +1286,6 @@
return ("00000000" + (h1[0] >>> 0).toString(16)).slice(-8) + ("00000000" + (h1[1] >>> 0).toString(16)).slice(-8) + ("00000000" + (h2[0] >>> 0).toString(16)).slice(-8) + ("00000000" + (h2[1] >>> 0).toString(16)).slice(-8);
}
};
Fingerprint2.VERSION = "1.4.0";
Fingerprint2.VERSION = "1.4.1";
return Fingerprint2;
});

View file

@ -1,6 +1,6 @@
{
"name": "fingerprintjs2",
"version": "1.4.0",
"version": "1.4.1",
"description": "Modern & flexible browser fingerprinting library",
"main": "dist/fingerprint2.min.js",
"devDependencies": {