update components

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

View File

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.2.35",
"_release": "1.2.35",
"version": "1.2.36",
"_release": "1.2.36",
"_resolution": {
"type": "version",
"tag": "1.2.35",
"commit": "7fe2a2677888e953d429ea985a8690af179faa06"
"tag": "1.2.36",
"commit": "2591ac7438857801f4c144ff428bfaaf3e56446f"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

View File

@ -1,4 +1,4 @@
.smoothScrollX {
.smoothScrollX, .hiddenScrollX {
overflow-x: auto;
-webkit-overflow-scrolling: touch;
overflow-y: hidden;
@ -6,45 +6,30 @@
white-space: nowrap;
}
.hiddenScrollX {
overflow-x: scroll;
-webkit-overflow-scrolling: touch;
overflow-y: hidden;
white-space: nowrap;
scroll-behavior: smooth;
}
.hiddenScrollX, .layout-tv .smoothScrollX, .layout-mobile .smoothScrollX {
.hiddenScrollX, .layout-tv .smoothScrollX {
-ms-overflow-style: none;
overflow: -moz-scrollbars-none;
}
.hiddenScrollX::-webkit-scrollbar, .layout-tv .smoothScrollX::-webkit-scrollbar, .layout-mobile .smoothScrollX::-webkit-scrollbar {
.hiddenScrollX::-webkit-scrollbar, .layout-tv .smoothScrollX::-webkit-scrollbar {
height: 0 !important;
display: none;
}
.smoothScrollY {
.smoothScrollY, .hiddenScrollY {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
scroll-behavior: smooth;
}
.hiddenScrollY, .layout-tv .smoothScrollY, .layout-mobile .smoothScrollY {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
overflow-x: hidden;
scroll-behavior: smooth;
}
.hiddenScrollY {
.hiddenScrollY, .layout-tv .smoothScrollY {
-ms-overflow-style: none;
overflow: -moz-scrollbars-none;
}
.hiddenScrollY::-webkit-scrollbar, .layout-tv .smoothScrollY::-webkit-scrollbar, .layout-mobile .smoothScrollY::-webkit-scrollbar {
.hiddenScrollY::-webkit-scrollbar, .layout-tv .smoothScrollY::-webkit-scrollbar {
width: 0 !important;
display: none;
}

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"
}

File diff suppressed because one or more lines are too long

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;
});

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": {

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 () {

View File

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/polymerelements/iron-icon",
"homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.8",
"_resolution": {
"type": "version",
"tag": "v1.0.8",
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
},
"_source": "git://github.com/polymerelements/iron-icon.git",
"_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon"
"_originalSource": "PolymerElements/iron-icon"
}

View File

@ -34,6 +34,6 @@
"commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514"
},
"_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0",
"_target": "^1.0.0",
"_originalSource": "Polymer/polymer"
}