1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2016-05-26 15:20:24 -04:00
parent 113b487c37
commit 447eff16cd
10 changed files with 47 additions and 75 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.59", "version": "1.1.60",
"_release": "1.1.59", "_release": "1.1.60",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.59", "tag": "1.1.60",
"commit": "57a6fa68cdf72d05c6dfdf95cd2134471eca0af5" "commit": "302c2d3c2f59c366ee9d198f205b8350317cda41"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.81", "version": "1.3.82",
"_release": "1.3.81", "_release": "1.3.82",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.81", "tag": "1.3.82",
"commit": "8c5b3c685f3cf65f7ef6d6d868566e03073c69d2" "commit": "f25cb631146a714f2cc99666ce060f89eedde9e8"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -115,6 +115,12 @@
if (!this.id) { if (!this.id) {
this.id = 'select' + new Date().getTime(); this.id = 'select' + new Date().getTime();
} }
this.removeEventListener('mousedown', onMouseDown);
this.removeEventListener('keydown', onKeyDown);
this.removeEventListener('focus', onFocus);
this.removeEventListener('blur', onBlur);
this.addEventListener('mousedown', onMouseDown); this.addEventListener('mousedown', onMouseDown);
this.addEventListener('keydown', onKeyDown); this.addEventListener('keydown', onKeyDown);
this.addEventListener('focus', onFocus); this.addEventListener('focus', onFocus);
@ -123,17 +129,21 @@
EmbySelectPrototype.attachedCallback = function () { EmbySelectPrototype.attachedCallback = function () {
var label = this.ownerDocument.createElement('label'); if (this.getAttribute('data-embyselect') != 'true') {
label.innerHTML = this.getAttribute('label') || ''; this.setAttribute('data-embyselect', 'true');
label.classList.add('selectLabel');
label.classList.add('selectLabelUnfocused');
label.htmlFor = this.id;
this.parentNode.insertBefore(label, this);
var div = document.createElement('div'); var label = this.ownerDocument.createElement('label');
div.classList.add('emby-select-selectionbar'); label.innerHTML = this.getAttribute('label') || '';
div.innerHTML = '<div class="emby-select-selectionbarInner"></div>'; label.classList.add('selectLabel');
this.parentNode.insertBefore(div, this.nextSibling); label.classList.add('selectLabelUnfocused');
label.htmlFor = this.id;
this.parentNode.insertBefore(label, this);
var div = document.createElement('div');
div.classList.add('emby-select-selectionbar');
div.innerHTML = '<div class="emby-select-selectionbarInner"></div>';
this.parentNode.insertBefore(div, this.nextSibling);
}
}; };
document.registerElement('emby-select', { document.registerElement('emby-select', {

View file

@ -340,72 +340,49 @@ define([], function () {
var distX; var distX;
var distY; var distY;
var distX2;
var distY2;
switch (direction) { switch (direction) {
case 0: case 0:
// left // left
distX = distX2 = Math.abs(point1x - Math.min(point1x, x2)); distX = Math.abs(point1x - Math.min(point1x, x2));
distY = intersectY ? 0 : Math.abs(sourceMidY - midY); distY = intersectY ? 0 : Math.abs(sourceMidY - midY);
distY2 = Math.abs(sourceMidY - midY);
break; break;
case 1: case 1:
// right // right
distX = distX2 = Math.abs(point2x - Math.max(point2x, x)); distX = Math.abs(point2x - Math.max(point2x, x));
distY = intersectY ? 0 : Math.abs(sourceMidY - midY); distY = intersectY ? 0 : Math.abs(sourceMidY - midY);
distY2 = Math.abs(sourceMidY - midY);
break; break;
case 2: case 2:
// up // up
distY = distY2 = Math.abs(point1y - Math.min(point1y, y2)); distY = Math.abs(point1y - Math.min(point1y, y2));
distX = intersectX ? 0 : Math.abs(sourceMidX - midX); distX = intersectX ? 0 : Math.abs(sourceMidX - midX);
distX2 = Math.abs(sourceMidX - midX);
break; break;
case 3: case 3:
// down // down
distY = distY2 = Math.abs(point2y - Math.max(point2y, y)); distY = Math.abs(point2y - Math.max(point2y, y));
distX = intersectX ? 0 : Math.abs(sourceMidX - midX); distX = intersectX ? 0 : Math.abs(sourceMidX - midX);
distX2 = Math.abs(sourceMidX - midX);
break; break;
default: default:
break; break;
} }
var distT = Math.sqrt(distX * distX + distY * distY); var distT = Math.sqrt(distX * distX + distY * distY);
var distT2 = Math.sqrt(distX2 * distX2 + distY2 * distY2);
cache.push({ cache.push({
node: elem, node: elem,
distX: distX, distX: distX,
distY: distY, distY: distY,
distT: distT, distT: distT,
distT2: distT2,
index: i index: i
}); });
} }
cache.sort(sortNodesT); cache.sort(sortNodesT);
//if (direction >= 2) {
// cache.sort(sortNodesX);
//} else {
// cache.sort(sortNodesY);
//}
return cache; return cache;
} }
function sortNodesX(a, b) {
var result = a.distX - b.distX;
if (result == 0) {
return a.distT - b.distT;
}
return result;
}
function sortNodesT(a, b) { function sortNodesT(a, b) {
var result = a.distT - b.distT; var result = a.distT - b.distT;
@ -413,11 +390,6 @@ define([], function () {
return result; return result;
} }
//result = a.distT2 - b.distT2;
//if (result != 0) {
// return result;
//}
result = a.index - b.index; result = a.index - b.index;
if (result != 0) { if (result != 0) {
return result; return result;
@ -426,16 +398,6 @@ define([], function () {
return 0; return 0;
} }
function sortNodesY(a, b) {
var result = a.distY - b.distY;
if (result == 0) {
return a.distT - b.distT;
}
return result;
}
function sendText(text) { function sendText(text) {
var elem = document.activeElement; var elem = document.activeElement;

View file

@ -23,12 +23,12 @@
"spec" "spec"
], ],
"homepage": "https://github.com/Valve/fingerprintjs2", "homepage": "https://github.com/Valve/fingerprintjs2",
"version": "1.2.0", "version": "1.3.0",
"_release": "1.2.0", "_release": "1.3.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.0", "tag": "1.3.0",
"commit": "d5821a481d5c4d4ca348902e3a95b09de2a8702a" "commit": "727e536d5ffce50b47fd233ea32f022a7bbcdb0f"
}, },
"_source": "https://github.com/Valve/fingerprintjs2.git", "_source": "https://github.com/Valve/fingerprintjs2.git",
"_target": "^1.1.3", "_target": "^1.1.3",

File diff suppressed because one or more lines are too long

View file

@ -1,5 +1,5 @@
/* /*
* Fingerprintjs2 1.2.0 - Modern & flexible browser fingerprint library v2 * Fingerprintjs2 1.3.0 - Modern & flexible browser fingerprint library v2
* https://github.com/Valve/fingerprintjs2 * https://github.com/Valve/fingerprintjs2
* Copyright (c) 2015 Valentin Vasilyev (valentin.vasilyev@outlook.com) * Copyright (c) 2015 Valentin Vasilyev (valentin.vasilyev@outlook.com)
* Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
@ -421,7 +421,7 @@
// creates a span and load the font to detect and a base font for fallback // creates a span and load the font to detect and a base font for fallback
var createSpanWithFonts = function(fontToDetect, baseFont) { var createSpanWithFonts = function(fontToDetect, baseFont) {
var s = createSpan(); var s = createSpan();
s.style.fontFamily = fontToDetect + "," + baseFont; s.style.fontFamily = "'" + fontToDetect + "'," + baseFont;
return s; return s;
}; };
@ -1270,6 +1270,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); 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.2.0"; Fingerprint2.VERSION = "1.3.0";
return Fingerprint2; return Fingerprint2;
}); });

View file

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

View file

@ -38,7 +38,7 @@
"tag": "v1.0.6", "tag": "v1.0.6",
"commit": "6aef0896fcbc25f9f5bd1dd55f7679e6ab7f92ad" "commit": "6aef0896fcbc25f9f5bd1dd55f7679e6ab7f92ad"
}, },
"_source": "git://github.com/polymerelements/paper-material.git", "_source": "git://github.com/PolymerElements/paper-material.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-material" "_originalSource": "PolymerElements/paper-material"
} }

View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/paper-ripple", "homepage": "https://github.com/PolymerElements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/polymerelements/paper-ripple.git", "_source": "git://github.com/PolymerElements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-ripple" "_originalSource": "PolymerElements/paper-ripple"
} }