milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update components

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-22 15:13:58 -04:00
parent 9ae1b3fcb8
commit 728a6c4631
9 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dashboard-ui/bower_components/fingerprintjs2/.bower.json vendored
View file

@ -23,15 +23,14 @@
"spec"
],
"homepage": "https://github.com/Valve/fingerprintjs2",
"version": "1.1.3",
"_release": "1.1.3",
"version": "1.1.4",
"_release": "1.1.4",
"_resolution": {
"type": "version",
"tag": "1.1.3",
"commit": "49e2c11cf08c13e12bf38185cec9ae159025e526"
"tag": "1.1.4",
"commit": "ae5719db3d942a1a84ab43b707d4d1c34138934e"
},
"_source": "https://github.com/Valve/fingerprintjs2.git",
"_target": "^1.1.3",
"_originalSource": "fingerprintjs2",
"_direct": true
"_originalSource": "fingerprintjs2"
}

4
dashboard-ui/bower_components/fingerprintjs2/dist/fingerprint2.min.js vendored
View file

File diff suppressed because one or more lines are too long

8
dashboard-ui/bower_components/fingerprintjs2/fingerprint2.js vendored
View file

@ -1,5 +1,5 @@
/*
* Fingerprintjs2 1.1.3 - Modern & flexible browser fingerprint library v2
* Fingerprintjs2 1.1.4 - 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.
@ -438,7 +438,9 @@
pluginsKey: function(keys) {
if(!this.options.excludePlugins){
if(this.isIE()){
keys.push({key: "ie_plugins", value: this.getIEPlugins()});
if(!this.options.excludeIEPlugins) {
keys.push({key: "ie_plugins", value: this.getIEPlugins()});
}
} else {
keys.push({key: "regular_plugins", value: this.getRegularPlugins()});
}
@ -1204,6 +1206,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.1.3";
Fingerprint2.VERSION = "1.1.4";
return Fingerprint2;
});

2
dashboard-ui/bower_components/fingerprintjs2/package.json vendored
View file

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

10
dashboard-ui/bower_components/fingerprintjs2/specs/specs.js vendored
View file

@ -97,6 +97,16 @@ describe("Fingerprint2", function () {
done();
});
});
it("does not use IE plugins info when excluded", function (done) {
var fp2 = new Fingerprint2({excludeIEPlugins: true});
spyOn(fp2, "getIEPlugins");
fp2.get(function(result) {
expect(fp2.getIEPlugins).not.toHaveBeenCalled();
done();
});
});
});
describe("returns components", function () {