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": {},
"ignore": [],
"version": "1.3.81",
"_release": "1.3.81",
"version": "1.3.82",
"_release": "1.3.82",
"_resolution": {
"type": "version",
"tag": "1.3.81",
"commit": "8c5b3c685f3cf65f7ef6d6d868566e03073c69d2"
"tag": "1.3.82",
"commit": "f25cb631146a714f2cc99666ce060f89eedde9e8"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

View file

@ -115,6 +115,12 @@
if (!this.id) {
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('keydown', onKeyDown);
this.addEventListener('focus', onFocus);
@ -123,17 +129,21 @@
EmbySelectPrototype.attachedCallback = function () {
var label = this.ownerDocument.createElement('label');
label.innerHTML = this.getAttribute('label') || '';
label.classList.add('selectLabel');
label.classList.add('selectLabelUnfocused');
label.htmlFor = this.id;
this.parentNode.insertBefore(label, this);
if (this.getAttribute('data-embyselect') != 'true') {
this.setAttribute('data-embyselect', 'true');
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);
var label = this.ownerDocument.createElement('label');
label.innerHTML = this.getAttribute('label') || '';
label.classList.add('selectLabel');
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', {

View file

@ -340,72 +340,49 @@ define([], function () {
var distX;
var distY;
var distX2;
var distY2;
switch (direction) {
case 0:
// 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);
distY2 = Math.abs(sourceMidY - midY);
break;
case 1:
// 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);
distY2 = Math.abs(sourceMidY - midY);
break;
case 2:
// 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);
distX2 = Math.abs(sourceMidX - midX);
break;
case 3:
// 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);
distX2 = Math.abs(sourceMidX - midX);
break;
default:
break;
}
var distT = Math.sqrt(distX * distX + distY * distY);
var distT2 = Math.sqrt(distX2 * distX2 + distY2 * distY2);
cache.push({
node: elem,
distX: distX,
distY: distY,
distT: distT,
distT2: distT2,
index: i
});
}
cache.sort(sortNodesT);
//if (direction >= 2) {
// cache.sort(sortNodesX);
//} else {
// cache.sort(sortNodesY);
//}
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) {
var result = a.distT - b.distT;
@ -413,11 +390,6 @@ define([], function () {
return result;
}
//result = a.distT2 - b.distT2;
//if (result != 0) {
// return result;
//}
result = a.index - b.index;
if (result != 0) {
return result;
@ -426,16 +398,6 @@ define([], function () {
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) {
var elem = document.activeElement;