Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode
# Conflicts: # src/components/guide/guide.js # src/components/mediainfo/mediainfo.js # src/components/multiselect/multiselect.js # src/components/playback/brightnessosd.js # src/components/recordingcreator/recordingbutton.js # src/components/userdatabuttons/emby-ratingbutton.js # src/controllers/favorites.js
This commit is contained in:
grafixeyehero
commit
080b3365d6
145 changed files with 1438 additions and 4767 deletions
1
.eslintignore
Normal file
1
.eslintignore
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
libraries/
|
||||||
|
|
@ -2,3 +2,26 @@ env:
|
||||||
es6: true
|
es6: true
|
||||||
browser: true
|
browser: true
|
||||||
amd: true
|
amd: true
|
||||||
|
|
||||||
|
rules:
|
||||||
|
block-spacing: ["error"]
|
||||||
|
brace-style: ["error"]
|
||||||
|
comma-dangle: ["error", "never"]
|
||||||
|
comma-spacing: ["error"]
|
||||||
|
eol-last: ["off"]
|
||||||
|
indent: ["error", 4, { "SwitchCase": 1 }]
|
||||||
|
keyword-spacing: ["error"]
|
||||||
|
line-comment-position: ["off"]
|
||||||
|
max-statements-per-line: ["error"]
|
||||||
|
no-empty: ["error"]
|
||||||
|
no-extra-semi: ["error"]
|
||||||
|
no-floating-decimal: ["error"]
|
||||||
|
no-multi-spaces: ["error"]
|
||||||
|
no-multiple-empty-lines: ["error", { "max": 1 }]
|
||||||
|
no-trailing-spaces: ["error"]
|
||||||
|
no-void: ["off"]
|
||||||
|
one-var: ["error", "never"]
|
||||||
|
padding-line-between-statements: ["off"]
|
||||||
|
semi: ["off"]
|
||||||
|
space-before-blocks: ["error"]
|
||||||
|
yoda: ["off"]
|
||||||
|
|
|
||||||
|
|
@ -18,16 +18,21 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"alameda": "^1.3.0",
|
"alameda": "^1.3.0",
|
||||||
|
"document-register-element": "^0.5.4",
|
||||||
"flv.js": "^1.5.0",
|
"flv.js": "^1.5.0",
|
||||||
"hls.js": "^0.12.4",
|
"hls.js": "^0.12.4",
|
||||||
"howler": "^2.1.2",
|
"howler": "^2.1.2",
|
||||||
"jquery": "^3.4.1",
|
"jquery": "^3.4.1",
|
||||||
"jstree": "^3.3.7",
|
"jstree": "^3.3.7",
|
||||||
"libjass": "^0.11.0",
|
"libjass": "^0.11.0",
|
||||||
|
"native-promise-only": "^0.8.0-a",
|
||||||
"requirejs": "^2.3.5",
|
"requirejs": "^2.3.5",
|
||||||
|
"resize-observer-polyfill": "^1.5.1",
|
||||||
"shaka-player": "^2.5.5",
|
"shaka-player": "^2.5.5",
|
||||||
"sortablejs": "^1.9.0",
|
"sortablejs": "^1.9.0",
|
||||||
"swiper": "^3.4.2"
|
"swiper": "^3.4.2",
|
||||||
|
"webcomponents.js-2": "^0.7.24",
|
||||||
|
"whatwg-fetch": "^1.1.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "webpack-dev-server --config webpack.dev.js --open",
|
"serve": "webpack-dev-server --config webpack.dev.js --open",
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>testing my-element</title>
|
|
||||||
<script src="build/document-register-element.js"></script>
|
|
||||||
<script src="test/my-element.js"></script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<my-element>
|
|
||||||
some content
|
|
||||||
</my-element>
|
|
||||||
</body>
|
|
||||||
|
|
@ -1,246 +0,0 @@
|
||||||
/*! (C) WebReflection Mit Style License */
|
|
||||||
(function(e, t, n, r) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
function rt(e, t) {
|
|
||||||
for (var n = 0, r = e.length; n < r; n++) vt(e[n], t)
|
|
||||||
}
|
|
||||||
|
|
||||||
function it(e) {
|
|
||||||
for (var t = 0, n = e.length, r; t < n; t++) r = e[t], nt(r, b[ot(r)])
|
|
||||||
}
|
|
||||||
|
|
||||||
function st(e) {
|
|
||||||
return function(t) {
|
|
||||||
j(t) && (vt(t, e), rt(t.querySelectorAll(w), e))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function ot(e) {
|
|
||||||
var t = e.getAttribute("is"),
|
|
||||||
n = e.nodeName.toUpperCase(),
|
|
||||||
r = S.call(y, t ? v + t.toUpperCase() : d + n);
|
|
||||||
return t && -1 < r && !ut(n, t) ? -1 : r
|
|
||||||
}
|
|
||||||
|
|
||||||
function ut(e, t) {
|
|
||||||
return -1 < w.indexOf(e + '[is="' + t + '"]')
|
|
||||||
}
|
|
||||||
|
|
||||||
function at(e) {
|
|
||||||
var t = e.currentTarget,
|
|
||||||
n = e.attrChange,
|
|
||||||
r = e.attrName,
|
|
||||||
i = e.target;
|
|
||||||
Q && (!i || i === t) && t.attributeChangedCallback && r !== "style" && e.prevValue !== e.newValue && t.attributeChangedCallback(r, n === e[a] ? null : e.prevValue, n === e[l] ? null : e.newValue)
|
|
||||||
}
|
|
||||||
|
|
||||||
function ft(e) {
|
|
||||||
var t = st(e);
|
|
||||||
return function(e) {
|
|
||||||
X.push(t, e.target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function lt(e) {
|
|
||||||
K && (K = !1, e.currentTarget.removeEventListener(h, lt)), rt((e.target || t).querySelectorAll(w), e.detail === o ? o : s), B && pt()
|
|
||||||
}
|
|
||||||
|
|
||||||
function ct(e, t) {
|
|
||||||
var n = this;
|
|
||||||
q.call(n, e, t), G.call(n, {
|
|
||||||
target: n
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function ht(e, t) {
|
|
||||||
D(e, t), et ? et.observe(e, z) : (J && (e.setAttribute = ct, e[i] = Z(e), e.addEventListener(p, G)), e.addEventListener(c, at)), e.createdCallback && Q && (e.created = !0, e.createdCallback(), e.created = !1)
|
|
||||||
}
|
|
||||||
|
|
||||||
function pt() {
|
|
||||||
for (var e, t = 0, n = F.length; t < n; t++) e = F[t], E.contains(e) || (n--, F.splice(t--, 1), vt(e, o))
|
|
||||||
}
|
|
||||||
|
|
||||||
function dt(e) {
|
|
||||||
throw new Error("A " + e + " type is already registered")
|
|
||||||
}
|
|
||||||
|
|
||||||
function vt(e, t) {
|
|
||||||
var n, r = ot(e); - 1 < r && (tt(e, b[r]), r = 0, t === s && !e[s] ? (e[o] = !1, e[s] = !0, r = 1, B && S.call(F, e) < 0 && F.push(e)) : t === o && !e[o] && (e[s] = !1, e[o] = !0, r = 1), r && (n = e[t + "Callback"]) && n.call(e))
|
|
||||||
}
|
|
||||||
if (r in t) return;
|
|
||||||
var i = "__" + r + (Math.random() * 1e5 >> 0),
|
|
||||||
s = "attached",
|
|
||||||
o = "detached",
|
|
||||||
u = "extends",
|
|
||||||
a = "ADDITION",
|
|
||||||
f = "MODIFICATION",
|
|
||||||
l = "REMOVAL",
|
|
||||||
c = "DOMAttrModified",
|
|
||||||
h = "DOMContentLoaded",
|
|
||||||
p = "DOMSubtreeModified",
|
|
||||||
d = "<",
|
|
||||||
v = "=",
|
|
||||||
m = /^[A-Z][A-Z0-9]*(?:-[A-Z0-9]+)+$/,
|
|
||||||
g = ["ANNOTATION-XML", "COLOR-PROFILE", "FONT-FACE", "FONT-FACE-SRC", "FONT-FACE-URI", "FONT-FACE-FORMAT", "FONT-FACE-NAME", "MISSING-GLYPH"],
|
|
||||||
y = [],
|
|
||||||
b = [],
|
|
||||||
w = "",
|
|
||||||
E = t.documentElement,
|
|
||||||
S = y.indexOf || function(e) {
|
|
||||||
for (var t = this.length; t-- && this[t] !== e;);
|
|
||||||
return t
|
|
||||||
},
|
|
||||||
x = n.prototype,
|
|
||||||
T = x.hasOwnProperty,
|
|
||||||
N = x.isPrototypeOf,
|
|
||||||
C = n.defineProperty,
|
|
||||||
k = n.getOwnPropertyDescriptor,
|
|
||||||
L = n.getOwnPropertyNames,
|
|
||||||
A = n.getPrototypeOf,
|
|
||||||
O = n.setPrototypeOf,
|
|
||||||
M = !!n.__proto__,
|
|
||||||
_ = n.create || function mt(e) {
|
|
||||||
return e ? (mt.prototype = e, new mt) : this
|
|
||||||
},
|
|
||||||
D = O || (M ? function(e, t) {
|
|
||||||
return e.__proto__ = t, e
|
|
||||||
} : L && k ? function() {
|
|
||||||
function e(e, t) {
|
|
||||||
for (var n, r = L(t), i = 0, s = r.length; i < s; i++) n = r[i], T.call(e, n) || C(e, n, k(t, n))
|
|
||||||
}
|
|
||||||
return function(t, n) {
|
|
||||||
do e(t, n); while ((n = A(n)) && !N.call(n, t));
|
|
||||||
return t
|
|
||||||
}
|
|
||||||
}() : function(e, t) {
|
|
||||||
for (var n in t) e[n] = t[n];
|
|
||||||
return e
|
|
||||||
}),
|
|
||||||
P = e.MutationObserver || e.WebKitMutationObserver,
|
|
||||||
H = (e.HTMLElement || e.Element || e.Node).prototype,
|
|
||||||
B = !N.call(H, E),
|
|
||||||
j = B ? function(e) {
|
|
||||||
return e.nodeType === 1
|
|
||||||
} : function(e) {
|
|
||||||
return N.call(H, e)
|
|
||||||
},
|
|
||||||
F = B && [],
|
|
||||||
I = H.cloneNode,
|
|
||||||
q = H.setAttribute,
|
|
||||||
R = H.removeAttribute,
|
|
||||||
U = t.createElement,
|
|
||||||
z = P && {
|
|
||||||
attributes: !0,
|
|
||||||
characterData: !0,
|
|
||||||
attributeOldValue: !0
|
|
||||||
},
|
|
||||||
W = P || function(e) {
|
|
||||||
J = !1, E.removeEventListener(c, W)
|
|
||||||
},
|
|
||||||
X, V = e.requestAnimationFrame || e.webkitRequestAnimationFrame || e.mozRequestAnimationFrame || e.msRequestAnimationFrame || function(e) {
|
|
||||||
setTimeout(e, 10)
|
|
||||||
},
|
|
||||||
$ = !1,
|
|
||||||
J = !0,
|
|
||||||
K = !0,
|
|
||||||
Q = !0,
|
|
||||||
G, Y, Z, et, tt, nt;
|
|
||||||
O || M ? (tt = function(e, t) {
|
|
||||||
N.call(t, e) || ht(e, t)
|
|
||||||
}, nt = ht) : (tt = function(e, t) {
|
|
||||||
e[i] || (e[i] = n(!0), ht(e, t))
|
|
||||||
}, nt = tt), B ? (J = !1, function() {
|
|
||||||
var e = k(H, "addEventListener"),
|
|
||||||
t = e.value,
|
|
||||||
n = function(e) {
|
|
||||||
var t = new CustomEvent(c, {
|
|
||||||
bubbles: !0
|
|
||||||
});
|
|
||||||
t.attrName = e, t.prevValue = this.getAttribute(e), t.newValue = null, t[l] = t.attrChange = 2, R.call(this, e), this.dispatchEvent(t)
|
|
||||||
},
|
|
||||||
r = function(e, t) {
|
|
||||||
var n = this.hasAttribute(e),
|
|
||||||
r = n && this.getAttribute(e),
|
|
||||||
i = new CustomEvent(c, {
|
|
||||||
bubbles: !0
|
|
||||||
});
|
|
||||||
q.call(this, e, t), i.attrName = e, i.prevValue = n ? r : null, i.newValue = t, n ? i[f] = i.attrChange = 1 : i[a] = i.attrChange = 0, this.dispatchEvent(i)
|
|
||||||
},
|
|
||||||
s = function(e) {
|
|
||||||
var t = e.currentTarget,
|
|
||||||
n = t[i],
|
|
||||||
r = e.propertyName,
|
|
||||||
s;
|
|
||||||
n.hasOwnProperty(r) && (n = n[r], s = new CustomEvent(c, {
|
|
||||||
bubbles: !0
|
|
||||||
}), s.attrName = n.name, s.prevValue = n.value || null, s.newValue = n.value = t[r] || null, s.prevValue == null ? s[a] = s.attrChange = 0 : s[f] = s.attrChange = 1, t.dispatchEvent(s))
|
|
||||||
};
|
|
||||||
e.value = function(e, o, u) {
|
|
||||||
e === c && this.attributeChangedCallback && this.setAttribute !== r && (this[i] = {
|
|
||||||
className: {
|
|
||||||
name: "class",
|
|
||||||
value: this.className
|
|
||||||
}
|
|
||||||
}, this.setAttribute = r, this.removeAttribute = n, t.call(this, "propertychange", s)), t.call(this, e, o, u)
|
|
||||||
}, C(H, "addEventListener", e)
|
|
||||||
}()) : P || (E.addEventListener(c, W), E.setAttribute(i, 1), E.removeAttribute(i), J && (G = function(e) {
|
|
||||||
var t = this,
|
|
||||||
n, r, s;
|
|
||||||
if (t === e.target) {
|
|
||||||
n = t[i], t[i] = r = Z(t);
|
|
||||||
for (s in r) {
|
|
||||||
if (!(s in n)) return Y(0, t, s, n[s], r[s], a);
|
|
||||||
if (r[s] !== n[s]) return Y(1, t, s, n[s], r[s], f)
|
|
||||||
}
|
|
||||||
for (s in n)
|
|
||||||
if (!(s in r)) return Y(2, t, s, n[s], r[s], l)
|
|
||||||
}
|
|
||||||
}, Y = function(e, t, n, r, i, s) {
|
|
||||||
var o = {
|
|
||||||
attrChange: e,
|
|
||||||
currentTarget: t,
|
|
||||||
attrName: n,
|
|
||||||
prevValue: r,
|
|
||||||
newValue: i
|
|
||||||
};
|
|
||||||
o[s] = e, at(o)
|
|
||||||
}, Z = function(e) {
|
|
||||||
for (var t, n, r = {}, i = e.attributes, s = 0, o = i.length; s < o; s++) t = i[s], n = t.name, n !== "setAttribute" && (r[n] = t.value);
|
|
||||||
return r
|
|
||||||
})), t[r] = function(n, r) {
|
|
||||||
c = n.toUpperCase(), $ || ($ = !0, P ? (et = function(e, t) {
|
|
||||||
function n(e, t) {
|
|
||||||
for (var n = 0, r = e.length; n < r; t(e[n++]));
|
|
||||||
}
|
|
||||||
return new P(function(r) {
|
|
||||||
for (var i, s, o, u = 0, a = r.length; u < a; u++) i = r[u], i.type === "childList" ? (n(i.addedNodes, e), n(i.removedNodes, t)) : (s = i.target, Q && s.attributeChangedCallback && i.attributeName !== "style" && (o = s.getAttribute(i.attributeName), o !== i.oldValue && s.attributeChangedCallback(i.attributeName, i.oldValue, o)))
|
|
||||||
})
|
|
||||||
}(st(s), st(o)), et.observe(t, {
|
|
||||||
childList: !0,
|
|
||||||
subtree: !0
|
|
||||||
})) : (X = [], V(function E() {
|
|
||||||
while (X.length) X.shift().call(null, X.shift());
|
|
||||||
V(E)
|
|
||||||
}), t.addEventListener("DOMNodeInserted", ft(s)), t.addEventListener("DOMNodeRemoved", ft(o))), t.addEventListener(h, lt), t.addEventListener("readystatechange", lt), t.createElement = function(e, n) {
|
|
||||||
var r = U.apply(t, arguments),
|
|
||||||
i = "" + e,
|
|
||||||
s = S.call(y, (n ? v : d) + (n || i).toUpperCase()),
|
|
||||||
o = -1 < s;
|
|
||||||
return n && (r.setAttribute("is", n = n.toLowerCase()), o && (o = ut(i.toUpperCase(), n))), Q = !t.createElement.innerHTMLHelper, o && nt(r, b[s]), r
|
|
||||||
}, H.cloneNode = function(e) {
|
|
||||||
var t = I.call(this, !!e),
|
|
||||||
n = ot(t);
|
|
||||||
return -1 < n && nt(t, b[n]), e && it(t.querySelectorAll(w)), t
|
|
||||||
}), -2 < S.call(y, v + c) + S.call(y, d + c) && dt(n);
|
|
||||||
if (!m.test(c) || -1 < S.call(g, c)) throw new Error("The type " + n + " is invalid");
|
|
||||||
var i = function() {
|
|
||||||
return f ? t.createElement(l, c) : t.createElement(l)
|
|
||||||
},
|
|
||||||
a = r || x,
|
|
||||||
f = T.call(a, u),
|
|
||||||
l = f ? r[u].toUpperCase() : c,
|
|
||||||
c, p;
|
|
||||||
return f && -1 < S.call(y, d + l) && dt(l), p = y.push((f ? v : d) + c) - 1, w = w.concat(w.length ? "," : "", f ? l + '[is="' + n.toLowerCase() + '"]' : l), i.prototype = b[p] = T.call(a, "prototype") ? a.prototype : _(H), rt(t.querySelectorAll(w), s), i
|
|
||||||
}
|
|
||||||
})(window, document, Object, "registerElement");
|
|
||||||
263
src/bower_components/fetch/fetch.js
vendored
263
src/bower_components/fetch/fetch.js
vendored
|
|
@ -1,263 +0,0 @@
|
||||||
! function(self) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
function normalizeName(name) {
|
|
||||||
if ("string" != typeof name && (name = String(name)), /[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) throw new TypeError("Invalid character in header field name");
|
|
||||||
return name.toLowerCase()
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeValue(value) {
|
|
||||||
return "string" != typeof value && (value = String(value)), value
|
|
||||||
}
|
|
||||||
|
|
||||||
function iteratorFor(items) {
|
|
||||||
var iterator = {
|
|
||||||
next: function() {
|
|
||||||
var value = items.shift();
|
|
||||||
return {
|
|
||||||
done: void 0 === value,
|
|
||||||
value: value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
return support.iterable && (iterator[Symbol.iterator] = function() {
|
|
||||||
return iterator
|
|
||||||
}), iterator
|
|
||||||
}
|
|
||||||
|
|
||||||
function Headers(headers) {
|
|
||||||
this.map = {}, headers instanceof Headers ? headers.forEach(function(value, name) {
|
|
||||||
this.append(name, value)
|
|
||||||
}, this) : headers && Object.getOwnPropertyNames(headers).forEach(function(name) {
|
|
||||||
this.append(name, headers[name])
|
|
||||||
}, this)
|
|
||||||
}
|
|
||||||
|
|
||||||
function consumed(body) {
|
|
||||||
if (body.bodyUsed) return Promise.reject(new TypeError("Already read"));
|
|
||||||
body.bodyUsed = !0
|
|
||||||
}
|
|
||||||
|
|
||||||
function fileReaderReady(reader) {
|
|
||||||
return new Promise(function(resolve, reject) {
|
|
||||||
reader.onload = function() {
|
|
||||||
resolve(reader.result)
|
|
||||||
}, reader.onerror = function() {
|
|
||||||
reject(reader.error)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function readBlobAsArrayBuffer(blob) {
|
|
||||||
var reader = new FileReader,
|
|
||||||
promise = fileReaderReady(reader);
|
|
||||||
return reader.readAsArrayBuffer(blob), promise
|
|
||||||
}
|
|
||||||
|
|
||||||
function readBlobAsText(blob) {
|
|
||||||
var reader = new FileReader,
|
|
||||||
promise = fileReaderReady(reader);
|
|
||||||
return reader.readAsText(blob), promise
|
|
||||||
}
|
|
||||||
|
|
||||||
function readArrayBufferAsText(buf) {
|
|
||||||
for (var view = new Uint8Array(buf), chars = new Array(view.length), i = 0; i < view.length; i++) chars[i] = String.fromCharCode(view[i]);
|
|
||||||
return chars.join("")
|
|
||||||
}
|
|
||||||
|
|
||||||
function bufferClone(buf) {
|
|
||||||
if (buf.slice) return buf.slice(0);
|
|
||||||
var view = new Uint8Array(buf.byteLength);
|
|
||||||
return view.set(new Uint8Array(buf)), view.buffer
|
|
||||||
}
|
|
||||||
|
|
||||||
function Body() {
|
|
||||||
return this.bodyUsed = !1, this._initBody = function(body) {
|
|
||||||
if (this._bodyInit = body, body)
|
|
||||||
if ("string" == typeof body) this._bodyText = body;
|
|
||||||
else if (support.blob && Blob.prototype.isPrototypeOf(body)) this._bodyBlob = body;
|
|
||||||
else if (support.formData && FormData.prototype.isPrototypeOf(body)) this._bodyFormData = body;
|
|
||||||
else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) this._bodyText = body.toString();
|
|
||||||
else if (support.arrayBuffer && support.blob && isDataView(body)) this._bodyArrayBuffer = bufferClone(body.buffer), this._bodyInit = new Blob([this._bodyArrayBuffer]);
|
|
||||||
else {
|
|
||||||
if (!support.arrayBuffer || !ArrayBuffer.prototype.isPrototypeOf(body) && !isArrayBufferView(body)) throw new Error("unsupported BodyInit type");
|
|
||||||
this._bodyArrayBuffer = bufferClone(body)
|
|
||||||
} else this._bodyText = "";
|
|
||||||
this.headers.get("content-type") || ("string" == typeof body ? this.headers.set("content-type", "text/plain;charset=UTF-8") : this._bodyBlob && this._bodyBlob.type ? this.headers.set("content-type", this._bodyBlob.type) : support.searchParams && URLSearchParams.prototype.isPrototypeOf(body) && this.headers.set("content-type", "application/x-www-form-urlencoded;charset=UTF-8"))
|
|
||||||
}, support.blob && (this.blob = function() {
|
|
||||||
var rejected = consumed(this);
|
|
||||||
if (rejected) return rejected;
|
|
||||||
if (this._bodyBlob) return Promise.resolve(this._bodyBlob);
|
|
||||||
if (this._bodyArrayBuffer) return Promise.resolve(new Blob([this._bodyArrayBuffer]));
|
|
||||||
if (this._bodyFormData) throw new Error("could not read FormData body as blob");
|
|
||||||
return Promise.resolve(new Blob([this._bodyText]))
|
|
||||||
}, this.arrayBuffer = function() {
|
|
||||||
return this._bodyArrayBuffer ? consumed(this) || Promise.resolve(this._bodyArrayBuffer) : this.blob().then(readBlobAsArrayBuffer)
|
|
||||||
}), this.text = function() {
|
|
||||||
var rejected = consumed(this);
|
|
||||||
if (rejected) return rejected;
|
|
||||||
if (this._bodyBlob) return readBlobAsText(this._bodyBlob);
|
|
||||||
if (this._bodyArrayBuffer) return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer));
|
|
||||||
if (this._bodyFormData) throw new Error("could not read FormData body as text");
|
|
||||||
return Promise.resolve(this._bodyText)
|
|
||||||
}, support.formData && (this.formData = function() {
|
|
||||||
return this.text().then(decode)
|
|
||||||
}), this.json = function() {
|
|
||||||
return this.text().then(JSON.parse)
|
|
||||||
}, this
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeMethod(method) {
|
|
||||||
var upcased = method.toUpperCase();
|
|
||||||
return methods.indexOf(upcased) > -1 ? upcased : method
|
|
||||||
}
|
|
||||||
|
|
||||||
function Request(input, options) {
|
|
||||||
options = options || {};
|
|
||||||
var body = options.body;
|
|
||||||
if ("string" == typeof input) this.url = input;
|
|
||||||
else {
|
|
||||||
if (input.bodyUsed) throw new TypeError("Already read");
|
|
||||||
this.url = input.url, this.credentials = input.credentials, options.headers || (this.headers = new Headers(input.headers)), this.method = input.method, this.mode = input.mode, body || null == input._bodyInit || (body = input._bodyInit, input.bodyUsed = !0)
|
|
||||||
}
|
|
||||||
if (this.credentials = options.credentials || this.credentials || "omit", !options.headers && this.headers || (this.headers = new Headers(options.headers)), this.method = normalizeMethod(options.method || this.method || "GET"), this.mode = options.mode || this.mode || null, this.referrer = null, ("GET" === this.method || "HEAD" === this.method) && body) throw new TypeError("Body not allowed for GET or HEAD requests");
|
|
||||||
this._initBody(body)
|
|
||||||
}
|
|
||||||
|
|
||||||
function decode(body) {
|
|
||||||
var form = new FormData;
|
|
||||||
return body.trim().split("&").forEach(function(bytes) {
|
|
||||||
if (bytes) {
|
|
||||||
var split = bytes.split("="),
|
|
||||||
name = split.shift().replace(/\+/g, " "),
|
|
||||||
value = split.join("=").replace(/\+/g, " ");
|
|
||||||
form.append(decodeURIComponent(name), decodeURIComponent(value))
|
|
||||||
}
|
|
||||||
}), form
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseHeaders(rawHeaders) {
|
|
||||||
var headers = new Headers;
|
|
||||||
return rawHeaders.split("\r\n").forEach(function(line) {
|
|
||||||
var parts = line.split(":"),
|
|
||||||
key = parts.shift().trim();
|
|
||||||
if (key) {
|
|
||||||
var value = parts.join(":").trim();
|
|
||||||
headers.append(key, value)
|
|
||||||
}
|
|
||||||
}), headers
|
|
||||||
}
|
|
||||||
|
|
||||||
function Response(bodyInit, options) {
|
|
||||||
options || (options = {}), this.type = "default", this.status = "status" in options ? options.status : 200, this.ok = this.status >= 200 && this.status < 300, this.statusText = "statusText" in options ? options.statusText : "OK", this.headers = new Headers(options.headers), this.url = options.url || "", this._initBody(bodyInit)
|
|
||||||
}
|
|
||||||
if (!self.fetch) {
|
|
||||||
var support = {
|
|
||||||
searchParams: "URLSearchParams" in self,
|
|
||||||
iterable: "Symbol" in self && "iterator" in Symbol,
|
|
||||||
blob: "FileReader" in self && "Blob" in self && function() {
|
|
||||||
try {
|
|
||||||
return new Blob, !0
|
|
||||||
} catch (e) {
|
|
||||||
return !1
|
|
||||||
}
|
|
||||||
}(),
|
|
||||||
formData: "FormData" in self,
|
|
||||||
arrayBuffer: "ArrayBuffer" in self
|
|
||||||
};
|
|
||||||
if (support.arrayBuffer) var viewClasses = ["[object Int8Array]", "[object Uint8Array]", "[object Uint8ClampedArray]", "[object Int16Array]", "[object Uint16Array]", "[object Int32Array]", "[object Uint32Array]", "[object Float32Array]", "[object Float64Array]"],
|
|
||||||
isDataView = function(obj) {
|
|
||||||
return obj && DataView.prototype.isPrototypeOf(obj)
|
|
||||||
},
|
|
||||||
isArrayBufferView = ArrayBuffer.isView || function(obj) {
|
|
||||||
return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1
|
|
||||||
};
|
|
||||||
Headers.prototype.append = function(name, value) {
|
|
||||||
name = normalizeName(name), value = normalizeValue(value);
|
|
||||||
var list = this.map[name];
|
|
||||||
list || (list = [], this.map[name] = list), list.push(value)
|
|
||||||
}, Headers.prototype.delete = function(name) {
|
|
||||||
delete this.map[normalizeName(name)]
|
|
||||||
}, Headers.prototype.get = function(name) {
|
|
||||||
var values = this.map[normalizeName(name)];
|
|
||||||
return values ? values[0] : null
|
|
||||||
}, Headers.prototype.getAll = function(name) {
|
|
||||||
return this.map[normalizeName(name)] || []
|
|
||||||
}, Headers.prototype.has = function(name) {
|
|
||||||
return this.map.hasOwnProperty(normalizeName(name))
|
|
||||||
}, Headers.prototype.set = function(name, value) {
|
|
||||||
this.map[normalizeName(name)] = [normalizeValue(value)]
|
|
||||||
}, Headers.prototype.forEach = function(callback, thisArg) {
|
|
||||||
Object.getOwnPropertyNames(this.map).forEach(function(name) {
|
|
||||||
this.map[name].forEach(function(value) {
|
|
||||||
callback.call(thisArg, value, name, this)
|
|
||||||
}, this)
|
|
||||||
}, this)
|
|
||||||
}, Headers.prototype.keys = function() {
|
|
||||||
var items = [];
|
|
||||||
return this.forEach(function(value, name) {
|
|
||||||
items.push(name)
|
|
||||||
}), iteratorFor(items)
|
|
||||||
}, Headers.prototype.values = function() {
|
|
||||||
var items = [];
|
|
||||||
return this.forEach(function(value) {
|
|
||||||
items.push(value)
|
|
||||||
}), iteratorFor(items)
|
|
||||||
}, Headers.prototype.entries = function() {
|
|
||||||
var items = [];
|
|
||||||
return this.forEach(function(value, name) {
|
|
||||||
items.push([name, value])
|
|
||||||
}), iteratorFor(items)
|
|
||||||
}, support.iterable && (Headers.prototype[Symbol.iterator] = Headers.prototype.entries);
|
|
||||||
var methods = ["DELETE", "GET", "HEAD", "OPTIONS", "POST", "PUT"];
|
|
||||||
Request.prototype.clone = function() {
|
|
||||||
return new Request(this, {
|
|
||||||
body: this._bodyInit
|
|
||||||
})
|
|
||||||
}, Body.call(Request.prototype), Body.call(Response.prototype), Response.prototype.clone = function() {
|
|
||||||
return new Response(this._bodyInit, {
|
|
||||||
status: this.status,
|
|
||||||
statusText: this.statusText,
|
|
||||||
headers: new Headers(this.headers),
|
|
||||||
url: this.url
|
|
||||||
})
|
|
||||||
}, Response.error = function() {
|
|
||||||
var response = new Response(null, {
|
|
||||||
status: 0,
|
|
||||||
statusText: ""
|
|
||||||
});
|
|
||||||
return response.type = "error", response
|
|
||||||
};
|
|
||||||
var redirectStatuses = [301, 302, 303, 307, 308];
|
|
||||||
Response.redirect = function(url, status) {
|
|
||||||
if (-1 === redirectStatuses.indexOf(status)) throw new RangeError("Invalid status code");
|
|
||||||
return new Response(null, {
|
|
||||||
status: status,
|
|
||||||
headers: {
|
|
||||||
location: url
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}, self.Headers = Headers, self.Request = Request, self.Response = Response, self.fetch = function(input, init) {
|
|
||||||
return new Promise(function(resolve, reject) {
|
|
||||||
var request = new Request(input, init),
|
|
||||||
xhr = new XMLHttpRequest;
|
|
||||||
xhr.onload = function() {
|
|
||||||
var options = {
|
|
||||||
status: xhr.status,
|
|
||||||
statusText: xhr.statusText,
|
|
||||||
headers: parseHeaders(xhr.getAllResponseHeaders() || "")
|
|
||||||
};
|
|
||||||
options.url = "responseURL" in xhr ? xhr.responseURL : options.headers.get("X-Request-URL");
|
|
||||||
var body = "response" in xhr ? xhr.response : xhr.responseText;
|
|
||||||
resolve(new Response(body, options))
|
|
||||||
}, xhr.onerror = function() {
|
|
||||||
reject(new TypeError("Network request failed"))
|
|
||||||
}, xhr.ontimeout = function() {
|
|
||||||
reject(new TypeError("Network request failed"))
|
|
||||||
}, xhr.open(request.method, request.url, !0), "include" === request.credentials && (xhr.withCredentials = !0), "responseType" in xhr && support.blob && (xhr.responseType = "blob"), request.headers.forEach(function(value, name) {
|
|
||||||
xhr.setRequestHeader(name, value)
|
|
||||||
}), xhr.send(void 0 === request._bodyInit ? null : request._bodyInit)
|
|
||||||
})
|
|
||||||
}, self.fetch.polyfill = !0
|
|
||||||
}
|
|
||||||
}("undefined" != typeof self ? self : this);
|
|
||||||
|
|
@ -1,373 +0,0 @@
|
||||||
/*! Native Promise Only
|
|
||||||
v0.8.0-a (c) Kyle Simpson
|
|
||||||
MIT License: http://getify.mit-license.org
|
|
||||||
*/
|
|
||||||
|
|
||||||
(function UMD(name,context,definition){
|
|
||||||
// special form of UMD for polyfilling across evironments
|
|
||||||
context[name] = definition();
|
|
||||||
if (typeof module != "undefined" && module.exports) { module.exports = context[name]; }
|
|
||||||
else if (typeof define == "function" && define.amd) { define(function $AMD$(){ return context[name]; }); }
|
|
||||||
})("Promise",typeof global != "undefined" ? global : this,function DEF(){
|
|
||||||
/*jshint validthis:true */
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
var builtInProp, cycle, scheduling_queue,
|
|
||||||
ToString = Object.prototype.toString,
|
|
||||||
timer = (typeof setImmediate != "undefined") ?
|
|
||||||
function timer(fn) { return setImmediate(fn); } :
|
|
||||||
setTimeout
|
|
||||||
;
|
|
||||||
|
|
||||||
// dammit, IE8.
|
|
||||||
try {
|
|
||||||
Object.defineProperty({},"x",{});
|
|
||||||
builtInProp = function builtInProp(obj,name,val,config) {
|
|
||||||
return Object.defineProperty(obj,name,{
|
|
||||||
value: val,
|
|
||||||
writable: true,
|
|
||||||
configurable: config !== false
|
|
||||||
});
|
|
||||||
};
|
|
||||||
}
|
|
||||||
catch (err) {
|
|
||||||
builtInProp = function builtInProp(obj,name,val) {
|
|
||||||
obj[name] = val;
|
|
||||||
return obj;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note: using a queue instead of array for efficiency
|
|
||||||
scheduling_queue = (function Queue() {
|
|
||||||
var first, last, item;
|
|
||||||
|
|
||||||
function Item(fn,self) {
|
|
||||||
this.fn = fn;
|
|
||||||
this.self = self;
|
|
||||||
this.next = void 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
add: function add(fn,self) {
|
|
||||||
item = new Item(fn,self);
|
|
||||||
if (last) {
|
|
||||||
last.next = item;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
first = item;
|
|
||||||
}
|
|
||||||
last = item;
|
|
||||||
item = void 0;
|
|
||||||
},
|
|
||||||
drain: function drain() {
|
|
||||||
var f = first;
|
|
||||||
first = last = cycle = void 0;
|
|
||||||
|
|
||||||
while (f) {
|
|
||||||
f.fn.call(f.self);
|
|
||||||
f = f.next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
})();
|
|
||||||
|
|
||||||
function schedule(fn,self) {
|
|
||||||
scheduling_queue.add(fn,self);
|
|
||||||
if (!cycle) {
|
|
||||||
cycle = timer(scheduling_queue.drain);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// promise duck typing
|
|
||||||
function isThenable(o) {
|
|
||||||
var _then, o_type = typeof o;
|
|
||||||
|
|
||||||
if (o != null &&
|
|
||||||
(
|
|
||||||
o_type == "object" || o_type == "function"
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
_then = o.then;
|
|
||||||
}
|
|
||||||
return typeof _then == "function" ? _then : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function notify() {
|
|
||||||
for (var i=0; i<this.chain.length; i++) {
|
|
||||||
notifyIsolated(
|
|
||||||
this,
|
|
||||||
(this.state === 1) ? this.chain[i].success : this.chain[i].failure,
|
|
||||||
this.chain[i]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
this.chain.length = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: This is a separate function to isolate
|
|
||||||
// the `try..catch` so that other code can be
|
|
||||||
// optimized better
|
|
||||||
function notifyIsolated(self,cb,chain) {
|
|
||||||
var ret, _then;
|
|
||||||
try {
|
|
||||||
if (cb === false) {
|
|
||||||
chain.reject(self.msg);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (cb === true) {
|
|
||||||
ret = self.msg;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ret = cb.call(void 0,self.msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ret === chain.promise) {
|
|
||||||
chain.reject(TypeError("Promise-chain cycle"));
|
|
||||||
}
|
|
||||||
else if (_then = isThenable(ret)) {
|
|
||||||
_then.call(ret,chain.resolve,chain.reject);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
chain.resolve(ret);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (err) {
|
|
||||||
chain.reject(err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function resolve(msg) {
|
|
||||||
var _then, self = this;
|
|
||||||
|
|
||||||
// already triggered?
|
|
||||||
if (self.triggered) { return; }
|
|
||||||
|
|
||||||
self.triggered = true;
|
|
||||||
|
|
||||||
// unwrap
|
|
||||||
if (self.def) {
|
|
||||||
self = self.def;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (_then = isThenable(msg)) {
|
|
||||||
schedule(function(){
|
|
||||||
var def_wrapper = new MakeDefWrapper(self);
|
|
||||||
try {
|
|
||||||
_then.call(msg,
|
|
||||||
function $resolve$(){ resolve.apply(def_wrapper,arguments); },
|
|
||||||
function $reject$(){ reject.apply(def_wrapper,arguments); }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
catch (err) {
|
|
||||||
reject.call(def_wrapper,err);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
self.msg = msg;
|
|
||||||
self.state = 1;
|
|
||||||
if (self.chain.length > 0) {
|
|
||||||
schedule(notify,self);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (err) {
|
|
||||||
reject.call(new MakeDefWrapper(self),err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function reject(msg) {
|
|
||||||
var self = this;
|
|
||||||
|
|
||||||
// already triggered?
|
|
||||||
if (self.triggered) { return; }
|
|
||||||
|
|
||||||
self.triggered = true;
|
|
||||||
|
|
||||||
// unwrap
|
|
||||||
if (self.def) {
|
|
||||||
self = self.def;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.msg = msg;
|
|
||||||
self.state = 2;
|
|
||||||
if (self.chain.length > 0) {
|
|
||||||
schedule(notify,self);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function iteratePromises(Constructor,arr,resolver,rejecter) {
|
|
||||||
for (var idx=0; idx<arr.length; idx++) {
|
|
||||||
(function IIFE(idx){
|
|
||||||
Constructor.resolve(arr[idx])
|
|
||||||
.then(
|
|
||||||
function $resolver$(msg){
|
|
||||||
resolver(idx,msg);
|
|
||||||
},
|
|
||||||
rejecter
|
|
||||||
);
|
|
||||||
})(idx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function MakeDefWrapper(self) {
|
|
||||||
this.def = self;
|
|
||||||
this.triggered = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function MakeDef(self) {
|
|
||||||
this.promise = self;
|
|
||||||
this.state = 0;
|
|
||||||
this.triggered = false;
|
|
||||||
this.chain = [];
|
|
||||||
this.msg = void 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
function Promise(executor) {
|
|
||||||
if (typeof executor != "function") {
|
|
||||||
throw TypeError("Not a function");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.__NPO__ !== 0) {
|
|
||||||
throw TypeError("Not a promise");
|
|
||||||
}
|
|
||||||
|
|
||||||
// instance shadowing the inherited "brand"
|
|
||||||
// to signal an already "initialized" promise
|
|
||||||
this.__NPO__ = 1;
|
|
||||||
|
|
||||||
var def = new MakeDef(this);
|
|
||||||
|
|
||||||
this["then"] = function then(success,failure) {
|
|
||||||
var o = {
|
|
||||||
success: typeof success == "function" ? success : true,
|
|
||||||
failure: typeof failure == "function" ? failure : false
|
|
||||||
};
|
|
||||||
// Note: `then(..)` itself can be borrowed to be used against
|
|
||||||
// a different promise constructor for making the chained promise,
|
|
||||||
// by substituting a different `this` binding.
|
|
||||||
o.promise = new this.constructor(function extractChain(resolve,reject) {
|
|
||||||
if (typeof resolve != "function" || typeof reject != "function") {
|
|
||||||
throw TypeError("Not a function");
|
|
||||||
}
|
|
||||||
|
|
||||||
o.resolve = resolve;
|
|
||||||
o.reject = reject;
|
|
||||||
});
|
|
||||||
def.chain.push(o);
|
|
||||||
|
|
||||||
if (def.state !== 0) {
|
|
||||||
schedule(notify,def);
|
|
||||||
}
|
|
||||||
|
|
||||||
return o.promise;
|
|
||||||
};
|
|
||||||
this["catch"] = function $catch$(failure) {
|
|
||||||
return this.then(void 0,failure);
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
executor.call(
|
|
||||||
void 0,
|
|
||||||
function publicResolve(msg){
|
|
||||||
resolve.call(def,msg);
|
|
||||||
},
|
|
||||||
function publicReject(msg) {
|
|
||||||
reject.call(def,msg);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
catch (err) {
|
|
||||||
reject.call(def,err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var PromisePrototype = builtInProp({},"constructor",Promise,
|
|
||||||
/*configurable=*/false
|
|
||||||
);
|
|
||||||
|
|
||||||
// Note: Android 4 cannot use `Object.defineProperty(..)` here
|
|
||||||
Promise.prototype = PromisePrototype;
|
|
||||||
|
|
||||||
// built-in "brand" to signal an "uninitialized" promise
|
|
||||||
builtInProp(PromisePrototype,"__NPO__",0,
|
|
||||||
/*configurable=*/false
|
|
||||||
);
|
|
||||||
|
|
||||||
builtInProp(Promise,"resolve",function Promise$resolve(msg) {
|
|
||||||
var Constructor = this;
|
|
||||||
|
|
||||||
// spec mandated checks
|
|
||||||
// note: best "isPromise" check that's practical for now
|
|
||||||
if (msg && typeof msg == "object" && msg.__NPO__ === 1) {
|
|
||||||
return msg;
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Constructor(function executor(resolve,reject){
|
|
||||||
if (typeof resolve != "function" || typeof reject != "function") {
|
|
||||||
throw TypeError("Not a function");
|
|
||||||
}
|
|
||||||
|
|
||||||
resolve(msg);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
builtInProp(Promise,"reject",function Promise$reject(msg) {
|
|
||||||
return new this(function executor(resolve,reject){
|
|
||||||
if (typeof resolve != "function" || typeof reject != "function") {
|
|
||||||
throw TypeError("Not a function");
|
|
||||||
}
|
|
||||||
|
|
||||||
reject(msg);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
builtInProp(Promise,"all",function Promise$all(arr) {
|
|
||||||
var Constructor = this;
|
|
||||||
|
|
||||||
// spec mandated checks
|
|
||||||
if (ToString.call(arr) != "[object Array]") {
|
|
||||||
return Constructor.reject(TypeError("Not an array"));
|
|
||||||
}
|
|
||||||
if (arr.length === 0) {
|
|
||||||
return Constructor.resolve([]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Constructor(function executor(resolve,reject){
|
|
||||||
if (typeof resolve != "function" || typeof reject != "function") {
|
|
||||||
throw TypeError("Not a function");
|
|
||||||
}
|
|
||||||
|
|
||||||
var len = arr.length, msgs = Array(len), count = 0;
|
|
||||||
|
|
||||||
iteratePromises(Constructor,arr,function resolver(idx,msg) {
|
|
||||||
msgs[idx] = msg;
|
|
||||||
if (++count === len) {
|
|
||||||
resolve(msgs);
|
|
||||||
}
|
|
||||||
},reject);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
builtInProp(Promise,"race",function Promise$race(arr) {
|
|
||||||
var Constructor = this;
|
|
||||||
|
|
||||||
// spec mandated checks
|
|
||||||
if (ToString.call(arr) != "[object Array]") {
|
|
||||||
return Constructor.reject(TypeError("Not an array"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Constructor(function executor(resolve,reject){
|
|
||||||
if (typeof resolve != "function" || typeof reject != "function") {
|
|
||||||
throw TypeError("Not a function");
|
|
||||||
}
|
|
||||||
|
|
||||||
iteratePromises(Constructor,arr,function resolver(idx,msg){
|
|
||||||
resolve(msg);
|
|
||||||
},reject);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
return Promise;
|
|
||||||
});
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
// Adapter for "promises-aplus-tests" test runner
|
|
||||||
|
|
||||||
var path = require("path");
|
|
||||||
var Promise = require(path.join(__dirname,"lib","npo.src.js"));
|
|
||||||
|
|
||||||
module.exports.deferred = function __deferred__() {
|
|
||||||
var o = {};
|
|
||||||
o.promise = new Promise(function __Promise__(resolve,reject){
|
|
||||||
o.resolve = resolve;
|
|
||||||
o.reject = reject;
|
|
||||||
});
|
|
||||||
return o;
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.resolved = function __resolved__(val) {
|
|
||||||
return Promise.resolve(val);
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports.rejected = function __rejected__(reason) {
|
|
||||||
return Promise.reject(reason);
|
|
||||||
};
|
|
||||||
|
|
@ -1,939 +0,0 @@
|
||||||
(function (global, factory) {
|
|
||||||
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
|
|
||||||
typeof define === 'function' && define.amd ? define(factory) :
|
|
||||||
(global.ResizeObserver = factory());
|
|
||||||
}(this, (function () { 'use strict';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A collection of shims that provide minimal functionality of the ES6 collections.
|
|
||||||
*
|
|
||||||
* These implementations are not meant to be used outside of the ResizeObserver
|
|
||||||
* modules as they cover only a limited range of use cases.
|
|
||||||
*/
|
|
||||||
/* eslint-disable require-jsdoc, valid-jsdoc */
|
|
||||||
var MapShim = (function () {
|
|
||||||
if (typeof Map !== 'undefined') {
|
|
||||||
return Map;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns index in provided array that matches the specified key.
|
|
||||||
*
|
|
||||||
* @param {Array<Array>} arr
|
|
||||||
* @param {*} key
|
|
||||||
* @returns {number}
|
|
||||||
*/
|
|
||||||
function getIndex(arr, key) {
|
|
||||||
var result = -1;
|
|
||||||
|
|
||||||
arr.some(function (entry, index) {
|
|
||||||
if (entry[0] === key) {
|
|
||||||
result = index;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (function () {
|
|
||||||
function anonymous() {
|
|
||||||
this.__entries__ = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
var prototypeAccessors = { size: { configurable: true } };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns {boolean}
|
|
||||||
*/
|
|
||||||
prototypeAccessors.size.get = function () {
|
|
||||||
return this.__entries__.length;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {*} key
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
|
||||||
anonymous.prototype.get = function (key) {
|
|
||||||
var index = getIndex(this.__entries__, key);
|
|
||||||
var entry = this.__entries__[index];
|
|
||||||
|
|
||||||
return entry && entry[1];
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {*} key
|
|
||||||
* @param {*} value
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
anonymous.prototype.set = function (key, value) {
|
|
||||||
var index = getIndex(this.__entries__, key);
|
|
||||||
|
|
||||||
if (~index) {
|
|
||||||
this.__entries__[index][1] = value;
|
|
||||||
} else {
|
|
||||||
this.__entries__.push([key, value]);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {*} key
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
anonymous.prototype.delete = function (key) {
|
|
||||||
var entries = this.__entries__;
|
|
||||||
var index = getIndex(entries, key);
|
|
||||||
|
|
||||||
if (~index) {
|
|
||||||
entries.splice(index, 1);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {*} key
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
anonymous.prototype.has = function (key) {
|
|
||||||
return !!~getIndex(this.__entries__, key);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
anonymous.prototype.clear = function () {
|
|
||||||
this.__entries__.splice(0);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {Function} callback
|
|
||||||
* @param {*} [ctx=null]
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
anonymous.prototype.forEach = function (callback, ctx) {
|
|
||||||
var this$1 = this;
|
|
||||||
if ( ctx === void 0 ) ctx = null;
|
|
||||||
|
|
||||||
for (var i = 0, list = this$1.__entries__; i < list.length; i += 1) {
|
|
||||||
var entry = list[i];
|
|
||||||
|
|
||||||
callback.call(ctx, entry[1], entry[0]);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Object.defineProperties( anonymous.prototype, prototypeAccessors );
|
|
||||||
|
|
||||||
return anonymous;
|
|
||||||
}());
|
|
||||||
})();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Detects whether window and document objects are available in current environment.
|
|
||||||
*/
|
|
||||||
var isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined' && window.document === document;
|
|
||||||
|
|
||||||
// Returns global object of a current environment.
|
|
||||||
var global$1 = (function () {
|
|
||||||
if (typeof global !== 'undefined' && global.Math === Math) {
|
|
||||||
return global;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof self !== 'undefined' && self.Math === Math) {
|
|
||||||
return self;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof window !== 'undefined' && window.Math === Math) {
|
|
||||||
return window;
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line no-new-func
|
|
||||||
return Function('return this')();
|
|
||||||
})();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A shim for the requestAnimationFrame which falls back to the setTimeout if
|
|
||||||
* first one is not supported.
|
|
||||||
*
|
|
||||||
* @returns {number} Requests' identifier.
|
|
||||||
*/
|
|
||||||
var requestAnimationFrame$1 = (function () {
|
|
||||||
if (typeof requestAnimationFrame === 'function') {
|
|
||||||
// It's required to use a bounded function because IE sometimes throws
|
|
||||||
// an "Invalid calling object" error if rAF is invoked without the global
|
|
||||||
// object on the left hand side.
|
|
||||||
return requestAnimationFrame.bind(global$1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return function (callback) { return setTimeout(function () { return callback(Date.now()); }, 1000 / 60); };
|
|
||||||
})();
|
|
||||||
|
|
||||||
// Defines minimum timeout before adding a trailing call.
|
|
||||||
var trailingTimeout = 2;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a wrapper function which ensures that provided callback will be
|
|
||||||
* invoked only once during the specified delay period.
|
|
||||||
*
|
|
||||||
* @param {Function} callback - Function to be invoked after the delay period.
|
|
||||||
* @param {number} delay - Delay after which to invoke callback.
|
|
||||||
* @returns {Function}
|
|
||||||
*/
|
|
||||||
var throttle = function (callback, delay) {
|
|
||||||
var leadingCall = false,
|
|
||||||
trailingCall = false,
|
|
||||||
lastCallTime = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Invokes the original callback function and schedules new invocation if
|
|
||||||
* the "proxy" was called during current request.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
function resolvePending() {
|
|
||||||
if (leadingCall) {
|
|
||||||
leadingCall = false;
|
|
||||||
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (trailingCall) {
|
|
||||||
proxy();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Callback invoked after the specified delay. It will further postpone
|
|
||||||
* invocation of the original function delegating it to the
|
|
||||||
* requestAnimationFrame.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
function timeoutCallback() {
|
|
||||||
requestAnimationFrame$1(resolvePending);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedules invocation of the original function.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
function proxy() {
|
|
||||||
var timeStamp = Date.now();
|
|
||||||
|
|
||||||
if (leadingCall) {
|
|
||||||
// Reject immediately following calls.
|
|
||||||
if (timeStamp - lastCallTime < trailingTimeout) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Schedule new call to be in invoked when the pending one is resolved.
|
|
||||||
// This is important for "transitions" which never actually start
|
|
||||||
// immediately so there is a chance that we might miss one if change
|
|
||||||
// happens amids the pending invocation.
|
|
||||||
trailingCall = true;
|
|
||||||
} else {
|
|
||||||
leadingCall = true;
|
|
||||||
trailingCall = false;
|
|
||||||
|
|
||||||
setTimeout(timeoutCallback, delay);
|
|
||||||
}
|
|
||||||
|
|
||||||
lastCallTime = timeStamp;
|
|
||||||
}
|
|
||||||
|
|
||||||
return proxy;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Minimum delay before invoking the update of observers.
|
|
||||||
var REFRESH_DELAY = 20;
|
|
||||||
|
|
||||||
// A list of substrings of CSS properties used to find transition events that
|
|
||||||
// might affect dimensions of observed elements.
|
|
||||||
var transitionKeys = ['top', 'right', 'bottom', 'left', 'width', 'height', 'size', 'weight'];
|
|
||||||
|
|
||||||
// Check if MutationObserver is available.
|
|
||||||
var mutationObserverSupported = typeof MutationObserver !== 'undefined';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Singleton controller class which handles updates of ResizeObserver instances.
|
|
||||||
*/
|
|
||||||
var ResizeObserverController = function() {
|
|
||||||
this.connected_ = false;
|
|
||||||
this.mutationEventsAdded_ = false;
|
|
||||||
this.mutationsObserver_ = null;
|
|
||||||
this.observers_ = [];
|
|
||||||
|
|
||||||
this.onTransitionEnd_ = this.onTransitionEnd_.bind(this);
|
|
||||||
this.refresh = throttle(this.refresh.bind(this), REFRESH_DELAY);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds observer to observers list.
|
|
||||||
*
|
|
||||||
* @param {ResizeObserverSPI} observer - Observer to be added.
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Holds reference to the controller's instance.
|
|
||||||
*
|
|
||||||
* @private {ResizeObserverController}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Keeps reference to the instance of MutationObserver.
|
|
||||||
*
|
|
||||||
* @private {MutationObserver}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates whether DOM listeners have been added.
|
|
||||||
*
|
|
||||||
* @private {boolean}
|
|
||||||
*/
|
|
||||||
ResizeObserverController.prototype.addObserver = function (observer) {
|
|
||||||
if (!~this.observers_.indexOf(observer)) {
|
|
||||||
this.observers_.push(observer);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add listeners if they haven't been added yet.
|
|
||||||
if (!this.connected_) {
|
|
||||||
this.connect_();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes observer from observers list.
|
|
||||||
*
|
|
||||||
* @param {ResizeObserverSPI} observer - Observer to be removed.
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverController.prototype.removeObserver = function (observer) {
|
|
||||||
var observers = this.observers_;
|
|
||||||
var index = observers.indexOf(observer);
|
|
||||||
|
|
||||||
// Remove observer if it's present in registry.
|
|
||||||
if (~index) {
|
|
||||||
observers.splice(index, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove listeners if controller has no connected observers.
|
|
||||||
if (!observers.length && this.connected_) {
|
|
||||||
this.disconnect_();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Invokes the update of observers. It will continue running updates insofar
|
|
||||||
* it detects changes.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverController.prototype.refresh = function () {
|
|
||||||
var changesDetected = this.updateObservers_();
|
|
||||||
|
|
||||||
// Continue running updates if changes have been detected as there might
|
|
||||||
// be future ones caused by CSS transitions.
|
|
||||||
if (changesDetected) {
|
|
||||||
this.refresh();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates every observer from observers list and notifies them of queued
|
|
||||||
* entries.
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @returns {boolean} Returns "true" if any observer has detected changes in
|
|
||||||
* dimensions of it's elements.
|
|
||||||
*/
|
|
||||||
ResizeObserverController.prototype.updateObservers_ = function () {
|
|
||||||
// Collect observers that have active observations.
|
|
||||||
var activeObservers = this.observers_.filter(function (observer) {
|
|
||||||
return observer.gatherActive(), observer.hasActive();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Deliver notifications in a separate cycle in order to avoid any
|
|
||||||
// collisions between observers, e.g. when multiple instances of
|
|
||||||
// ResizeObserver are tracking the same element and the callback of one
|
|
||||||
// of them changes content dimensions of the observed target. Sometimes
|
|
||||||
// this may result in notifications being blocked for the rest of observers.
|
|
||||||
activeObservers.forEach(function (observer) { return observer.broadcastActive(); });
|
|
||||||
|
|
||||||
return activeObservers.length > 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initializes DOM listeners.
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverController.prototype.connect_ = function () {
|
|
||||||
// Do nothing if running in a non-browser environment or if listeners
|
|
||||||
// have been already added.
|
|
||||||
if (!isBrowser || this.connected_) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Subscription to the "Transitionend" event is used as a workaround for
|
|
||||||
// delayed transitions. This way it's possible to capture at least the
|
|
||||||
// final state of an element.
|
|
||||||
document.addEventListener('transitionend', this.onTransitionEnd_);
|
|
||||||
|
|
||||||
window.addEventListener('resize', this.refresh);
|
|
||||||
window.addEventListener('orientationchange', this.refresh);
|
|
||||||
|
|
||||||
if (mutationObserverSupported) {
|
|
||||||
this.mutationsObserver_ = new MutationObserver(this.refresh);
|
|
||||||
|
|
||||||
this.mutationsObserver_.observe(document, {
|
|
||||||
attributes: true,
|
|
||||||
childList: true,
|
|
||||||
characterData: true,
|
|
||||||
subtree: true
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
document.addEventListener('DOMSubtreeModified', this.refresh);
|
|
||||||
|
|
||||||
this.mutationEventsAdded_ = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.connected_ = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes DOM listeners.
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverController.prototype.disconnect_ = function () {
|
|
||||||
// Do nothing if running in a non-browser environment or if listeners
|
|
||||||
// have been already removed.
|
|
||||||
if (!isBrowser || !this.connected_) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
document.removeEventListener('transitionend', this.onTransitionEnd_);
|
|
||||||
window.removeEventListener('resize', this.refresh);
|
|
||||||
window.removeEventListener('orientationchange', this.refresh);
|
|
||||||
|
|
||||||
if (this.mutationsObserver_) {
|
|
||||||
this.mutationsObserver_.disconnect();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.mutationEventsAdded_) {
|
|
||||||
document.removeEventListener('DOMSubtreeModified', this.refresh);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.mutationsObserver_ = null;
|
|
||||||
this.mutationEventsAdded_ = false;
|
|
||||||
this.connected_ = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* "Transitionend" event handler.
|
|
||||||
*
|
|
||||||
* @private
|
|
||||||
* @param {TransitionEvent} event
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverController.prototype.onTransitionEnd_ = function (ref) {
|
|
||||||
var propertyName = ref.propertyName; if ( propertyName === void 0 ) propertyName = '';
|
|
||||||
|
|
||||||
// Detect whether transition may affect dimensions of an element.
|
|
||||||
var isReflowProperty = transitionKeys.some(function (key) {
|
|
||||||
return !!~propertyName.indexOf(key);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (isReflowProperty) {
|
|
||||||
this.refresh();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns instance of the ResizeObserverController.
|
|
||||||
*
|
|
||||||
* @returns {ResizeObserverController}
|
|
||||||
*/
|
|
||||||
ResizeObserverController.getInstance = function () {
|
|
||||||
if (!this.instance_) {
|
|
||||||
this.instance_ = new ResizeObserverController();
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.instance_;
|
|
||||||
};
|
|
||||||
|
|
||||||
ResizeObserverController.instance_ = null;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Defines non-writable/enumerable properties of the provided target object.
|
|
||||||
*
|
|
||||||
* @param {Object} target - Object for which to define properties.
|
|
||||||
* @param {Object} props - Properties to be defined.
|
|
||||||
* @returns {Object} Target object.
|
|
||||||
*/
|
|
||||||
var defineConfigurable = (function (target, props) {
|
|
||||||
for (var i = 0, list = Object.keys(props); i < list.length; i += 1) {
|
|
||||||
var key = list[i];
|
|
||||||
|
|
||||||
Object.defineProperty(target, key, {
|
|
||||||
value: props[key],
|
|
||||||
enumerable: false,
|
|
||||||
writable: false,
|
|
||||||
configurable: true
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return target;
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the global object associated with provided element.
|
|
||||||
*
|
|
||||||
* @param {Object} target
|
|
||||||
* @returns {Object}
|
|
||||||
*/
|
|
||||||
var getWindowOf = (function (target) {
|
|
||||||
// Assume that the element is an instance of Node, which means that it
|
|
||||||
// has the "ownerDocument" property from which we can retrieve a
|
|
||||||
// corresponding global object.
|
|
||||||
var ownerGlobal = target && target.ownerDocument && target.ownerDocument.defaultView;
|
|
||||||
|
|
||||||
// Return the local global object if it's not possible extract one from
|
|
||||||
// provided element.
|
|
||||||
return ownerGlobal || global$1;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Placeholder of an empty content rectangle.
|
|
||||||
var emptyRect = createRectInit(0, 0, 0, 0);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts provided string to a number.
|
|
||||||
*
|
|
||||||
* @param {number|string} value
|
|
||||||
* @returns {number}
|
|
||||||
*/
|
|
||||||
function toFloat(value) {
|
|
||||||
return parseFloat(value) || 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extracts borders size from provided styles.
|
|
||||||
*
|
|
||||||
* @param {CSSStyleDeclaration} styles
|
|
||||||
* @param {...string} positions - Borders positions (top, right, ...)
|
|
||||||
* @returns {number}
|
|
||||||
*/
|
|
||||||
function getBordersSize(styles) {
|
|
||||||
var positions = [], len = arguments.length - 1;
|
|
||||||
while ( len-- > 0 ) positions[ len ] = arguments[ len + 1 ];
|
|
||||||
|
|
||||||
return positions.reduce(function (size, position) {
|
|
||||||
var value = styles['border-' + position + '-width'];
|
|
||||||
|
|
||||||
return size + toFloat(value);
|
|
||||||
}, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extracts paddings sizes from provided styles.
|
|
||||||
*
|
|
||||||
* @param {CSSStyleDeclaration} styles
|
|
||||||
* @returns {Object} Paddings box.
|
|
||||||
*/
|
|
||||||
function getPaddings(styles) {
|
|
||||||
var positions = ['top', 'right', 'bottom', 'left'];
|
|
||||||
var paddings = {};
|
|
||||||
|
|
||||||
for (var i = 0, list = positions; i < list.length; i += 1) {
|
|
||||||
var position = list[i];
|
|
||||||
|
|
||||||
var value = styles['padding-' + position];
|
|
||||||
|
|
||||||
paddings[position] = toFloat(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return paddings;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates content rectangle of provided SVG element.
|
|
||||||
*
|
|
||||||
* @param {SVGGraphicsElement} target - Element content rectangle of which needs
|
|
||||||
* to be calculated.
|
|
||||||
* @returns {DOMRectInit}
|
|
||||||
*/
|
|
||||||
function getSVGContentRect(target) {
|
|
||||||
var bbox = target.getBBox();
|
|
||||||
|
|
||||||
return createRectInit(0, 0, bbox.width, bbox.height);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates content rectangle of provided HTMLElement.
|
|
||||||
*
|
|
||||||
* @param {HTMLElement} target - Element for which to calculate the content rectangle.
|
|
||||||
* @returns {DOMRectInit}
|
|
||||||
*/
|
|
||||||
function getHTMLElementContentRect(target) {
|
|
||||||
|
|
||||||
var rect = target.getBoundingClientRect();
|
|
||||||
return createRectInit(rect.left, rect.top, rect.width, rect.height);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks whether provided element is a document element (<html>).
|
|
||||||
*
|
|
||||||
* @param {Element} target - Element to be checked.
|
|
||||||
* @returns {boolean}
|
|
||||||
*/
|
|
||||||
function isDocumentElement(target) {
|
|
||||||
return target === getWindowOf(target).document.documentElement;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates an appropriate content rectangle for provided html or svg element.
|
|
||||||
*
|
|
||||||
* @param {Element} target - Element content rectangle of which needs to be calculated.
|
|
||||||
* @returns {DOMRectInit}
|
|
||||||
*/
|
|
||||||
function getContentRect(target) {
|
|
||||||
if (!isBrowser) {
|
|
||||||
return emptyRect;
|
|
||||||
}
|
|
||||||
|
|
||||||
return getHTMLElementContentRect(target);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates rectangle with an interface of the DOMRectReadOnly.
|
|
||||||
* Spec: https://drafts.fxtf.org/geometry/#domrectreadonly
|
|
||||||
*
|
|
||||||
* @param {DOMRectInit} rectInit - Object with rectangle's x/y coordinates and dimensions.
|
|
||||||
* @returns {DOMRectReadOnly}
|
|
||||||
*/
|
|
||||||
function createReadOnlyRect(ref) {
|
|
||||||
var x = ref.x;
|
|
||||||
var y = ref.y;
|
|
||||||
var width = ref.width;
|
|
||||||
var height = ref.height;
|
|
||||||
|
|
||||||
// If DOMRectReadOnly is available use it as a prototype for the rectangle.
|
|
||||||
var Constr = typeof DOMRectReadOnly !== 'undefined' ? DOMRectReadOnly : Object;
|
|
||||||
var rect = Object.create(Constr.prototype);
|
|
||||||
|
|
||||||
// Rectangle's properties are not writable and non-enumerable.
|
|
||||||
defineConfigurable(rect, {
|
|
||||||
x: x, y: y, width: width, height: height,
|
|
||||||
top: y,
|
|
||||||
right: x + width,
|
|
||||||
bottom: height + y,
|
|
||||||
left: x
|
|
||||||
});
|
|
||||||
|
|
||||||
return rect;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates DOMRectInit object based on the provided dimensions and the x/y coordinates.
|
|
||||||
* Spec: https://drafts.fxtf.org/geometry/#dictdef-domrectinit
|
|
||||||
*
|
|
||||||
* @param {number} x - X coordinate.
|
|
||||||
* @param {number} y - Y coordinate.
|
|
||||||
* @param {number} width - Rectangle's width.
|
|
||||||
* @param {number} height - Rectangle's height.
|
|
||||||
* @returns {DOMRectInit}
|
|
||||||
*/
|
|
||||||
function createRectInit(x, y, width, height) {
|
|
||||||
return { x: x, y: y, width: width, height: height };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class that is responsible for computations of the content rectangle of
|
|
||||||
* provided DOM element and for keeping track of it's changes.
|
|
||||||
*/
|
|
||||||
var ResizeObservation = function(target) {
|
|
||||||
this.broadcastWidth = 0;
|
|
||||||
this.broadcastHeight = 0;
|
|
||||||
this.contentRect_ = createRectInit(0, 0, 0, 0);
|
|
||||||
|
|
||||||
this.target = target;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates content rectangle and tells whether it's width or height properties
|
|
||||||
* have changed since the last broadcast.
|
|
||||||
*
|
|
||||||
* @returns {boolean}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reference to the last observed content rectangle.
|
|
||||||
*
|
|
||||||
* @private {DOMRectInit}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Broadcasted width of content rectangle.
|
|
||||||
*
|
|
||||||
* @type {number}
|
|
||||||
*/
|
|
||||||
ResizeObservation.prototype.isActive = function () {
|
|
||||||
var rect = getContentRect(this.target);
|
|
||||||
|
|
||||||
this.contentRect_ = rect;
|
|
||||||
return rect.width !== this.broadcastWidth || rect.height !== this.broadcastHeight;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates 'broadcastWidth' and 'broadcastHeight' properties with a data
|
|
||||||
* from the corresponding properties of the last observed content rectangle.
|
|
||||||
*
|
|
||||||
* @returns {DOMRectInit} Last observed content rectangle.
|
|
||||||
*/
|
|
||||||
ResizeObservation.prototype.broadcastRect = function () {
|
|
||||||
var rect = this.contentRect_;
|
|
||||||
|
|
||||||
this.broadcastWidth = rect.width;
|
|
||||||
this.broadcastHeight = rect.height;
|
|
||||||
|
|
||||||
return rect;
|
|
||||||
};
|
|
||||||
|
|
||||||
var ResizeObserverEntry = function(target, rectInit) {
|
|
||||||
var contentRect = createReadOnlyRect(rectInit);
|
|
||||||
|
|
||||||
// According to the specification following properties are not writable
|
|
||||||
// and are also not enumerable in the native implementation.
|
|
||||||
//
|
|
||||||
// Property accessors are not being used as they'd require to define a
|
|
||||||
// private WeakMap storage which may cause memory leaks in browsers that
|
|
||||||
// don't support this type of collections.
|
|
||||||
defineConfigurable(this, { target: target, contentRect: contentRect });
|
|
||||||
};
|
|
||||||
|
|
||||||
var ResizeObserverSPI = function(callback, controller, callbackCtx) {
|
|
||||||
this.activeObservations_ = [];
|
|
||||||
this.observations_ = new MapShim();
|
|
||||||
|
|
||||||
if (typeof callback !== 'function') {
|
|
||||||
throw new TypeError('The callback provided as parameter 1 is not a function.');
|
|
||||||
}
|
|
||||||
|
|
||||||
this.callback_ = callback;
|
|
||||||
this.controller_ = controller;
|
|
||||||
this.callbackCtx_ = callbackCtx;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Starts observing provided element.
|
|
||||||
*
|
|
||||||
* @param {Element} target - Element to be observed.
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registry of the ResizeObservation instances.
|
|
||||||
*
|
|
||||||
* @private {Map<Element, ResizeObservation>}
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Public ResizeObserver instance which will be passed to the callback
|
|
||||||
* function and used as a value of it's "this" binding.
|
|
||||||
*
|
|
||||||
* @private {ResizeObserver}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Collection of resize observations that have detected changes in dimensions
|
|
||||||
* of elements.
|
|
||||||
*
|
|
||||||
* @private {Array<ResizeObservation>}
|
|
||||||
*/
|
|
||||||
ResizeObserverSPI.prototype.observe = function (target) {
|
|
||||||
if (!arguments.length) {
|
|
||||||
throw new TypeError('1 argument required, but only 0 present.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Do nothing if current environment doesn't have the Element interface.
|
|
||||||
if (typeof Element === 'undefined' || !(Element instanceof Object)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(target instanceof getWindowOf(target).Element)) {
|
|
||||||
throw new TypeError('parameter 1 is not of type "Element".');
|
|
||||||
}
|
|
||||||
|
|
||||||
var observations = this.observations_;
|
|
||||||
|
|
||||||
// Do nothing if element is already being observed.
|
|
||||||
if (observations.has(target)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
observations.set(target, new ResizeObservation(target));
|
|
||||||
|
|
||||||
this.controller_.addObserver(this);
|
|
||||||
|
|
||||||
// Force the update of observations.
|
|
||||||
this.controller_.refresh();
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops observing provided element.
|
|
||||||
*
|
|
||||||
* @param {Element} target - Element to stop observing.
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverSPI.prototype.unobserve = function (target) {
|
|
||||||
if (!arguments.length) {
|
|
||||||
throw new TypeError('1 argument required, but only 0 present.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Do nothing if current environment doesn't have the Element interface.
|
|
||||||
if (typeof Element === 'undefined' || !(Element instanceof Object)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(target instanceof getWindowOf(target).Element)) {
|
|
||||||
throw new TypeError('parameter 1 is not of type "Element".');
|
|
||||||
}
|
|
||||||
|
|
||||||
var observations = this.observations_;
|
|
||||||
|
|
||||||
// Do nothing if element is not being observed.
|
|
||||||
if (!observations.has(target)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
observations.delete(target);
|
|
||||||
|
|
||||||
if (!observations.size) {
|
|
||||||
this.controller_.removeObserver(this);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Stops observing all elements.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverSPI.prototype.disconnect = function () {
|
|
||||||
this.clearActive();
|
|
||||||
this.observations_.clear();
|
|
||||||
this.controller_.removeObserver(this);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Collects observation instances the associated element of which has changed
|
|
||||||
* it's content rectangle.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverSPI.prototype.gatherActive = function () {
|
|
||||||
var this$1 = this;
|
|
||||||
|
|
||||||
this.clearActive();
|
|
||||||
|
|
||||||
this.observations_.forEach(function (observation) {
|
|
||||||
if (observation.isActive()) {
|
|
||||||
this$1.activeObservations_.push(observation);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Invokes initial callback function with a list of ResizeObserverEntry
|
|
||||||
* instances collected from active resize observations.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverSPI.prototype.broadcastActive = function () {
|
|
||||||
// Do nothing if observer doesn't have active observations.
|
|
||||||
if (!this.hasActive()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var ctx = this.callbackCtx_;
|
|
||||||
|
|
||||||
// Create ResizeObserverEntry instance for every active observation.
|
|
||||||
var entries = this.activeObservations_.map(function (observation) {
|
|
||||||
return new ResizeObserverEntry(observation.target, observation.broadcastRect());
|
|
||||||
});
|
|
||||||
|
|
||||||
this.callback_.call(ctx, entries, ctx);
|
|
||||||
this.clearActive();
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears the collection of active observations.
|
|
||||||
*
|
|
||||||
* @returns {void}
|
|
||||||
*/
|
|
||||||
ResizeObserverSPI.prototype.clearActive = function () {
|
|
||||||
this.activeObservations_.splice(0);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tells whether observer has active observations.
|
|
||||||
*
|
|
||||||
* @returns {boolean}
|
|
||||||
*/
|
|
||||||
ResizeObserverSPI.prototype.hasActive = function () {
|
|
||||||
return this.activeObservations_.length > 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Registry of internal observers. If WeakMap is not available use current shim
|
|
||||||
// for the Map collection as it has all required methods and because WeakMap
|
|
||||||
// can't be fully polyfilled anyway.
|
|
||||||
var observers = typeof WeakMap !== 'undefined' ? new WeakMap() : new MapShim();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ResizeObserver API. Encapsulates the ResizeObserver SPI implementation
|
|
||||||
* exposing only those methods and properties that are defined in the spec.
|
|
||||||
*/
|
|
||||||
var ResizeObserver = function(callback) {
|
|
||||||
if (!(this instanceof ResizeObserver)) {
|
|
||||||
throw new TypeError('Cannot call a class as a function.');
|
|
||||||
}
|
|
||||||
if (!arguments.length) {
|
|
||||||
throw new TypeError('1 argument required, but only 0 present.');
|
|
||||||
}
|
|
||||||
|
|
||||||
var controller = ResizeObserverController.getInstance();
|
|
||||||
var observer = new ResizeObserverSPI(callback, controller, this);
|
|
||||||
|
|
||||||
observers.set(this, observer);
|
|
||||||
};
|
|
||||||
|
|
||||||
// Expose public methods of ResizeObserver.
|
|
||||||
['observe', 'unobserve', 'disconnect'].forEach(function (method) {
|
|
||||||
ResizeObserver.prototype[method] = function () {
|
|
||||||
return (ref = observers.get(this))[method].apply(ref, arguments);
|
|
||||||
var ref;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
var index = (function () {
|
|
||||||
// Export existing implementation if available.
|
|
||||||
if (typeof global$1.ResizeObserver !== 'undefined') {
|
|
||||||
return global$1.ResizeObserver;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ResizeObserver;
|
|
||||||
})();
|
|
||||||
|
|
||||||
return index;
|
|
||||||
|
|
||||||
})));
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -4,41 +4,89 @@
|
||||||
// Use define from require.js not webpack's define
|
// Use define from require.js not webpack's define
|
||||||
var _define = window.define;
|
var _define = window.define;
|
||||||
|
|
||||||
|
// document-register-element
|
||||||
|
var docRegister = require("document-register-element");
|
||||||
|
_define("document-register-element", function() {
|
||||||
|
return docRegister;
|
||||||
|
});
|
||||||
|
|
||||||
|
// fetch
|
||||||
|
var fetch = require("whatwg-fetch");
|
||||||
|
_define("fetch", function() {
|
||||||
|
return fetch
|
||||||
|
});
|
||||||
|
|
||||||
// flvjs
|
// flvjs
|
||||||
var flvjs = require("flv.js");
|
var flvjs = require("flv.js");
|
||||||
_define("flvjs", function() { return flvjs; });
|
_define("flvjs", function() {
|
||||||
|
return flvjs;
|
||||||
|
});
|
||||||
|
|
||||||
// jstree
|
// jstree
|
||||||
var jstree = require("jstree");
|
var jstree = require("jstree");
|
||||||
require("jstree/dist/themes/default/style.css");
|
require("jstree/dist/themes/default/style.css");
|
||||||
_define("jstree", function() { return jstree; });
|
_define("jstree", function() {
|
||||||
|
return jstree;
|
||||||
|
});
|
||||||
|
|
||||||
// jquery
|
// jquery
|
||||||
var jquery = require("jquery");
|
var jquery = require("jquery");
|
||||||
_define("jQuery", function() { return jquery; });
|
_define("jQuery", function() {
|
||||||
|
return jquery;
|
||||||
|
});
|
||||||
|
|
||||||
// hlsjs
|
// hlsjs
|
||||||
var hlsjs = require("hls.js");
|
var hlsjs = require("hls.js");
|
||||||
_define("hlsjs", function() { return hlsjs; });
|
_define("hlsjs", function() {
|
||||||
|
return hlsjs;
|
||||||
|
});
|
||||||
|
|
||||||
// howler
|
// howler
|
||||||
var howler = require("howler");
|
var howler = require("howler");
|
||||||
_define("howler", function() { return howler; });
|
_define("howler", function() {
|
||||||
|
return howler;
|
||||||
|
});
|
||||||
|
|
||||||
|
// native-promise-only
|
||||||
|
var nativePromise = require("native-promise-only");
|
||||||
|
_define("native-promise-only", function() {
|
||||||
|
return nativePromise;
|
||||||
|
});
|
||||||
|
|
||||||
|
// resize-observer-polyfill
|
||||||
|
var resize = require("resize-observer-polyfill");
|
||||||
|
_define("resize-observer-polyfill", function() {
|
||||||
|
return resize;
|
||||||
|
});
|
||||||
|
|
||||||
// shaka
|
// shaka
|
||||||
var shaka = require("shaka-player");
|
var shaka = require("shaka-player");
|
||||||
_define("shaka", function() { return shaka; });
|
_define("shaka", function() {
|
||||||
|
return shaka;
|
||||||
|
});
|
||||||
|
|
||||||
// swiper
|
// swiper
|
||||||
var swiper = require("swiper");
|
var swiper = require("swiper");
|
||||||
require("swiper/dist/css/swiper.min.css");
|
require("swiper/dist/css/swiper.min.css");
|
||||||
_define("swiper", function() { return swiper; });
|
_define("swiper", function() {
|
||||||
|
return swiper;
|
||||||
|
});
|
||||||
|
|
||||||
// sortable
|
// sortable
|
||||||
var sortable = require("sortablejs");
|
var sortable = require("sortablejs");
|
||||||
_define("sortable", function() { return sortable; });
|
_define("sortable", function() {
|
||||||
|
return sortable;
|
||||||
|
});
|
||||||
|
|
||||||
|
// webcomponents
|
||||||
|
var webcomponents = require("webcomponents.js-2");
|
||||||
|
_define("webcomponents", function() {
|
||||||
|
return webcomponents
|
||||||
|
});
|
||||||
|
|
||||||
// libjass
|
// libjass
|
||||||
var libjass = require("libjass");
|
var libjass = require("libjass");
|
||||||
require("libjass/libjass.css");
|
require("libjass/libjass.css");
|
||||||
_define("libjass", function() { return libjass; });
|
_define("libjass", function() {
|
||||||
|
return libjass;
|
||||||
|
});
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,9 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
|
||||||
style += "min-width:" + minWidth + "px;";
|
style += "min-width:" + minWidth + "px;";
|
||||||
}
|
}
|
||||||
|
|
||||||
var i, length, option;
|
var i;
|
||||||
|
var length;
|
||||||
|
var option;
|
||||||
var renderIcon = false;
|
var renderIcon = false;
|
||||||
var icons = [];
|
var icons = [];
|
||||||
var itemIcon;
|
var itemIcon;
|
||||||
|
|
@ -225,8 +227,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
|
||||||
if (itemIcon) {
|
if (itemIcon) {
|
||||||
|
|
||||||
html += '<i class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent md-icon">' + itemIcon + '</i>';
|
html += '<i class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent md-icon">' + itemIcon + '</i>';
|
||||||
}
|
} else if (renderIcon && !center) {
|
||||||
else if (renderIcon && !center) {
|
|
||||||
html += '<i class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent md-icon" style="visibility:hidden;">check</i>';
|
html += '<i class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent md-icon" style="visibility:hidden;">check</i>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize)
|
||||||
if (result === 'ok') {
|
if (result === 'ok') {
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
|
|
||||||
return Promise.reject();
|
return Promise.reject();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -50,9 +50,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
|
||||||
|
|
||||||
var vertical = element.classList.contains('alphaPicker-vertical');
|
var vertical = element.classList.contains('alphaPicker-vertical');
|
||||||
|
|
||||||
if (vertical) {
|
if (!vertical) {
|
||||||
|
|
||||||
} else {
|
|
||||||
element.classList.add('focuscontainer-x');
|
element.classList.add('focuscontainer-x');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -228,7 +226,8 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
|
||||||
AlphaPicker.prototype.value = function (value, applyValue) {
|
AlphaPicker.prototype.value = function (value, applyValue) {
|
||||||
|
|
||||||
var element = this.options.element;
|
var element = this.options.element;
|
||||||
var btn, selected;
|
var btn;
|
||||||
|
var selected;
|
||||||
|
|
||||||
if (value !== undefined) {
|
if (value !== undefined) {
|
||||||
if (value != null) {
|
if (value != null) {
|
||||||
|
|
|
||||||
|
|
@ -313,7 +313,7 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function (appSet
|
||||||
var deviceId;
|
var deviceId;
|
||||||
var deviceName;
|
var deviceName;
|
||||||
var appName = "Jellyfin Web";
|
var appName = "Jellyfin Web";
|
||||||
var appVersion = "10.4.0";
|
var appVersion = "10.5.0";
|
||||||
var visibilityChange;
|
var visibilityChange;
|
||||||
var visibilityState;
|
var visibilityState;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,18 +32,6 @@ button {
|
||||||
|
|
||||||
.itemsContainer {
|
.itemsContainer {
|
||||||
display: flex;
|
display: flex;
|
||||||
margin-left: -0.6em;
|
|
||||||
margin-right: -0.6em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO replace this with a proper fix */
|
|
||||||
/* doesnt work on mobile devices */
|
|
||||||
/* negative margin fixes annoying misalignment with cards and title */
|
|
||||||
@media all and (max-width:50em) {
|
|
||||||
.itemsContainer {
|
|
||||||
margin-left: 0;
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.vertical-list {
|
.vertical-list {
|
||||||
|
|
@ -157,7 +145,7 @@ button {
|
||||||
}
|
}
|
||||||
|
|
||||||
.cardImageContainer {
|
.cardImageContainer {
|
||||||
background-size: contain;
|
background-size: cover;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center center;
|
background-position: center center;
|
||||||
display: -webkit-flex;
|
display: -webkit-flex;
|
||||||
|
|
@ -364,9 +352,6 @@ button {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
font-size: inherit;
|
font-size: inherit;
|
||||||
/*display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.textActionButton:hover {
|
.textActionButton:hover {
|
||||||
|
|
|
||||||
|
|
@ -321,7 +321,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
var apiClient;
|
var apiClient;
|
||||||
var lastServerId;
|
var lastServerId;
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
for (i = 0, length = items.length; i < length; i++) {
|
for (i = 0, length = items.length; i < length; i++) {
|
||||||
|
|
||||||
|
|
@ -339,19 +340,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
if (options.indexBy === 'PremiereDate') {
|
if (options.indexBy === 'PremiereDate') {
|
||||||
if (item.PremiereDate) {
|
if (item.PremiereDate) {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
newIndexValue = datetime.toLocaleDateString(datetime.parseISO8601Date(item.PremiereDate), { weekday: 'long', month: 'long', day: 'numeric' });
|
newIndexValue = datetime.toLocaleDateString(datetime.parseISO8601Date(item.PremiereDate), { weekday: 'long', month: 'long', day: 'numeric' });
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
console.log('error parsing timestamp for premiere date');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else if (options.indexBy === 'ProductionYear') {
|
||||||
|
|
||||||
else if (options.indexBy === 'ProductionYear') {
|
|
||||||
newIndexValue = item.ProductionYear;
|
newIndexValue = item.ProductionYear;
|
||||||
}
|
} else if (options.indexBy === 'CommunityRating') {
|
||||||
|
|
||||||
else if (options.indexBy === 'CommunityRating') {
|
|
||||||
newIndexValue = item.CommunityRating ? (Math.floor(item.CommunityRating) + (item.CommunityRating % 1 >= 0.5 ? 0.5 : 0)) + '+' : null;
|
newIndexValue = item.CommunityRating ? (Math.floor(item.CommunityRating) + (item.CommunityRating % 1 >= 0.5 ? 0.5 : 0)) + '+' : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -571,22 +567,19 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
|
coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else if (item.ParentPrimaryImageTag) {
|
||||||
else if (item.ParentPrimaryImageTag) {
|
|
||||||
|
|
||||||
imgUrl = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, {
|
imgUrl = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, {
|
||||||
type: "Primary",
|
type: "Primary",
|
||||||
tag: item.ParentPrimaryImageTag
|
tag: item.ParentPrimaryImageTag
|
||||||
});
|
});
|
||||||
}
|
} else if (item.SeriesPrimaryImageTag) {
|
||||||
else if (item.SeriesPrimaryImageTag) {
|
|
||||||
|
|
||||||
imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
|
imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
|
||||||
type: "Primary",
|
type: "Primary",
|
||||||
tag: item.SeriesPrimaryImageTag
|
tag: item.SeriesPrimaryImageTag
|
||||||
});
|
});
|
||||||
}
|
} else if (item.AlbumId && item.AlbumPrimaryImageTag) {
|
||||||
else if (item.AlbumId && item.AlbumPrimaryImageTag) {
|
|
||||||
|
|
||||||
width = primaryImageAspectRatio ? Math.round(height * primaryImageAspectRatio) : null;
|
width = primaryImageAspectRatio ? Math.round(height * primaryImageAspectRatio) : null;
|
||||||
|
|
||||||
|
|
@ -601,16 +594,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
|
coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) {
|
||||||
else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) {
|
|
||||||
|
|
||||||
imgUrl = apiClient.getScaledImageUrl(item.Id, {
|
imgUrl = apiClient.getScaledImageUrl(item.Id, {
|
||||||
type: "Thumb",
|
type: "Thumb",
|
||||||
tag: item.ImageTags.Thumb
|
tag: item.ImageTags.Thumb
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
} else if (item.BackdropImageTags && item.BackdropImageTags.length) {
|
||||||
else if (item.BackdropImageTags && item.BackdropImageTags.length) {
|
|
||||||
|
|
||||||
imgUrl = apiClient.getScaledImageUrl(item.Id, {
|
imgUrl = apiClient.getScaledImageUrl(item.Id, {
|
||||||
type: "Backdrop",
|
type: "Backdrop",
|
||||||
|
|
@ -681,7 +672,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
||||||
var valid = 0;
|
var valid = 0;
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
for (i = 0, length = lines.length; i < length; i++) {
|
for (i = 0, length = lines.length; i < length; i++) {
|
||||||
|
|
||||||
|
|
@ -745,8 +737,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
date = datetime.parseISO8601Date(item.EndDate);
|
date = datetime.parseISO8601Date(item.EndDate);
|
||||||
airTimeText += ' - ' + datetime.getDisplayTime(date);
|
airTimeText += ' - ' + datetime.getDisplayTime(date);
|
||||||
}
|
}
|
||||||
}
|
} catch (e) {
|
||||||
catch (e) {
|
|
||||||
console.log("Error parsing date: " + item.StartDate);
|
console.log("Error parsing date: " + item.StartDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -794,8 +785,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
} else {
|
} else {
|
||||||
lines.push(item.SeriesName);
|
lines.push(item.SeriesName);
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
if (isUsingLiveTvNaming(item)) {
|
if (isUsingLiveTvNaming(item)) {
|
||||||
|
|
||||||
|
|
@ -976,8 +966,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
if (options.showSeriesTimerChannel) {
|
if (options.showSeriesTimerChannel) {
|
||||||
if (item.RecordAnyChannel) {
|
if (item.RecordAnyChannel) {
|
||||||
lines.push(globalize.translate('AllChannels'));
|
lines.push(globalize.translate('AllChannels'));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
lines.push(item.ChannelName || globalize.translate('OneChannel'));
|
lines.push(item.ChannelName || globalize.translate('OneChannel'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -985,8 +974,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
if (options.showPersonRoleOrType) {
|
if (options.showPersonRoleOrType) {
|
||||||
if (item.Role) {
|
if (item.Role) {
|
||||||
lines.push('as ' + item.Role);
|
lines.push('as ' + item.Role);
|
||||||
}
|
} else if (item.Type) {
|
||||||
else if (item.Type) {
|
|
||||||
lines.push(globalize.translate('' + item.Type));
|
lines.push(globalize.translate('' + item.Type));
|
||||||
} else {
|
} else {
|
||||||
lines.push('');
|
lines.push('');
|
||||||
|
|
@ -1060,8 +1048,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
|
|
||||||
counts.push(childText);
|
counts.push(childText);
|
||||||
|
|
||||||
}
|
} else if (item.Type === 'Genre' || item.Type === 'Studio') {
|
||||||
else if (item.Type === 'Genre' || item.Type === 'Studio') {
|
|
||||||
|
|
||||||
if (item.MovieCount) {
|
if (item.MovieCount) {
|
||||||
|
|
||||||
|
|
@ -1140,8 +1127,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
|
|
||||||
if (item.IsPremiere) {
|
if (item.IsPremiere) {
|
||||||
html += '<div class="premiereTvProgram programAttributeIndicator">' + globalize.translate('Premiere') + '</div>';
|
html += '<div class="premiereTvProgram programAttributeIndicator">' + globalize.translate('Premiere') + '</div>';
|
||||||
}
|
} else if (item.IsSeries && !item.IsRepeat) {
|
||||||
else if (item.IsSeries && !item.IsRepeat) {
|
|
||||||
html += '<div class="newTvProgram programAttributeIndicator">' + globalize.translate('AttributeNew') + '</div>';
|
html += '<div class="newTvProgram programAttributeIndicator">' + globalize.translate('AttributeNew') + '</div>';
|
||||||
}
|
}
|
||||||
//else if (item.IsRepeat) {
|
//else if (item.IsRepeat) {
|
||||||
|
|
@ -1176,8 +1162,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
if (action === 'play' && item.IsFolder) {
|
if (action === 'play' && item.IsFolder) {
|
||||||
// If this hard-coding is ever removed make sure to test nested photo albums
|
// If this hard-coding is ever removed make sure to test nested photo albums
|
||||||
action = 'link';
|
action = 'link';
|
||||||
}
|
} else if (item.MediaType === 'Photo') {
|
||||||
else if (item.MediaType === 'Photo') {
|
|
||||||
action = 'play';
|
action = 'play';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1272,8 +1257,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
height: logoHeight,
|
height: logoHeight,
|
||||||
tag: item.ChannelPrimaryImageTag
|
tag: item.ChannelPrimaryImageTag
|
||||||
});
|
});
|
||||||
}
|
} else if (options.showLogo && item.ParentLogoImageTag) {
|
||||||
else if (options.showLogo && item.ParentLogoImageTag) {
|
|
||||||
logoUrl = apiClient.getScaledImageUrl(item.ParentLogoItemId, {
|
logoUrl = apiClient.getScaledImageUrl(item.ParentLogoItemId, {
|
||||||
type: "Logo",
|
type: "Logo",
|
||||||
height: logoHeight,
|
height: logoHeight,
|
||||||
|
|
@ -1288,8 +1272,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter';
|
footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter';
|
||||||
innerCardFooter += getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, logoUrl, false);
|
innerCardFooter += getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, logoUrl, false);
|
||||||
footerOverlayed = true;
|
footerOverlayed = true;
|
||||||
}
|
} else if (progressHtml) {
|
||||||
else if (progressHtml) {
|
|
||||||
innerCardFooter += '<div class="innerCardFooter fullInnerCardFooter innerCardFooterClear">';
|
innerCardFooter += '<div class="innerCardFooter fullInnerCardFooter innerCardFooterClear">';
|
||||||
innerCardFooter += progressHtml;
|
innerCardFooter += progressHtml;
|
||||||
innerCardFooter += '</div>';
|
innerCardFooter += '</div>';
|
||||||
|
|
@ -1394,8 +1377,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
indicatorsHtml += indicators.getChildCountIndicatorHtml(item, {
|
indicatorsHtml += indicators.getChildCountIndicatorHtml(item, {
|
||||||
minCount: 1
|
minCount: 1
|
||||||
});
|
});
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
|
indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1656,8 +1638,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
|
||||||
}
|
}
|
||||||
|
|
||||||
itemProgressBar.innerHTML = progressHtml;
|
itemProgressBar.innerHTML = progressHtml;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
itemProgressBar = card.querySelector('.itemProgressBar');
|
itemProgressBar = card.querySelector('.itemProgressBar');
|
||||||
if (itemProgressBar) {
|
if (itemProgressBar) {
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ define(['events'], function (events) {
|
||||||
//
|
//
|
||||||
// https://github.com/ravisorg/LinkParser
|
// https://github.com/ravisorg/LinkParser
|
||||||
//
|
//
|
||||||
// Locate and extract almost any URL within a string. Handles protocol-less domains, IPv4 and
|
// Locate and extract almost any URL within a string. Handles protocol-less domains, IPv4 and
|
||||||
// IPv6, unrecognised TLDs, and more.
|
// IPv6, unrecognised TLDs, and more.
|
||||||
//
|
//
|
||||||
// This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
|
// This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
|
||||||
|
|
@ -14,26 +14,26 @@ define(['events'], function (events) {
|
||||||
|
|
||||||
// Original URL regex from the Android android.text.util.Linkify function, found here:
|
// Original URL regex from the Android android.text.util.Linkify function, found here:
|
||||||
// http://stackoverflow.com/a/19696443
|
// http://stackoverflow.com/a/19696443
|
||||||
//
|
//
|
||||||
// However there were problems with it, most probably related to the fact it was
|
// However there were problems with it, most probably related to the fact it was
|
||||||
// written in 2007, and it's been highly modified.
|
// written in 2007, and it's been highly modified.
|
||||||
//
|
//
|
||||||
// 1) I didn't like the fact that it was tied to specific TLDs, since new ones
|
// 1) I didn't like the fact that it was tied to specific TLDs, since new ones
|
||||||
// are being added all the time it wouldn't be reasonable to expect developer to
|
// are being added all the time it wouldn't be reasonable to expect developer to
|
||||||
// be continually updating their regular expressions.
|
// be continually updating their regular expressions.
|
||||||
//
|
//
|
||||||
// 2) It didn't allow unicode characters in the domains which are now allowed in
|
// 2) It didn't allow unicode characters in the domains which are now allowed in
|
||||||
// many languages, (including some IDN TLDs). Again these are constantly being
|
// many languages, (including some IDN TLDs). Again these are constantly being
|
||||||
// added to and it doesn't seem reasonable to hard-code them. Note this ended up
|
// added to and it doesn't seem reasonable to hard-code them. Note this ended up
|
||||||
// not being possible in standard JS due to the way it handles multibyte strings.
|
// not being possible in standard JS due to the way it handles multibyte strings.
|
||||||
// It is possible using XRegExp, however a big performance hit results. Disabled
|
// It is possible using XRegExp, however a big performance hit results. Disabled
|
||||||
// for now.
|
// for now.
|
||||||
//
|
//
|
||||||
// 3) It didn't allow for IPv6 hostnames
|
// 3) It didn't allow for IPv6 hostnames
|
||||||
// IPv6 regex from http://stackoverflow.com/a/17871737
|
// IPv6 regex from http://stackoverflow.com/a/17871737
|
||||||
//
|
//
|
||||||
// 4) It was very poorly commented
|
// 4) It was very poorly commented
|
||||||
//
|
//
|
||||||
// 5) It wasn't as smart as it could have been about what should be part of a
|
// 5) It wasn't as smart as it could have been about what should be part of a
|
||||||
// URL and what should be part of human language.
|
// URL and what should be part of human language.
|
||||||
|
|
||||||
|
|
@ -102,8 +102,8 @@ define(['events'], function (events) {
|
||||||
+ "|(?:\\%[a-f0-9]{2})"
|
+ "|(?:\\%[a-f0-9]{2})"
|
||||||
// some characters are much more likely to be used AFTER a url and
|
// some characters are much more likely to be used AFTER a url and
|
||||||
// were not intended to be included in the url itself. Mostly end
|
// were not intended to be included in the url itself. Mostly end
|
||||||
// of sentence type things. It's also likely that the URL would
|
// of sentence type things. It's also likely that the URL would
|
||||||
// still work if any of these characters were missing from the end
|
// still work if any of these characters were missing from the end
|
||||||
// because we parsed it incorrectly. For these characters to be accepted
|
// because we parsed it incorrectly. For these characters to be accepted
|
||||||
// they must be followed by another character that we're reasonably
|
// they must be followed by another character that we're reasonably
|
||||||
// sure is part of the url
|
// sure is part of the url
|
||||||
|
|
|
||||||
|
|
@ -479,8 +479,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
|
||||||
TotalRecordCount: 1
|
TotalRecordCount: 1
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
query.Limit = query.Limit || 100;
|
query.Limit = query.Limit || 100;
|
||||||
query.ExcludeLocationTypes = "Virtual";
|
query.ExcludeLocationTypes = "Virtual";
|
||||||
|
|
@ -752,8 +751,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
|
||||||
|
|
||||||
ChromecastPlayer.prototype.volumeDown = function () {
|
ChromecastPlayer.prototype.volumeDown = function () {
|
||||||
var vol = this._castPlayer.session.receiver.volume.level;
|
var vol = this._castPlayer.session.receiver.volume.level;
|
||||||
if (vol == null)
|
if (vol == null) {
|
||||||
{
|
|
||||||
vol = 0.5;
|
vol = 0.5;
|
||||||
}
|
}
|
||||||
vol -= 0.05;
|
vol -= 0.05;
|
||||||
|
|
@ -776,8 +774,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
|
||||||
|
|
||||||
ChromecastPlayer.prototype.volumeUp = function () {
|
ChromecastPlayer.prototype.volumeUp = function () {
|
||||||
var vol = this._castPlayer.session.receiver.volume.level;
|
var vol = this._castPlayer.session.receiver.volume.level;
|
||||||
if (vol == null)
|
if (vol == null) {
|
||||||
{
|
|
||||||
vol = 0.5;
|
vol = 0.5;
|
||||||
}
|
}
|
||||||
vol += 0.05;
|
vol += 0.05;
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,8 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
|
||||||
dlg.querySelector('.dialogContentInner').classList.add('hide');
|
dlg.querySelector('.dialogContentInner').classList.add('hide');
|
||||||
}
|
}
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
var html = '';
|
var html = '';
|
||||||
var hasDescriptions = false;
|
var hasDescriptions = false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
|
||||||
if (layoutManager.tv) {
|
if (layoutManager.tv) {
|
||||||
if (dlg.classList.contains('scrollX')) {
|
if (dlg.classList.contains('scrollX')) {
|
||||||
centerFocus(dlg, true, false);
|
centerFocus(dlg, true, false);
|
||||||
}
|
} else if (dlg.classList.contains('smoothScrollY')) {
|
||||||
else if (dlg.classList.contains('smoothScrollY')) {
|
|
||||||
centerFocus(dlg, false, false);
|
centerFocus(dlg, false, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -168,8 +167,8 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
|
||||||
close(dlg);
|
close(dlg);
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function isHistoryEnabled(dlg) {
|
function isHistoryEnabled(dlg) {
|
||||||
|
|
@ -433,8 +432,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
|
||||||
if (layoutManager.tv) {
|
if (layoutManager.tv) {
|
||||||
centerFocus(dlg, true, true);
|
centerFocus(dlg, true, true);
|
||||||
}
|
}
|
||||||
}
|
} else if (options.scrollY !== false) {
|
||||||
else if (options.scrollY !== false) {
|
|
||||||
dlg.classList.add('smoothScrollY');
|
dlg.classList.add('smoothScrollY');
|
||||||
|
|
||||||
if (layoutManager.tv) {
|
if (layoutManager.tv) {
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
|
||||||
var readOnlyAttribute = options.pathReadOnly ? " readonly" : "";
|
var readOnlyAttribute = options.pathReadOnly ? " readonly" : "";
|
||||||
html += '<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ' + readOnlyAttribute + ' label="' + Globalize.translate(labelKey) + '"/>';
|
html += '<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ' + readOnlyAttribute + ' label="' + Globalize.translate(labelKey) + '"/>';
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
if (!readOnlyAttribute) {
|
if (!readOnlyAttribute) {
|
||||||
html += '<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="' + Globalize.translate("ButtonRefresh") + '"><i class="md-icon">search</i></button>';
|
html += '<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="' + Globalize.translate("ButtonRefresh") + '"><i class="md-icon">search</i></button>';
|
||||||
}
|
}
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
|
|
@ -188,9 +188,9 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
|
||||||
var path = lnkPath.getAttribute("data-path");
|
var path = lnkPath.getAttribute("data-path");
|
||||||
if (lnkPath.classList.contains("lnkFile")) {
|
if (lnkPath.classList.contains("lnkFile")) {
|
||||||
content.querySelector("#txtDirectoryPickerPath").value = path;
|
content.querySelector("#txtDirectoryPickerPath").value = path;
|
||||||
} else {
|
} else {
|
||||||
refreshDirectoryBrowser(content, path, fileOptions, true)
|
refreshDirectoryBrowser(content, path, fileOptions, true)
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -254,10 +254,10 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
|
||||||
var systemInfo = responses[0];
|
var systemInfo = responses[0];
|
||||||
var initialPath = responses[1];
|
var initialPath = responses[1];
|
||||||
var dlg = dialogHelper.createDialog({
|
var dlg = dialogHelper.createDialog({
|
||||||
size: "medium-tall",
|
size: "medium-tall",
|
||||||
removeOnClose: true,
|
removeOnClose: true,
|
||||||
scrollY: false
|
scrollY: false
|
||||||
});
|
});
|
||||||
dlg.classList.add("ui-body-a");
|
dlg.classList.add("ui-body-a");
|
||||||
dlg.classList.add("background-theme-a");
|
dlg.classList.add("background-theme-a");
|
||||||
dlg.classList.add("directoryPicker");
|
dlg.classList.add("directoryPicker");
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,9 @@ define([], function () {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
window.addEventListener("test", null, opts);
|
window.addEventListener("test", null, opts);
|
||||||
} catch (e) { }
|
} catch (e) {
|
||||||
|
console.log('error checking capture support');
|
||||||
|
}
|
||||||
|
|
||||||
function addEventListenerWithOptions(target, type, handler, options) {
|
function addEventListenerWithOptions(target, type, handler, options) {
|
||||||
var optionsOrCapture = options;
|
var optionsOrCapture = options;
|
||||||
|
|
@ -116,8 +118,8 @@ define([], function () {
|
||||||
return _animationEvent;
|
return _animationEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
var t,
|
var t;
|
||||||
el = document.createElement("div");
|
var el = document.createElement("div");
|
||||||
var animations = {
|
var animations = {
|
||||||
"animation": "animationend",
|
"animation": "animationend",
|
||||||
"OAnimation": "oAnimationEnd",
|
"OAnimation": "oAnimationEnd",
|
||||||
|
|
@ -146,8 +148,8 @@ define([], function () {
|
||||||
return _transitionEvent;
|
return _transitionEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
var t,
|
var t;
|
||||||
el = document.createElement("div");
|
var el = document.createElement("div");
|
||||||
var transitions = {
|
var transitions = {
|
||||||
"transition": "transitionend",
|
"transition": "transitionend",
|
||||||
"OTransition": "oTransitionEnd",
|
"OTransition": "oTransitionEnd",
|
||||||
|
|
|
||||||
|
|
@ -28,11 +28,12 @@ define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'registerElement'
|
||||||
}
|
}
|
||||||
|
|
||||||
EmbyInputPrototype.createdCallback = function () {
|
EmbyInputPrototype.createdCallback = function () {
|
||||||
|
|
||||||
if (!this.id) {
|
if (!this.id) {
|
||||||
this.id = 'embyinput' + inputId;
|
this.id = 'embyinput' + inputId;
|
||||||
inputId++;
|
inputId++;
|
||||||
} if (this.classList.contains('emby-input')) {
|
}
|
||||||
|
|
||||||
|
if (this.classList.contains('emby-input')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
|
||||||
this.querySelector('.animate-25-50-b').style.transform = 'rotate(-90deg)';
|
this.querySelector('.animate-25-50-b').style.transform = 'rotate(-90deg)';
|
||||||
this.querySelector('.animate-50-75-b').style.transform = 'rotate(-90deg)';
|
this.querySelector('.animate-50-75-b').style.transform = 'rotate(-90deg)';
|
||||||
this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
|
this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
|
||||||
}
|
} else if (progress >= 25 && progress < 50) {
|
||||||
else if (progress >= 25 && progress < 50) {
|
|
||||||
|
|
||||||
angle = -90 + ((progress - 25) / 100) * 360;
|
angle = -90 + ((progress - 25) / 100) * 360;
|
||||||
|
|
||||||
|
|
@ -57,8 +56,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
|
||||||
|
|
||||||
this.querySelector('.animate-50-75-b').style.transform = 'rotate(-90deg)';
|
this.querySelector('.animate-50-75-b').style.transform = 'rotate(-90deg)';
|
||||||
this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
|
this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
|
||||||
}
|
} else if (progress >= 50 && progress < 75) {
|
||||||
else if (progress >= 50 && progress < 75) {
|
|
||||||
angle = -90 + ((progress - 50) / 100) * 360;
|
angle = -90 + ((progress - 50) / 100) * 360;
|
||||||
|
|
||||||
this.querySelector('.animate-0-25-b').style.transform = 'none';
|
this.querySelector('.animate-0-25-b').style.transform = 'none';
|
||||||
|
|
@ -66,8 +64,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
|
||||||
this.querySelector('.animate-50-75-b').style.transform = 'rotate(' + angle + 'deg)';
|
this.querySelector('.animate-50-75-b').style.transform = 'rotate(' + angle + 'deg)';
|
||||||
|
|
||||||
this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
|
this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
|
||||||
}
|
} else if (progress >= 75 && progress <= 100) {
|
||||||
else if (progress >= 75 && progress <= 100) {
|
|
||||||
angle = -90 + ((progress - 75) / 100) * 360;
|
angle = -90 + ((progress - 75) / 100) * 360;
|
||||||
|
|
||||||
this.querySelector('.animate-0-25-b').style.transform = 'none';
|
this.querySelector('.animate-0-25-b').style.transform = 'none';
|
||||||
|
|
@ -85,7 +82,6 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
|
||||||
|
|
||||||
EmbyProgressRing.detachedCallback = function () {
|
EmbyProgressRing.detachedCallback = function () {
|
||||||
|
|
||||||
|
|
||||||
var observer = this.observer;
|
var observer = this.observer;
|
||||||
|
|
||||||
if (observer) {
|
if (observer) {
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,17 @@
|
||||||
margin-right: 3.3%;
|
margin-right: 3.3%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* align first card in scroller to heading */
|
||||||
|
.emby-scroller .card:first-of-type > .cardBox {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* align heading for normal item containers */
|
||||||
|
/* still not ideal solution but better than the last method */
|
||||||
|
.verticalSection > .itemsContainer .cardBox {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
@media all and (max-width:50em) {
|
@media all and (max-width:50em) {
|
||||||
.emby-scroller {
|
.emby-scroller {
|
||||||
padding-left: 3.3%;
|
padding-left: 3.3%;
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
|
||||||
tabs.classList.add('scrollX');
|
tabs.classList.add('scrollX');
|
||||||
tabs.classList.add('hiddenScrollX');
|
tabs.classList.add('hiddenScrollX');
|
||||||
tabs.classList.add('smoothScrollX');
|
tabs.classList.add('smoothScrollX');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EmbyTabs.createdCallback = function () {
|
EmbyTabs.createdCallback = function () {
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,9 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
|
||||||
* @returns {number}
|
* @returns {number}
|
||||||
*/
|
*/
|
||||||
self.getOffset = function (textarea) {
|
self.getOffset = function (textarea) {
|
||||||
var style = window.getComputedStyle(textarea, null),
|
var style = window.getComputedStyle(textarea, null);
|
||||||
props = ['paddingTop', 'paddingBottom'],
|
var props = ['paddingTop', 'paddingBottom'];
|
||||||
offset = 0;
|
var offset = 0;
|
||||||
|
|
||||||
for (var i = 0; i < props.length; i++) {
|
for (var i = 0; i < props.length; i++) {
|
||||||
offset += parseInt(style[props[i]]);
|
offset += parseInt(style[props[i]]);
|
||||||
|
|
@ -43,13 +43,13 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
|
||||||
textarea.rows = 3;
|
textarea.rows = 3;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var newHeight = 0, hasGrown = false;
|
var newHeight = 0;
|
||||||
|
var hasGrown = false;
|
||||||
|
|
||||||
if ((textarea.scrollHeight - offset) > self.maxAllowedHeight) {
|
if ((textarea.scrollHeight - offset) > self.maxAllowedHeight) {
|
||||||
textarea.style.overflowY = 'scroll';
|
textarea.style.overflowY = 'scroll';
|
||||||
newHeight = self.maxAllowedHeight;
|
newHeight = self.maxAllowedHeight;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
textarea.style.overflowY = 'hidden';
|
textarea.style.overflowY = 'hidden';
|
||||||
textarea.style.height = 'auto';
|
textarea.style.height = 'auto';
|
||||||
newHeight = textarea.scrollHeight/* - offset*/;
|
newHeight = textarea.scrollHeight/* - offset*/;
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,8 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
|
||||||
context.querySelector('form').addEventListener('submit', onSubmit);
|
context.querySelector('form').addEventListener('submit', onSubmit);
|
||||||
|
|
||||||
var elems = context.querySelectorAll('.simpleFilter');
|
var elems = context.querySelectorAll('.simpleFilter');
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
for (i = 0, length = elems.length; i < length; i++) {
|
for (i = 0, length = elems.length; i < length; i++) {
|
||||||
|
|
||||||
|
|
@ -137,7 +138,8 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
|
||||||
function saveValues(context, settings, settingsKey) {
|
function saveValues(context, settings, settingsKey) {
|
||||||
|
|
||||||
var elems = context.querySelectorAll('.simpleFilter');
|
var elems = context.querySelectorAll('.simpleFilter');
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
for (i = 0, length = elems.length; i < length; i++) {
|
for (i = 0, length = elems.length; i < length; i++) {
|
||||||
|
|
||||||
if (elems[i].tagName === 'INPUT') {
|
if (elems[i].tagName === 'INPUT') {
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ define(['dom'], function (dom) {
|
||||||
return normalizeFocusable(elem, originalElement);
|
return normalizeFocusable(elem, originalElement);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determines if a focusable element can be focused at a given point in time
|
// Determines if a focusable element can be focused at a given point in time
|
||||||
function isCurrentlyFocusableInternal(elem) {
|
function isCurrentlyFocusableInternal(elem) {
|
||||||
|
|
||||||
// http://stackoverflow.com/questions/19669786/check-if-element-is-visible-in-dom
|
// http://stackoverflow.com/questions/19669786/check-if-element-is-visible-in-dom
|
||||||
|
|
@ -110,7 +110,7 @@ define(['dom'], function (dom) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determines if a focusable element can be focused at a given point in time
|
// Determines if a focusable element can be focused at a given point in time
|
||||||
function isCurrentlyFocusable(elem) {
|
function isCurrentlyFocusable(elem) {
|
||||||
|
|
||||||
if (elem.disabled) {
|
if (elem.disabled) {
|
||||||
|
|
@ -181,21 +181,18 @@ define(['dom'], function (dom) {
|
||||||
if (classList.contains('focuscontainer-left')) {
|
if (classList.contains('focuscontainer-left')) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else if (direction === 1) {
|
||||||
else if (direction === 1) {
|
|
||||||
if (classList.contains('focuscontainer-x')) {
|
if (classList.contains('focuscontainer-x')) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (classList.contains('focuscontainer-right')) {
|
if (classList.contains('focuscontainer-right')) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else if (direction === 2) {
|
||||||
else if (direction === 2) {
|
|
||||||
if (classList.contains('focuscontainer-y')) {
|
if (classList.contains('focuscontainer-y')) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else if (direction === 3) {
|
||||||
else if (direction === 3) {
|
|
||||||
if (classList.contains('focuscontainer-y')) {
|
if (classList.contains('focuscontainer-y')) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -275,14 +272,14 @@ define(['dom'], function (dom) {
|
||||||
var rect = getOffset(activeElement);
|
var rect = getOffset(activeElement);
|
||||||
|
|
||||||
// Get elements and work out x/y points
|
// Get elements and work out x/y points
|
||||||
var cache = [],
|
var cache = [];
|
||||||
point1x = parseFloat(rect.left) || 0,
|
var point1x = parseFloat(rect.left) || 0;
|
||||||
point1y = parseFloat(rect.top) || 0,
|
var point1y = parseFloat(rect.top) || 0;
|
||||||
point2x = parseFloat(point1x + rect.width - 1) || point1x,
|
var point2x = parseFloat(point1x + rect.width - 1) || point1x;
|
||||||
point2y = parseFloat(point1y + rect.height - 1) || point1y,
|
var point2y = parseFloat(point1y + rect.height - 1) || point1y;
|
||||||
// Shortcuts to help with compression
|
// Shortcuts to help with compression
|
||||||
min = Math.min,
|
var min = Math.min;
|
||||||
max = Math.max;
|
var max = Math.max;
|
||||||
|
|
||||||
var sourceMidX = rect.left + (rect.width / 2);
|
var sourceMidX = rect.left + (rect.width / 2);
|
||||||
var sourceMidY = rect.top + (rect.height / 2);
|
var sourceMidY = rect.top + (rect.height / 2);
|
||||||
|
|
@ -357,10 +354,10 @@ define(['dom'], function (dom) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
var x = elementRect.left,
|
var x = elementRect.left;
|
||||||
y = elementRect.top,
|
var y = elementRect.top;
|
||||||
x2 = x + elementRect.width - 1,
|
var x2 = x + elementRect.width - 1;
|
||||||
y2 = y + elementRect.height - 1;
|
var y2 = y + elementRect.height - 1;
|
||||||
|
|
||||||
var intersectX = intersects(point1x, point2x, x, x2);
|
var intersectX = intersects(point1x, point2x, x, x2);
|
||||||
var intersectY = intersects(point1y, point2y, y, y2);
|
var intersectY = intersects(point1y, point2y, y, y2);
|
||||||
|
|
@ -470,7 +467,9 @@ define(['dom'], function (dom) {
|
||||||
|
|
||||||
var elems = container.querySelectorAll(focusableSelector);
|
var elems = container.querySelectorAll(focusableSelector);
|
||||||
var list = [];
|
var list = [];
|
||||||
var i, length, elem;
|
var i;
|
||||||
|
var length;
|
||||||
|
var elem;
|
||||||
|
|
||||||
for (i = 0, length = elems.length; i < length; i++) {
|
for (i = 0, length = elems.length; i < length; i++) {
|
||||||
|
|
||||||
|
|
@ -513,32 +512,24 @@ define(['dom'], function (dom) {
|
||||||
focusableParent: focusableParent,
|
focusableParent: focusableParent,
|
||||||
getFocusableElements: getFocusableElements,
|
getFocusableElements: getFocusableElements,
|
||||||
moveLeft: function (sourceElement, options) {
|
moveLeft: function (sourceElement, options) {
|
||||||
|
|
||||||
var container = options ? options.container : null;
|
var container = options ? options.container : null;
|
||||||
var focusableElements = options ? options.focusableElements : null;
|
var focusableElements = options ? options.focusableElements : null;
|
||||||
nav(sourceElement, 0, container, focusableElements);
|
nav(sourceElement, 0, container, focusableElements);
|
||||||
|
|
||||||
},
|
},
|
||||||
moveRight: function (sourceElement, options) {
|
moveRight: function (sourceElement, options) {
|
||||||
|
|
||||||
var container = options ? options.container : null;
|
var container = options ? options.container : null;
|
||||||
var focusableElements = options ? options.focusableElements : null;
|
var focusableElements = options ? options.focusableElements : null;
|
||||||
nav(sourceElement, 1, container, focusableElements);
|
nav(sourceElement, 1, container, focusableElements);
|
||||||
|
|
||||||
},
|
},
|
||||||
moveUp: function (sourceElement, options) {
|
moveUp: function (sourceElement, options) {
|
||||||
|
|
||||||
var container = options ? options.container : null;
|
var container = options ? options.container : null;
|
||||||
var focusableElements = options ? options.focusableElements : null;
|
var focusableElements = options ? options.focusableElements : null;
|
||||||
nav(sourceElement, 2, container, focusableElements);
|
nav(sourceElement, 2, container, focusableElements);
|
||||||
|
|
||||||
},
|
},
|
||||||
moveDown: function (sourceElement, options) {
|
moveDown: function (sourceElement, options) {
|
||||||
|
|
||||||
var container = options ? options.container : null;
|
var container = options ? options.container : null;
|
||||||
var focusableElements = options ? options.focusableElements : null;
|
var focusableElements = options ? options.focusableElements : null;
|
||||||
nav(sourceElement, 3, container, focusableElements);
|
nav(sourceElement, 3, container, focusableElements);
|
||||||
|
|
||||||
},
|
},
|
||||||
sendText: sendText,
|
sendText: sendText,
|
||||||
isCurrentlyFocusable: isCurrentlyFocusable,
|
isCurrentlyFocusable: isCurrentlyFocusable,
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ define(['events', 'dom', 'apphost', 'browser'], function (events, dom, appHost,
|
||||||
return document.fullscreen ||
|
return document.fullscreen ||
|
||||||
document.mozFullScreen ||
|
document.mozFullScreen ||
|
||||||
document.webkitIsFullScreen ||
|
document.webkitIsFullScreen ||
|
||||||
document.msFullscreenElement || /* IE/Edge syntax */
|
document.msFullscreenElement || /* IE/Edge syntax */
|
||||||
document.fullscreenElement || /* Standard syntax */
|
document.fullscreenElement || /* Standard syntax */
|
||||||
document.webkitFullscreenElement || /* Chrome, Safari and Opera syntax */
|
document.webkitFullscreenElement || /* Chrome, Safari and Opera syntax */
|
||||||
document.mozFullScreenElement; /* Firefox syntax */
|
document.mozFullScreenElement; /* Firefox syntax */
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,8 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
|
||||||
|
|
||||||
function save(context) {
|
function save(context) {
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
var chkIndicators = context.querySelectorAll('.chkIndicator');
|
var chkIndicators = context.querySelectorAll('.chkIndicator');
|
||||||
for (i = 0, length = chkIndicators.length; i < length; i++) {
|
for (i = 0, length = chkIndicators.length; i < length; i++) {
|
||||||
|
|
@ -62,7 +63,8 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
|
||||||
|
|
||||||
function load(context) {
|
function load(context) {
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
var chkIndicators = context.querySelectorAll('.chkIndicator');
|
var chkIndicators = context.querySelectorAll('.chkIndicator');
|
||||||
for (i = 0, length = chkIndicators.length; i < length; i++) {
|
for (i = 0, length = chkIndicators.length; i < length; i++) {
|
||||||
|
|
|
||||||
|
|
@ -392,27 +392,20 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseDates(program) {
|
function parseDates(program) {
|
||||||
|
|
||||||
if (!program.StartDateLocal) {
|
if (!program.StartDateLocal) {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
program.StartDateLocal = datetime.parseISO8601Date(program.StartDate, { toLocal: true });
|
program.StartDateLocal = datetime.parseISO8601Date(program.StartDate, { toLocal: true });
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
console.log('error parsing timestamp for start date');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!program.EndDateLocal) {
|
if (!program.EndDateLocal) {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
program.EndDateLocal = datetime.parseISO8601Date(program.EndDate, { toLocal: true });
|
program.EndDateLocal = datetime.parseISO8601Date(program.EndDate, { toLocal: true });
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
console.log('error parsing timestamp for end date');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
@ -424,16 +417,13 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
||||||
|
|
||||||
if (item.Type === 'SeriesTimer') {
|
if (item.Type === 'SeriesTimer') {
|
||||||
return '<i class="md-icon programIcon seriesTimerIcon">fiber_smart_record</i>';
|
return '<i class="md-icon programIcon seriesTimerIcon">fiber_smart_record</i>';
|
||||||
}
|
} else if (item.TimerId || item.SeriesTimerId) {
|
||||||
else if (item.TimerId || item.SeriesTimerId) {
|
|
||||||
|
|
||||||
status = item.Status || 'Cancelled';
|
status = item.Status || 'Cancelled';
|
||||||
}
|
} else if (item.Type === 'Timer') {
|
||||||
else if (item.Type === 'Timer') {
|
|
||||||
|
|
||||||
status = item.Status;
|
status = item.Status;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -529,11 +519,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
||||||
} else if (program.IsMovie) {
|
} else if (program.IsMovie) {
|
||||||
displayInnerContent = displayMovieContent;
|
displayInnerContent = displayMovieContent;
|
||||||
accentCssClass = 'movie';
|
accentCssClass = 'movie';
|
||||||
}
|
} else if (program.IsSeries) {
|
||||||
else if (program.IsSeries) {
|
|
||||||
displayInnerContent = displaySeriesContent;
|
displayInnerContent = displaySeriesContent;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
displayInnerContent = displayMovieContent && displayNewsContent && displaySportsContent && displayKidsContent && displaySeriesContent;
|
displayInnerContent = displayMovieContent && displayNewsContent && displaySportsContent && displayKidsContent && displaySeriesContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -569,14 +557,11 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
||||||
var indicatorHtml = null;
|
var indicatorHtml = null;
|
||||||
if (program.IsLive && options.showLiveIndicator) {
|
if (program.IsLive && options.showLiveIndicator) {
|
||||||
indicatorHtml = '<span class="liveTvProgram guideProgramIndicator">' + globalize.translate('Live') + '</span>';
|
indicatorHtml = '<span class="liveTvProgram guideProgramIndicator">' + globalize.translate('Live') + '</span>';
|
||||||
}
|
} else if (program.IsPremiere && options.showPremiereIndicator) {
|
||||||
else if (program.IsPremiere && options.showPremiereIndicator) {
|
|
||||||
indicatorHtml = '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('Premiere') + '</span>';
|
indicatorHtml = '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('Premiere') + '</span>';
|
||||||
}
|
} else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
|
||||||
else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
|
|
||||||
indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('AttributeNew') + '</span>';
|
indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('AttributeNew') + '</span>';
|
||||||
}
|
} else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) {
|
||||||
else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) {
|
|
||||||
indicatorHtml = '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('Repeat') + '</span>';
|
indicatorHtml = '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('Repeat') + '</span>';
|
||||||
}
|
}
|
||||||
html += indicatorHtml || '';
|
html += indicatorHtml || '';
|
||||||
|
|
@ -614,7 +599,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function renderChannelHeaders(context, channels, apiClient) {
|
function renderChannelHeaders(context, channels, apiClient) {
|
||||||
|
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
@ -1079,17 +1063,13 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
||||||
|
|
||||||
scrollHelper.toStart(programGrid, programCell, true, true);
|
scrollHelper.toStart(programGrid, programCell, true, true);
|
||||||
}
|
}
|
||||||
}
|
} else if (lastFocusDirection === 'right') {
|
||||||
|
|
||||||
else if (lastFocusDirection === 'right') {
|
|
||||||
|
|
||||||
if (programCell) {
|
if (programCell) {
|
||||||
|
|
||||||
scrollHelper.toCenter(programGrid, programCell, true, true);
|
scrollHelper.toCenter(programGrid, programCell, true, true);
|
||||||
}
|
}
|
||||||
}
|
} else if (lastFocusDirection === 'up' || lastFocusDirection === 'down') {
|
||||||
|
|
||||||
else if (lastFocusDirection === 'up' || lastFocusDirection === 'down') {
|
|
||||||
|
|
||||||
var verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
|
var verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
|
||||||
if (verticalScroller) {
|
if (verticalScroller) {
|
||||||
|
|
@ -1195,14 +1175,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
|
||||||
dom.addEventListener(programGrid, 'scroll', function (e) {
|
dom.addEventListener(programGrid, 'scroll', function (e) {
|
||||||
onProgramGridScroll(context, this, timeslotHeaders);
|
onProgramGridScroll(context, this, timeslotHeaders);
|
||||||
}, {
|
}, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
|
|
||||||
dom.addEventListener(timeslotHeaders, 'scroll', function () {
|
dom.addEventListener(timeslotHeaders, 'scroll', function () {
|
||||||
onTimeslotHeadersScroll(context, this);
|
onTimeslotHeadersScroll(context, this);
|
||||||
}, {
|
}, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
|
|
||||||
programGrid.addEventListener('click', onProgramGridClick);
|
programGrid.addEventListener('click', onProgramGridClick);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -255,8 +255,8 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
|
||||||
* @return {bool} true if should unpin, false otherwise
|
* @return {bool} true if should unpin, false otherwise
|
||||||
*/
|
*/
|
||||||
this.shouldUnpin = function (currentScrollY) {
|
this.shouldUnpin = function (currentScrollY) {
|
||||||
var scrollingDown = currentScrollY > this.lastKnownScrollY,
|
var scrollingDown = currentScrollY > this.lastKnownScrollY;
|
||||||
pastOffset = currentScrollY >= this.offset;
|
var pastOffset = currentScrollY >= this.offset;
|
||||||
|
|
||||||
return scrollingDown && pastOffset;
|
return scrollingDown && pastOffset;
|
||||||
};
|
};
|
||||||
|
|
@ -267,8 +267,8 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
|
||||||
* @return {bool} true if should pin, false otherwise
|
* @return {bool} true if should pin, false otherwise
|
||||||
*/
|
*/
|
||||||
this.shouldPin = function (currentScrollY) {
|
this.shouldPin = function (currentScrollY) {
|
||||||
var scrollingUp = currentScrollY < this.lastKnownScrollY,
|
var scrollingUp = currentScrollY < this.lastKnownScrollY;
|
||||||
pastOffset = currentScrollY <= this.offset;
|
var pastOffset = currentScrollY <= this.offset;
|
||||||
|
|
||||||
return scrollingUp || pastOffset;
|
return scrollingUp || pastOffset;
|
||||||
};
|
};
|
||||||
|
|
@ -290,11 +290,9 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
|
||||||
|
|
||||||
if (currentScrollY <= (isTv ? 120 : 10)) {
|
if (currentScrollY <= (isTv ? 120 : 10)) {
|
||||||
this.clear();
|
this.clear();
|
||||||
}
|
} else if (this.shouldUnpin(currentScrollY)) {
|
||||||
else if (this.shouldUnpin(currentScrollY)) {
|
|
||||||
this.unpin();
|
this.unpin();
|
||||||
}
|
} else if (this.shouldPin(currentScrollY)) {
|
||||||
else if (this.shouldPin(currentScrollY)) {
|
|
||||||
|
|
||||||
var toleranceExceeded = Math.abs(currentScrollY - lastKnownScrollY) >= 14;
|
var toleranceExceeded = Math.abs(currentScrollY - lastKnownScrollY) >= 14;
|
||||||
|
|
||||||
|
|
@ -310,7 +308,6 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
|
||||||
this.lastKnownScrollY = currentScrollY;
|
this.lastKnownScrollY = currentScrollY;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
if (browser.supportsCssAnimation()) {
|
if (browser.supportsCssAnimation()) {
|
||||||
for (var i = 0, length = this.elems.length; i < length; i++) {
|
for (var i = 0, length = this.elems.length; i < length; i++) {
|
||||||
this.elems[i].classList.add(this.initialClass);
|
this.elems[i].classList.add(this.initialClass);
|
||||||
|
|
|
||||||
|
|
@ -57,8 +57,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
|
||||||
name: globalize.translate('Collections'),
|
name: globalize.translate('Collections'),
|
||||||
value: 'collections'
|
value: 'collections'
|
||||||
});
|
});
|
||||||
}
|
} else if (type === 'tvshows') {
|
||||||
else if (type === 'tvshows') {
|
|
||||||
|
|
||||||
list.push({
|
list.push({
|
||||||
name: globalize.translate('Shows'),
|
name: globalize.translate('Shows'),
|
||||||
|
|
@ -78,8 +77,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
|
||||||
name: globalize.translate('Favorites'),
|
name: globalize.translate('Favorites'),
|
||||||
value: 'favorites'
|
value: 'favorites'
|
||||||
});
|
});
|
||||||
}
|
} else if (type === 'music') {
|
||||||
else if (type === 'music') {
|
|
||||||
|
|
||||||
list.push({
|
list.push({
|
||||||
name: globalize.translate('Suggestions'),
|
name: globalize.translate('Suggestions'),
|
||||||
|
|
@ -111,8 +109,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
|
||||||
name: globalize.translate('Genres'),
|
name: globalize.translate('Genres'),
|
||||||
value: 'genres'
|
value: 'genres'
|
||||||
});
|
});
|
||||||
}
|
} else if (type === 'livetv') {
|
||||||
else if (type === 'livetv') {
|
|
||||||
|
|
||||||
list.push({
|
list.push({
|
||||||
name: globalize.translate('Suggestions'),
|
name: globalize.translate('Suggestions'),
|
||||||
|
|
@ -256,7 +253,6 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -384,7 +380,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
|
||||||
|
|
||||||
var viewItems = context.querySelectorAll('.viewItem');
|
var viewItems = context.querySelectorAll('.viewItem');
|
||||||
var orderedViews = [];
|
var orderedViews = [];
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
for (i = 0, length = viewItems.length; i < length; i++) {
|
for (i = 0, length = viewItems.length; i < length; i++) {
|
||||||
orderedViews.push(viewItems[i].getAttribute('data-viewid'));
|
orderedViews.push(viewItems[i].getAttribute('data-viewid'));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'layoutManager', 'imageLoader', 'globalize', 'itemShortcuts', 'itemHelper', 'appRouter', 'scripts/imagehelper','paper-icon-button-light', 'emby-itemscontainer', 'emby-scroller', 'emby-button', 'css!./homesections'], function (connectionManager, cardBuilder, appSettings, dom, appHost, layoutManager, imageLoader, globalize, itemShortcuts, itemHelper, appRouter, imageHelper) {
|
define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'layoutManager', 'imageLoader', 'globalize', 'itemShortcuts', 'itemHelper', 'appRouter', 'scripts/imagehelper', 'paper-icon-button-light', 'emby-itemscontainer', 'emby-scroller', 'emby-button', 'css!./homesections'], function (connectionManager, cardBuilder, appSettings, dom, appHost, layoutManager, imageLoader, globalize, itemShortcuts, itemHelper, appRouter, imageHelper) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function getDefaultSection(index) {
|
function getDefaultSection(index) {
|
||||||
|
|
@ -83,7 +83,8 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
|
||||||
|
|
||||||
function resume(elem, options) {
|
function resume(elem, options) {
|
||||||
var elems = elem.querySelectorAll('.itemsContainer');
|
var elems = elem.querySelectorAll('.itemsContainer');
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
var promises = [];
|
var promises = [];
|
||||||
|
|
||||||
for (i = 0, length = elems.length; i < length; i++) {
|
for (i = 0, length = elems.length; i < length; i++) {
|
||||||
|
|
@ -567,7 +568,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
|
||||||
|
|
||||||
html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl('livetv', {
|
html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl('livetv', {
|
||||||
serverId: apiClient.serverId(),
|
serverId: apiClient.serverId(),
|
||||||
section: 'programs'
|
section: 'programs'
|
||||||
}) + '" class="raised"><span>' + globalize.translate('Programs') + '</span></a>';
|
}) + '" class="raised"><span>' + globalize.translate('Programs') + '</span></a>';
|
||||||
|
|
||||||
html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl('livetv', {
|
html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl('livetv', {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCrossOriginValue(mediaSource) {
|
function getCrossOriginValue(mediaSource) {
|
||||||
|
|
||||||
if (mediaSource.IsRemote) {
|
if (mediaSource.IsRemote) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
@ -97,7 +96,8 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
var recoverDecodingErrorDate, recoverSwapAudioCodecDate;
|
var recoverDecodingErrorDate;
|
||||||
|
var recoverSwapAudioCodecDate;
|
||||||
function handleHlsJsMediaError(instance, reject) {
|
function handleHlsJsMediaError(instance, reject) {
|
||||||
|
|
||||||
var hlsPlayer = instance._hlsPlayer;
|
var hlsPlayer = instance._hlsPlayer;
|
||||||
|
|
@ -144,7 +144,8 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
|
||||||
events.trigger(instance, 'error', [
|
events.trigger(instance, 'error', [
|
||||||
{
|
{
|
||||||
type: type
|
type: type
|
||||||
}]);
|
}
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
function isValidDuration(duration) {
|
function isValidDuration(duration) {
|
||||||
|
|
@ -156,7 +157,6 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
|
||||||
}
|
}
|
||||||
|
|
||||||
function setCurrentTimeIfNeeded(element, seconds) {
|
function setCurrentTimeIfNeeded(element, seconds) {
|
||||||
|
|
||||||
if (Math.abs(element.currentTime || 0, seconds) <= 1) {
|
if (Math.abs(element.currentTime || 0, seconds) <= 1) {
|
||||||
element.currentTime = seconds;
|
element.currentTime = seconds;
|
||||||
}
|
}
|
||||||
|
|
@ -354,9 +354,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
|
||||||
} else {
|
} else {
|
||||||
onErrorInternal(instance, 'network');
|
onErrorInternal(instance, 'network');
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
|
|
||||||
else {
|
|
||||||
console.log("fatal network error encountered, try to recover");
|
console.log("fatal network error encountered, try to recover");
|
||||||
hls.startLoad();
|
hls.startLoad();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
function supportsFade() {
|
function supportsFade() {
|
||||||
|
|
||||||
if (browser.tv) {
|
if (browser.tv) {
|
||||||
// Not working on tizen.
|
// Not working on tizen.
|
||||||
// We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
|
// We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -168,7 +168,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
}, function () {
|
}, function () {
|
||||||
|
|
||||||
elem.autoplay = true;
|
elem.autoplay = true;
|
||||||
|
|
|
||||||
|
|
@ -298,10 +298,10 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
type: 'flv',
|
type: 'flv',
|
||||||
url: url
|
url: url
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
seekType: 'range',
|
seekType: 'range',
|
||||||
lazyLoad: false
|
lazyLoad: false
|
||||||
});
|
});
|
||||||
|
|
||||||
flvPlayer.attachMediaElement(elem);
|
flvPlayer.attachMediaElement(elem);
|
||||||
flvPlayer.load();
|
flvPlayer.load();
|
||||||
|
|
@ -420,7 +420,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
function onMediaManagerLoadMedia(event) {
|
function onMediaManagerLoadMedia(event) {
|
||||||
|
|
||||||
if (self._castPlayer) {
|
if (self._castPlayer) {
|
||||||
self._castPlayer.unload(); // Must unload before starting again.
|
self._castPlayer.unload(); // Must unload before starting again.
|
||||||
}
|
}
|
||||||
self._castPlayer = null;
|
self._castPlayer = null;
|
||||||
|
|
||||||
|
|
@ -532,12 +532,8 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
} else*/ if (browser.chromecast && val.indexOf('.m3u8') !== -1 && options.mediaSource.RunTimeTicks) {
|
} else*/ if (browser.chromecast && val.indexOf('.m3u8') !== -1 && options.mediaSource.RunTimeTicks) {
|
||||||
|
|
||||||
return setCurrentSrcChromecast(self, elem, options, val);
|
return setCurrentSrcChromecast(self, elem, options, val);
|
||||||
}
|
} else if (htmlMediaHelper.enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && val.indexOf('.m3u8') !== -1) {
|
||||||
|
|
||||||
else if (htmlMediaHelper.enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && val.indexOf('.m3u8') !== -1) {
|
|
||||||
|
|
||||||
return setSrcWithHlsJs(self, elem, options, val);
|
return setSrcWithHlsJs(self, elem, options, val);
|
||||||
|
|
||||||
} else if (options.playMethod !== 'Transcode' && options.mediaSource.Container === 'flv') {
|
} else if (options.playMethod !== 'Transcode' && options.mediaSource.Container === 'flv') {
|
||||||
|
|
||||||
return setSrcWithFlvJs(self, elem, options, val);
|
return setSrcWithFlvJs(self, elem, options, val);
|
||||||
|
|
@ -577,7 +573,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
var offsetValue = parseFloat(offset);
|
var offsetValue = parseFloat(offset);
|
||||||
|
|
||||||
// if .ass currently rendering
|
// if .ass currently rendering
|
||||||
if (currentAssRenderer){
|
if (currentAssRenderer) {
|
||||||
updateCurrentTrackOffset(offsetValue);
|
updateCurrentTrackOffset(offsetValue);
|
||||||
} else {
|
} else {
|
||||||
var videoElement = self._mediaElement;
|
var videoElement = self._mediaElement;
|
||||||
|
|
@ -586,22 +582,22 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
Array.from(videoElement.textTracks)
|
Array.from(videoElement.textTracks)
|
||||||
.filter(function(trackElement) {
|
.filter(function(trackElement) {
|
||||||
// get showing .vtt textTacks
|
// get showing .vtt textTacks
|
||||||
return trackElement.mode === 'showing';
|
return trackElement.mode === 'showing';
|
||||||
})
|
})
|
||||||
.forEach(function(trackElement) {
|
.forEach(function(trackElement) {
|
||||||
|
|
||||||
var track = customTrackIndex === -1 ? null : mediaStreamTextTracks.filter(function (t) {
|
var track = customTrackIndex === -1 ? null : mediaStreamTextTracks.filter(function (t) {
|
||||||
return t.Index === customTrackIndex;
|
return t.Index === customTrackIndex;
|
||||||
})[0];
|
})[0];
|
||||||
|
|
||||||
if (track) {
|
if (track) {
|
||||||
offsetValue = updateCurrentTrackOffset(offsetValue);
|
offsetValue = updateCurrentTrackOffset(offsetValue);
|
||||||
setVttSubtitleOffset(trackElement, offsetValue);
|
setVttSubtitleOffset(trackElement, offsetValue);
|
||||||
} else {
|
} else {
|
||||||
console.log("No available track, cannot apply offset : " + offsetValue);
|
console.log("No available track, cannot apply offset : " + offsetValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -609,7 +605,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
|
|
||||||
var relativeOffset = offsetValue;
|
var relativeOffset = offsetValue;
|
||||||
var newTrackOffset = offsetValue;
|
var newTrackOffset = offsetValue;
|
||||||
if(currentTrackOffset){
|
if (currentTrackOffset) {
|
||||||
relativeOffset -= currentTrackOffset;
|
relativeOffset -= currentTrackOffset;
|
||||||
}
|
}
|
||||||
currentTrackOffset = newTrackOffset;
|
currentTrackOffset = newTrackOffset;
|
||||||
|
|
@ -619,12 +615,12 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
|
|
||||||
function setVttSubtitleOffset(currentTrack, offsetValue) {
|
function setVttSubtitleOffset(currentTrack, offsetValue) {
|
||||||
|
|
||||||
if(currentTrack.cues) {
|
if (currentTrack.cues) {
|
||||||
Array.from(currentTrack.cues)
|
Array.from(currentTrack.cues)
|
||||||
.forEach(function(cue) {
|
.forEach(function(cue) {
|
||||||
cue.startTime -= offsetValue;
|
cue.startTime -= offsetValue;
|
||||||
cue.endTime -= offsetValue;
|
cue.endTime -= offsetValue;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -650,7 +646,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
|
|
||||||
return profiles.filter(function (p) {
|
return profiles.filter(function (p) {
|
||||||
|
|
||||||
|
|
||||||
if (p.Type === 'Video') {
|
if (p.Type === 'Video') {
|
||||||
|
|
||||||
if (!p.AudioCodec) {
|
if (!p.AudioCodec) {
|
||||||
|
|
@ -683,7 +678,9 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
}
|
}
|
||||||
|
|
||||||
var audioIndex = -1;
|
var audioIndex = -1;
|
||||||
var i, length, stream;
|
var i;
|
||||||
|
var length;
|
||||||
|
var stream;
|
||||||
|
|
||||||
for (i = 0, length = streams.length; i < length; i++) {
|
for (i = 0, length = streams.length; i < length; i++) {
|
||||||
stream = streams[i];
|
stream = streams[i];
|
||||||
|
|
@ -1029,8 +1026,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
if (browser.ps4) {
|
if (browser.ps4) {
|
||||||
// Text outlines are not rendering very well
|
// Text outlines are not rendering very well
|
||||||
rendererSettings.enableSvg = false;
|
rendererSettings.enableSvg = false;
|
||||||
}
|
} else if (browser.edge || browser.msie) {
|
||||||
else if (browser.edge || browser.msie) {
|
|
||||||
// svg not rendering at all
|
// svg not rendering at all
|
||||||
rendererSettings.enableSvg = false;
|
rendererSettings.enableSvg = false;
|
||||||
}
|
}
|
||||||
|
|
@ -1232,7 +1228,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
function updateSubtitleText(timeMs) {
|
function updateSubtitleText(timeMs) {
|
||||||
|
|
||||||
// handle offset for ass tracks
|
// handle offset for ass tracks
|
||||||
if(currentTrackOffset) {
|
if (currentTrackOffset) {
|
||||||
timeMs += (currentTrackOffset * 1000);
|
timeMs += (currentTrackOffset * 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1481,6 +1477,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
}
|
}
|
||||||
|
|
||||||
list.push('SetBrightness');
|
list.push('SetBrightness');
|
||||||
|
list.push("SetAspectRatio")
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
@ -1561,8 +1558,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
this.isPip = isEnabled;
|
this.isPip = isEnabled;
|
||||||
if (isEnabled) {
|
if (isEnabled) {
|
||||||
Windows.UI.ViewManagement.ApplicationView.getForCurrentView().tryEnterViewModeAsync(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay);
|
Windows.UI.ViewManagement.ApplicationView.getForCurrentView().tryEnterViewModeAsync(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
Windows.UI.ViewManagement.ApplicationView.getForCurrentView().tryEnterViewModeAsync(Windows.UI.ViewManagement.ApplicationViewMode.default);
|
Windows.UI.ViewManagement.ApplicationView.getForCurrentView().tryEnterViewModeAsync(Windows.UI.ViewManagement.ApplicationViewMode.default);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -1709,7 +1705,15 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
};
|
};
|
||||||
|
|
||||||
HtmlVideoPlayer.prototype.setAspectRatio = function (val) {
|
HtmlVideoPlayer.prototype.setAspectRatio = function (val) {
|
||||||
|
var mediaElement = this._mediaElement;
|
||||||
|
if (mediaElement) {
|
||||||
|
if ("auto" === val) {
|
||||||
|
mediaElement.style.removeProperty("object-fit")
|
||||||
|
} else {
|
||||||
|
mediaElement.style["object-fit"] = val
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this._currentAspectRatio = val
|
||||||
};
|
};
|
||||||
|
|
||||||
HtmlVideoPlayer.prototype.getAspectRatio = function () {
|
HtmlVideoPlayer.prototype.getAspectRatio = function () {
|
||||||
|
|
@ -1717,7 +1721,16 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
||||||
};
|
};
|
||||||
|
|
||||||
HtmlVideoPlayer.prototype.getSupportedAspectRatios = function () {
|
HtmlVideoPlayer.prototype.getSupportedAspectRatios = function () {
|
||||||
return [];
|
return [{
|
||||||
|
name: "Auto",
|
||||||
|
id: "auto"
|
||||||
|
}, {
|
||||||
|
name: "Cover",
|
||||||
|
id: "cover"
|
||||||
|
}, {
|
||||||
|
name: "Fill",
|
||||||
|
id: "fill"
|
||||||
|
}]
|
||||||
};
|
};
|
||||||
|
|
||||||
HtmlVideoPlayer.prototype.togglePictureInPicture = function () {
|
HtmlVideoPlayer.prototype.togglePictureInPicture = function () {
|
||||||
|
|
|
||||||
|
|
@ -176,22 +176,17 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
|
||||||
var shape = 'backdrop';
|
var shape = 'backdrop';
|
||||||
if (imageType === "Backdrop" || imageType === "Art" || imageType === "Thumb" || imageType === "Logo") {
|
if (imageType === "Backdrop" || imageType === "Art" || imageType === "Thumb" || imageType === "Logo") {
|
||||||
shape = 'backdrop';
|
shape = 'backdrop';
|
||||||
}
|
} else if (imageType === "Banner") {
|
||||||
else if (imageType === "Banner") {
|
|
||||||
shape = 'banner';
|
shape = 'banner';
|
||||||
}
|
} else if (imageType === "Disc") {
|
||||||
else if (imageType === "Disc") {
|
|
||||||
shape = 'square';
|
shape = 'square';
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
if (currentItemType === "Episode") {
|
if (currentItemType === "Episode") {
|
||||||
shape = 'backdrop';
|
shape = 'backdrop';
|
||||||
}
|
} else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
|
||||||
else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
|
|
||||||
shape = 'square';
|
shape = 'square';
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
shape = 'portrait';
|
shape = 'portrait';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -224,8 +219,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
|
||||||
|
|
||||||
if (layoutManager.tv || !appHost.supports('externallinks')) {
|
if (layoutManager.tv || !appHost.supports('externallinks')) {
|
||||||
html += '<div class="cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center bottom;"></div>';
|
html += '<div class="cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center bottom;"></div>';
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
html += '<a is="emby-linkbutton" target="_blank" href="' + getDisplayUrl(image.Url, apiClient) + '" class="button-link cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center bottom;"></a>';
|
html += '<a is="emby-linkbutton" target="_blank" href="' + getDisplayUrl(image.Url, apiClient) + '" class="button-link cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center bottom;"></a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
|
||||||
if (item) {
|
if (item) {
|
||||||
apiClient = connectionManager.getApiClient(item.ServerId);
|
apiClient = connectionManager.getApiClient(item.ServerId);
|
||||||
reloadItem(page, item, apiClient, focusContext);
|
reloadItem(page, item, apiClient, focusContext);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
apiClient = connectionManager.getApiClient(currentItem.ServerId);
|
apiClient = connectionManager.getApiClient(currentItem.ServerId);
|
||||||
apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) {
|
apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) {
|
||||||
|
|
@ -60,7 +59,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
apiClient.getItemImageInfos(currentItem.Id).then(function (imageInfos) {
|
apiClient.getItemImageInfos(currentItem.Id).then(function (imageInfos) {
|
||||||
|
|
||||||
renderStandardImages(page, apiClient, item, imageInfos, providers);
|
renderStandardImages(page, apiClient, item, imageInfos, providers);
|
||||||
|
|
@ -167,8 +165,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
|
||||||
} else {
|
} else {
|
||||||
html += '<button type="button" is="paper-icon-button-light" class="autoSize" disabled title="' + globalize.translate('MoveRight') + '"><i class="md-icon">chevron_right</i></button>';
|
html += '<button type="button" is="paper-icon-button-light" class="autoSize" disabled title="' + globalize.translate('MoveRight') + '"><i class="md-icon">chevron_right</i></button>';
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
if (imageProviders.length) {
|
if (imageProviders.length) {
|
||||||
html += '<button type="button" is="paper-icon-button-light" data-imagetype="' + image.ImageType + '" class="btnSearchImages autoSize" title="' + globalize.translate('Search') + '"><i class="md-icon">search</i></button>';
|
html += '<button type="button" is="paper-icon-button-light" data-imagetype="' + image.ImageType + '" class="btnSearchImages autoSize" title="' + globalize.translate('Search') + '"><i class="md-icon">search</i></button>';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,9 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use the median
|
// Use the median
|
||||||
values.sort(function (a, b) { return a - b; });
|
values.sort(function (a, b) {
|
||||||
|
return a - b;
|
||||||
|
});
|
||||||
|
|
||||||
var half = Math.floor(values.length / 2);
|
var half = Math.floor(values.length / 2);
|
||||||
|
|
||||||
|
|
@ -78,8 +80,7 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
|
||||||
|
|
||||||
if (values.length % 2) {
|
if (values.length % 2) {
|
||||||
result = values[half];
|
result = values[half];
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
result = (values[half - 1] + values[half]) / 2.0;
|
result = (values[half - 1] + values[half]) / 2.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,7 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
|
||||||
scrollHelper.centerFocus.on(dlg, false);
|
scrollHelper.centerFocus.on(dlg, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Has to be assigned a z-index after the call to .open()
|
// Has to be assigned a z-index after the call to .open()
|
||||||
dlg.addEventListener('close', function () {
|
dlg.addEventListener('close', function () {
|
||||||
|
|
||||||
if (layoutManager.tv) {
|
if (layoutManager.tv) {
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,6 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter",
|
||||||
//}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (item.IsFolder || item.Type === "MusicArtist" || item.Type === "MusicGenre") {
|
if (item.IsFolder || item.Type === "MusicArtist" || item.Type === "MusicGenre") {
|
||||||
if (item.CollectionType !== "livetv") {
|
if (item.CollectionType !== "livetv") {
|
||||||
if (options.shuffle !== false) {
|
if (options.shuffle !== false) {
|
||||||
|
|
|
||||||
|
|
@ -250,9 +250,7 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
|
||||||
if (item.Type !== 'TvChannel') {
|
if (item.Type !== 'TvChannel') {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else if (item.MediaType === 'Audio') {
|
||||||
|
|
||||||
else if (item.MediaType === 'Audio') {
|
|
||||||
if (item.Type === 'AudioPodcast') {
|
if (item.Type === 'AudioPodcast') {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -274,7 +272,13 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
|
||||||
|
|
||||||
canRate: function (item) {
|
canRate: function (item) {
|
||||||
|
|
||||||
if (item.Type === 'Program' || item.Type === 'Timer' || item.Type === 'SeriesTimer' || item.Type === 'CollectionFolder' || item.Type === 'UserView' || item.Type === 'Channel') {
|
if (item.Type === 'Program'
|
||||||
|
|| item.Type === 'Timer'
|
||||||
|
|| item.Type === 'SeriesTimer'
|
||||||
|
|| item.Type === 'CollectionFolder'
|
||||||
|
|| item.Type === 'UserView'
|
||||||
|
|| item.Type === 'Channel'
|
||||||
|
|| !item.UserData) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,8 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
|
||||||
ProviderIds: {}
|
ProviderIds: {}
|
||||||
};
|
};
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
var identifyField = page.querySelectorAll(".identifyField");
|
var identifyField = page.querySelectorAll(".identifyField");
|
||||||
var value;
|
var value;
|
||||||
for (i = 0, length = identifyField.length; i < length; i++) {
|
for (i = 0, length = identifyField.length; i < length; i++) {
|
||||||
|
|
@ -64,8 +65,7 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
|
||||||
|
|
||||||
if (currentItem && currentItem.Id) {
|
if (currentItem && currentItem.Id) {
|
||||||
lookupInfo.ItemId = currentItem.Id;
|
lookupInfo.ItemId = currentItem.Id;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
lookupInfo.IncludeDisabledProviders = true;
|
lookupInfo.IncludeDisabledProviders = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -97,7 +97,8 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
|
||||||
page.querySelector(".dialogContentInner").classList.remove("dialog-content-centered");
|
page.querySelector(".dialogContentInner").classList.remove("dialog-content-centered");
|
||||||
|
|
||||||
var html = "";
|
var html = "";
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
for (i = 0, length = results.length; i < length; i++) {
|
for (i = 0, length = results.length; i < length; i++) {
|
||||||
|
|
||||||
var result = results[i];
|
var result = results[i];
|
||||||
|
|
@ -184,12 +185,10 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
|
||||||
if (currentItemType === "Episode") {
|
if (currentItemType === "Episode") {
|
||||||
cssClass += " backdropCard backdropCard-scalable";
|
cssClass += " backdropCard backdropCard-scalable";
|
||||||
padderClass = "cardPadder-backdrop";
|
padderClass = "cardPadder-backdrop";
|
||||||
}
|
} else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
|
||||||
else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
|
|
||||||
cssClass += " squareCard squareCard-scalable";
|
cssClass += " squareCard squareCard-scalable";
|
||||||
padderClass = "cardPadder-square";
|
padderClass = "cardPadder-square";
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
cssClass += " portraitCard portraitCard-scalable";
|
cssClass += " portraitCard portraitCard-scalable";
|
||||||
padderClass = "cardPadder-portrait";
|
padderClass = "cardPadder-portrait";
|
||||||
}
|
}
|
||||||
|
|
@ -452,8 +451,6 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
|
||||||
scrollHelper.centerFocus.on(dlg.querySelector(".formDialogContent"), false);
|
scrollHelper.centerFocus.on(dlg.querySelector(".formDialogContent"), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dialogHelper.open(dlg);
|
dialogHelper.open(dlg);
|
||||||
|
|
||||||
dlg.querySelector(".btnCancel").addEventListener("click", function (e) {
|
dlg.querySelector(".btnCancel").addEventListener("click", function (e) {
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,7 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
|
||||||
if (eventsToMonitor.indexOf('markfavorite') !== -1) {
|
if (eventsToMonitor.indexOf('markfavorite') !== -1) {
|
||||||
|
|
||||||
instance.notifyRefreshNeeded();
|
instance.notifyRefreshNeeded();
|
||||||
}
|
} else if (eventsToMonitor.indexOf('markplayed') !== -1) {
|
||||||
else if (eventsToMonitor.indexOf('markplayed') !== -1) {
|
|
||||||
|
|
||||||
instance.notifyRefreshNeeded();
|
instance.notifyRefreshNeeded();
|
||||||
}
|
}
|
||||||
|
|
@ -115,9 +114,7 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
|
||||||
instance.notifyRefreshNeeded(true);
|
instance.notifyRefreshNeeded(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
} else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') {
|
||||||
|
|
||||||
else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') {
|
|
||||||
|
|
||||||
if (eventsToMonitor.indexOf('audioplayback') !== -1) {
|
if (eventsToMonitor.indexOf('audioplayback') !== -1) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,20 +8,20 @@ define(['inputManager', 'focusManager'], function(inputManager, focusManager) {
|
||||||
var capture = true;
|
var capture = true;
|
||||||
|
|
||||||
switch (e.keyCode) {
|
switch (e.keyCode) {
|
||||||
case 37: // ArrowLeft
|
case 37: // ArrowLeft
|
||||||
inputManager.handle('left');
|
inputManager.handle('left');
|
||||||
break;
|
break;
|
||||||
case 38: // ArrowUp
|
case 38: // ArrowUp
|
||||||
inputManager.handle('up');
|
inputManager.handle('up');
|
||||||
break;
|
break;
|
||||||
case 39: // ArrowRight
|
case 39: // ArrowRight
|
||||||
inputManager.handle('right');
|
inputManager.handle('right');
|
||||||
break;
|
break;
|
||||||
case 40: // ArrowDown
|
case 40: // ArrowDown
|
||||||
inputManager.handle('down');
|
inputManager.handle('down');
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
capture = false;
|
capture = false;
|
||||||
}
|
}
|
||||||
if (capture) {
|
if (capture) {
|
||||||
console.log("Disabling default event handling");
|
console.log("Disabling default event handling");
|
||||||
|
|
@ -31,6 +31,6 @@ define(['inputManager', 'focusManager'], function(inputManager, focusManager) {
|
||||||
|
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
enable: enable,
|
enable: enable
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ define(['require', 'browser'], function (require, browser) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
observerOptions
|
observerOptions
|
||||||
);
|
);
|
||||||
|
|
||||||
this.observer = observer;
|
this.observer = observer;
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
||||||
}
|
}
|
||||||
|
|
||||||
var sortBy = (options.sortBy || '').toLowerCase();
|
var sortBy = (options.sortBy || '').toLowerCase();
|
||||||
var code, name;
|
var code;
|
||||||
|
var name;
|
||||||
|
|
||||||
if (sortBy.indexOf('sortname') === 0) {
|
if (sortBy.indexOf('sortname') === 0) {
|
||||||
|
|
||||||
|
|
@ -85,15 +86,12 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
||||||
|
|
||||||
options.tag = item.AlbumPrimaryImageTag;
|
options.tag = item.AlbumPrimaryImageTag;
|
||||||
return apiClient.getScaledImageUrl(item.AlbumId, options);
|
return apiClient.getScaledImageUrl(item.AlbumId, options);
|
||||||
}
|
} else if (item.SeriesId && item.SeriesPrimaryImageTag) {
|
||||||
|
|
||||||
else if (item.SeriesId && item.SeriesPrimaryImageTag) {
|
|
||||||
|
|
||||||
options.tag = item.SeriesPrimaryImageTag;
|
options.tag = item.SeriesPrimaryImageTag;
|
||||||
return apiClient.getScaledImageUrl(item.SeriesId, options);
|
return apiClient.getScaledImageUrl(item.SeriesId, options);
|
||||||
|
|
||||||
}
|
} else if (item.ParentPrimaryImageTag) {
|
||||||
else if (item.ParentPrimaryImageTag) {
|
|
||||||
|
|
||||||
options.tag = item.ParentPrimaryImageTag;
|
options.tag = item.ParentPrimaryImageTag;
|
||||||
return apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, options);
|
return apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, options);
|
||||||
|
|
@ -209,8 +207,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
||||||
|
|
||||||
if (i === 0) {
|
if (i === 0) {
|
||||||
html += '<h2 class="listGroupHeader listGroupHeader-first">';
|
html += '<h2 class="listGroupHeader listGroupHeader-first">';
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
html += '<h2 class="listGroupHeader">';
|
html += '<h2 class="listGroupHeader">';
|
||||||
}
|
}
|
||||||
html += itemGroupTitle;
|
html += itemGroupTitle;
|
||||||
|
|
@ -349,9 +346,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
||||||
if (options.showParentTitle) {
|
if (options.showParentTitle) {
|
||||||
if (item.Type === 'Episode') {
|
if (item.Type === 'Episode') {
|
||||||
parentTitle = item.SeriesName;
|
parentTitle = item.SeriesName;
|
||||||
}
|
} else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
|
||||||
|
|
||||||
else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
|
|
||||||
parentTitle = item.Name;
|
parentTitle = item.Name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -375,8 +370,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
||||||
}
|
}
|
||||||
|
|
||||||
textlines.push(parentTitle || '');
|
textlines.push(parentTitle || '');
|
||||||
}
|
} else if (options.showParentTitle) {
|
||||||
else if (options.showParentTitle) {
|
|
||||||
textlines.push(parentTitle || '');
|
textlines.push(parentTitle || '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -400,8 +394,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
|
||||||
|
|
||||||
if (!artistItems || !artistItems.length) {
|
if (!artistItems || !artistItems.length) {
|
||||||
showArtist = true;
|
showArtist = true;
|
||||||
}
|
} else if (artistItems.length > 1 || containerAlbumArtistIds.indexOf(artistItems[0].Id) === -1) {
|
||||||
else if (artistItems.length > 1 || containerAlbumArtistIds.indexOf(artistItems[0].Id) === -1) {
|
|
||||||
showArtist = true;
|
showArtist = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,8 @@ define(['components/loading/loadingLegacy', 'browser', 'css!./loading'], functio
|
||||||
layer3.classList.add('mdl-spinner__layer-3-active');
|
layer3.classList.add('mdl-spinner__layer-3-active');
|
||||||
layer4.classList.add('mdl-spinner__layer-4-active');
|
layer4.classList.add('mdl-spinner__layer-4-active');
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
for (i = 0, length = circleLefts.length; i < length; i++) {
|
for (i = 0, length = circleLefts.length; i < length; i++) {
|
||||||
circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
|
circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
|
||||||
|
|
@ -67,7 +68,8 @@ define(['components/loading/loadingLegacy', 'browser', 'css!./loading'], functio
|
||||||
elem.classList.remove('mdl-spinner__layer-3-active');
|
elem.classList.remove('mdl-spinner__layer-3-active');
|
||||||
elem.classList.remove('mdl-spinner__layer-4-active');
|
elem.classList.remove('mdl-spinner__layer-4-active');
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
for (i = 0, length = circleLefts.length; i < length; i++) {
|
for (i = 0, length = circleLefts.length; i < length; i++) {
|
||||||
circleLefts[i].classList.remove('mdl-spinner__circleLeft-active');
|
circleLefts[i].classList.remove('mdl-spinner__circleLeft-active');
|
||||||
|
|
|
||||||
|
|
@ -7,16 +7,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
|
|
||||||
if (item.Type === 'SeriesTimer') {
|
if (item.Type === 'SeriesTimer') {
|
||||||
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">fiber_smart_record</i>';
|
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">fiber_smart_record</i>';
|
||||||
}
|
} else if (item.TimerId || item.SeriesTimerId) {
|
||||||
else if (item.TimerId || item.SeriesTimerId) {
|
|
||||||
|
|
||||||
status = item.Status || 'Cancelled';
|
status = item.Status || 'Cancelled';
|
||||||
}
|
} else if (item.Type === 'Timer') {
|
||||||
else if (item.Type === 'Timer') {
|
|
||||||
|
|
||||||
status = item.Status;
|
status = item.Status;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -36,7 +33,8 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
||||||
var miscInfo = [];
|
var miscInfo = [];
|
||||||
var text, date;
|
var text;
|
||||||
|
var date;
|
||||||
|
|
||||||
if (item.StartDate && options.programTime !== false) {
|
if (item.StartDate && options.programTime !== false) {
|
||||||
|
|
||||||
|
|
@ -58,8 +56,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
}
|
}
|
||||||
|
|
||||||
miscInfo.push(text);
|
miscInfo.push(text);
|
||||||
}
|
} catch (e) {
|
||||||
catch (e) {
|
|
||||||
console.log("Error parsing date: " + item.StartDate);
|
console.log("Error parsing date: " + item.StartDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -107,7 +104,9 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
|
|
||||||
var miscInfo = [];
|
var miscInfo = [];
|
||||||
options = options || {};
|
options = options || {};
|
||||||
var text, date, minutes;
|
var text;
|
||||||
|
var date;
|
||||||
|
var minutes;
|
||||||
var count;
|
var count;
|
||||||
|
|
||||||
var showFolderRuntime = item.Type === "MusicAlbum" || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
|
var showFolderRuntime = item.Type === "MusicAlbum" || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
|
||||||
|
|
@ -124,9 +123,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
if (item.RunTimeTicks) {
|
if (item.RunTimeTicks) {
|
||||||
miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
|
miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
|
||||||
}
|
}
|
||||||
}
|
} else if (item.Type === "PhotoAlbum" || item.Type === "BoxSet") {
|
||||||
|
|
||||||
else if (item.Type === "PhotoAlbum" || item.Type === "BoxSet") {
|
|
||||||
|
|
||||||
count = item.ChildCount;
|
count = item.ChildCount;
|
||||||
|
|
||||||
|
|
@ -145,8 +142,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
|
|
||||||
text = datetime.toLocaleDateString(date);
|
text = datetime.toLocaleDateString(date);
|
||||||
miscInfo.push(text);
|
miscInfo.push(text);
|
||||||
}
|
} catch (e) {
|
||||||
catch (e) {
|
|
||||||
console.log("Error parsing date: " + item.PremiereDate);
|
console.log("Error parsing date: " + item.PremiereDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -162,8 +158,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
|
|
||||||
if (item.RecordAnyChannel) {
|
if (item.RecordAnyChannel) {
|
||||||
miscInfo.push(globalize.translate('AllChannels'));
|
miscInfo.push(globalize.translate('AllChannels'));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
miscInfo.push(item.ChannelName || globalize.translate('OneChannel'));
|
miscInfo.push(item.ChannelName || globalize.translate('OneChannel'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -180,8 +175,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
text = datetime.getDisplayTime(date);
|
text = datetime.getDisplayTime(date);
|
||||||
miscInfo.push(text);
|
miscInfo.push(text);
|
||||||
}
|
}
|
||||||
}
|
} catch (e) {
|
||||||
catch (e) {
|
|
||||||
console.log("Error parsing date: " + item.StartDate);
|
console.log("Error parsing date: " + item.StartDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -191,8 +185,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
if (item.Status === "Continuing") {
|
if (item.Status === "Continuing") {
|
||||||
miscInfo.push(globalize.translate('SeriesYearToPresent', item.ProductionYear));
|
miscInfo.push(globalize.translate('SeriesYearToPresent', item.ProductionYear));
|
||||||
|
|
||||||
}
|
} else if (item.ProductionYear) {
|
||||||
else if (item.ProductionYear) {
|
|
||||||
|
|
||||||
text = item.ProductionYear;
|
text = item.ProductionYear;
|
||||||
|
|
||||||
|
|
@ -206,8 +199,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
text += "-" + datetime.parseISO8601Date(item.EndDate).getFullYear();
|
text += "-" + datetime.parseISO8601Date(item.EndDate).getFullYear();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} catch (e) {
|
||||||
catch (e) {
|
|
||||||
console.log("Error parsing date: " + item.EndDate);
|
console.log("Error parsing date: " + item.EndDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -223,18 +215,15 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
miscInfo.push({
|
miscInfo.push({
|
||||||
html: '<div class="mediaInfoProgramAttribute mediaInfoItem liveTvProgram">' + globalize.translate('Live') + '</div>'
|
html: '<div class="mediaInfoProgramAttribute mediaInfoItem liveTvProgram">' + globalize.translate('Live') + '</div>'
|
||||||
});
|
});
|
||||||
}
|
} else if (item.IsPremiere) {
|
||||||
else if (item.IsPremiere) {
|
|
||||||
miscInfo.push({
|
miscInfo.push({
|
||||||
html: '<div class="mediaInfoProgramAttribute mediaInfoItem premiereTvProgram">' + globalize.translate('Premiere') + '</div>'
|
html: '<div class="mediaInfoProgramAttribute mediaInfoItem premiereTvProgram">' + globalize.translate('Premiere') + '</div>'
|
||||||
});
|
});
|
||||||
}
|
} else if (item.IsSeries && !item.IsRepeat) {
|
||||||
else if (item.IsSeries && !item.IsRepeat) {
|
|
||||||
miscInfo.push({
|
miscInfo.push({
|
||||||
html: '<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">' + globalize.translate('AttributeNew') + '</div>'
|
html: '<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">' + globalize.translate('AttributeNew') + '</div>'
|
||||||
});
|
});
|
||||||
}
|
} else if (item.IsSeries && item.IsRepeat) {
|
||||||
else if (item.IsSeries && item.IsRepeat) {
|
|
||||||
miscInfo.push({
|
miscInfo.push({
|
||||||
html: '<div class="mediaInfoProgramAttribute mediaInfoItem repeatTvProgram">' + globalize.translate('Repeat') + '</div>'
|
html: '<div class="mediaInfoProgramAttribute mediaInfoItem repeatTvProgram">' + globalize.translate('Repeat') + '</div>'
|
||||||
});
|
});
|
||||||
|
|
@ -250,20 +239,15 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
if (text) {
|
if (text) {
|
||||||
miscInfo.push(text);
|
miscInfo.push(text);
|
||||||
}
|
}
|
||||||
}
|
} else if (item.IsMovie && item.ProductionYear && options.originalAirDate !== false) {
|
||||||
|
|
||||||
else if (item.IsMovie && item.ProductionYear && options.originalAirDate !== false) {
|
|
||||||
miscInfo.push(item.ProductionYear);
|
miscInfo.push(item.ProductionYear);
|
||||||
}
|
} else if (item.PremiereDate && options.originalAirDate !== false) {
|
||||||
|
|
||||||
else if (item.PremiereDate && options.originalAirDate !== false) {
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
date = datetime.parseISO8601Date(item.PremiereDate);
|
date = datetime.parseISO8601Date(item.PremiereDate);
|
||||||
text = globalize.translate('OriginalAirDateValue', datetime.toLocaleDateString(date));
|
text = globalize.translate('OriginalAirDateValue', datetime.toLocaleDateString(date));
|
||||||
miscInfo.push(text);
|
miscInfo.push(text);
|
||||||
}
|
} catch (e) {
|
||||||
catch (e) {
|
|
||||||
console.log("Error parsing date: " + item.PremiereDate);
|
console.log("Error parsing date: " + item.PremiereDate);
|
||||||
}
|
}
|
||||||
} else if (item.ProductionYear) {
|
} else if (item.ProductionYear) {
|
||||||
|
|
@ -277,14 +261,12 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
|
||||||
if (item.ProductionYear) {
|
if (item.ProductionYear) {
|
||||||
|
|
||||||
miscInfo.push(item.ProductionYear);
|
miscInfo.push(item.ProductionYear);
|
||||||
}
|
} else if (item.PremiereDate) {
|
||||||
else if (item.PremiereDate) {
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
|
text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
|
||||||
miscInfo.push(text);
|
miscInfo.push(text);
|
||||||
}
|
} catch (e) {
|
||||||
catch (e) {
|
|
||||||
console.log("Error parsing date: " + item.PremiereDate);
|
console.log("Error parsing date: " + item.PremiereDate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -151,13 +151,13 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed
|
||||||
var xhr = new XMLHttpRequest;
|
var xhr = new XMLHttpRequest;
|
||||||
xhr.open("GET", "components/medialibrarycreator/medialibrarycreator.template.html", true);
|
xhr.open("GET", "components/medialibrarycreator/medialibrarycreator.template.html", true);
|
||||||
xhr.onload = function(e) {
|
xhr.onload = function(e) {
|
||||||
var template = this.response,
|
var template = this.response;
|
||||||
dlg = dialogHelper.createDialog({
|
var dlg = dialogHelper.createDialog({
|
||||||
size: "medium-tall",
|
size: "medium-tall",
|
||||||
modal: false,
|
modal: false,
|
||||||
removeOnClose: true,
|
removeOnClose: true,
|
||||||
scrollY: false
|
scrollY: false
|
||||||
});
|
});
|
||||||
dlg.classList.add("ui-body-a");
|
dlg.classList.add("ui-body-a");
|
||||||
dlg.classList.add("background-theme-a");
|
dlg.classList.add("background-theme-a");
|
||||||
dlg.classList.add("dlg-librarycreator");
|
dlg.classList.add("dlg-librarycreator");
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
|
||||||
AirTime: form.querySelector('#txtAirTime').value,
|
AirTime: form.querySelector('#txtAirTime').value,
|
||||||
Genres: getListValues(form.querySelector("#listGenres")),
|
Genres: getListValues(form.querySelector("#listGenres")),
|
||||||
Tags: getListValues(form.querySelector("#listTags")),
|
Tags: getListValues(form.querySelector("#listTags")),
|
||||||
Studios: getListValues(form.querySelector("#listStudios")).map(function (element) { return { Name: element }; }),
|
Studios: getListValues(form.querySelector("#listStudios")).map(function (element) {
|
||||||
|
return { Name: element };
|
||||||
|
}),
|
||||||
|
|
||||||
PremiereDate: getDateValue(form, '#txtPremiereDate', 'PremiereDate'),
|
PremiereDate: getDateValue(form, '#txtPremiereDate', 'PremiereDate'),
|
||||||
DateCreated: getDateValue(form, '#txtDateAdded', 'DateCreated'),
|
DateCreated: getDateValue(form, '#txtDateAdded', 'DateCreated'),
|
||||||
|
|
@ -202,7 +204,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
|
||||||
}
|
}
|
||||||
|
|
||||||
function getListValues(list) {
|
function getListValues(list) {
|
||||||
return Array.prototype.map.call(list.querySelectorAll('.textValue'), function (el) { return el.textContent; });
|
return Array.prototype.map.call(list.querySelectorAll('.textValue'), function (el) {
|
||||||
|
return el.textContent;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function addElementToList(source, sortCallback) {
|
function addElementToList(source, sortCallback) {
|
||||||
|
|
@ -439,7 +443,6 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
|
||||||
|
|
||||||
var html = metadataInfo.ContentTypeOptions.map(function (i) {
|
var html = metadataInfo.ContentTypeOptions.map(function (i) {
|
||||||
|
|
||||||
|
|
||||||
return '<option value="' + i.Value + '">' + i.Name + '</option>';
|
return '<option value="' + i.Value + '">' + i.Name + '</option>';
|
||||||
|
|
||||||
}).join('');
|
}).join('');
|
||||||
|
|
@ -744,7 +747,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
|
||||||
populateListView(context.querySelector('#listGenres'), item.Genres);
|
populateListView(context.querySelector('#listGenres'), item.Genres);
|
||||||
populatePeople(context, item.People || []);
|
populatePeople(context, item.People || []);
|
||||||
|
|
||||||
populateListView(context.querySelector('#listStudios'), (item.Studios || []).map(function (element) { return element.Name || ''; }));
|
populateListView(context.querySelector('#listStudios'), (item.Studios || []).map(function (element) {
|
||||||
|
return element.Name || '';
|
||||||
|
}));
|
||||||
|
|
||||||
populateListView(context.querySelector('#listTags'), item.Tags);
|
populateListView(context.querySelector('#listTags'), item.Tags);
|
||||||
|
|
||||||
|
|
@ -783,8 +788,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
|
||||||
|
|
||||||
if (item.Type === 'Series') {
|
if (item.Type === 'Series') {
|
||||||
context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
|
context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
|
context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -859,7 +863,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
|
||||||
html += "<option value=''></option>";
|
html += "<option value=''></option>";
|
||||||
|
|
||||||
var ratings = [];
|
var ratings = [];
|
||||||
var i, length, rating;
|
var i;
|
||||||
|
var length;
|
||||||
|
var rating;
|
||||||
|
|
||||||
var currentValueFound = false;
|
var currentValueFound = false;
|
||||||
|
|
||||||
|
|
@ -901,7 +907,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
|
||||||
|
|
||||||
items = items || [];
|
items = items || [];
|
||||||
if (typeof (sortCallback) === 'undefined') {
|
if (typeof (sortCallback) === 'undefined') {
|
||||||
items.sort(function (a, b) { return a.toLowerCase().localeCompare(b.toLowerCase()); });
|
items.sort(function (a, b) {
|
||||||
|
return a.toLowerCase().localeCompare(b.toLowerCase());
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
items = sortCallback(items);
|
items = sortCallback(items);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'globalize', 'appRouter', 'dom', 'css!./multiselect'], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
|
define(["browser", "appStorage", "apphost", "loading", "connectionManager", "globalize", "appRouter", "dom", "css!./multiselect"], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
|
||||||
'use strict';
|
"use strict";
|
||||||
|
|
||||||
var selectedItems = [];
|
var selectedItems = [];
|
||||||
var selectedElements = [];
|
var selectedElements = [];
|
||||||
|
|
@ -15,12 +15,12 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
selectedItems = [];
|
selectedItems = [];
|
||||||
selectedElements = [];
|
selectedElements = [];
|
||||||
var elems = document.querySelectorAll('.itemSelectionPanel');
|
var elems = document.querySelectorAll(".itemSelectionPanel");
|
||||||
for (var i = 0, length = elems.length; i < length; i++) {
|
for (var i = 0, length = elems.length; i < length; i++) {
|
||||||
|
|
||||||
var parent = elems[i].parentNode;
|
var parent = elems[i].parentNode;
|
||||||
parent.removeChild(elems[i]);
|
parent.removeChild(elems[i]);
|
||||||
parent.classList.remove('withMultiSelect');
|
parent.classList.remove("withMultiSelect");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -28,13 +28,13 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
function onItemSelectionPanelClick(e, itemSelectionPanel) {
|
function onItemSelectionPanelClick(e, itemSelectionPanel) {
|
||||||
|
|
||||||
// toggle the checkbox, if it wasn't clicked on
|
// toggle the checkbox, if it wasn't clicked on
|
||||||
if (!dom.parentWithClass(e.target, 'chkItemSelect')) {
|
if (!dom.parentWithClass(e.target, "chkItemSelect")) {
|
||||||
var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
|
var chkItemSelect = itemSelectionPanel.querySelector(".chkItemSelect");
|
||||||
|
|
||||||
if (chkItemSelect) {
|
if (chkItemSelect) {
|
||||||
|
|
||||||
if (chkItemSelect.classList.contains('checkedInitial')) {
|
if (chkItemSelect.classList.contains("checkedInitial")) {
|
||||||
chkItemSelect.classList.remove('checkedInitial');
|
chkItemSelect.classList.remove("checkedInitial");
|
||||||
} else {
|
} else {
|
||||||
var newValue = !chkItemSelect.checked;
|
var newValue = !chkItemSelect.checked;
|
||||||
chkItemSelect.checked = newValue;
|
chkItemSelect.checked = newValue;
|
||||||
|
|
@ -50,7 +50,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
function updateItemSelection(chkItemSelect, selected) {
|
function updateItemSelection(chkItemSelect, selected) {
|
||||||
|
|
||||||
var id = dom.parentWithAttribute(chkItemSelect, 'data-id').getAttribute('data-id');
|
var id = dom.parentWithAttribute(chkItemSelect, "data-id").getAttribute("data-id");
|
||||||
|
|
||||||
if (selected) {
|
if (selected) {
|
||||||
|
|
||||||
|
|
@ -73,7 +73,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
}
|
}
|
||||||
|
|
||||||
if (selectedItems.length) {
|
if (selectedItems.length) {
|
||||||
var itemSelectionCount = document.querySelector('.itemSelectionCount');
|
var itemSelectionCount = document.querySelector(".itemSelectionCount");
|
||||||
if (itemSelectionCount) {
|
if (itemSelectionCount) {
|
||||||
itemSelectionCount.innerHTML = selectedItems.length;
|
itemSelectionCount.innerHTML = selectedItems.length;
|
||||||
}
|
}
|
||||||
|
|
@ -88,27 +88,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
function showSelection(item, isChecked) {
|
function showSelection(item, isChecked) {
|
||||||
|
|
||||||
var itemSelectionPanel = item.querySelector('.itemSelectionPanel');
|
var itemSelectionPanel = item.querySelector(".itemSelectionPanel");
|
||||||
|
|
||||||
if (!itemSelectionPanel) {
|
if (!itemSelectionPanel) {
|
||||||
|
|
||||||
itemSelectionPanel = document.createElement('div');
|
itemSelectionPanel = document.createElement("div");
|
||||||
itemSelectionPanel.classList.add('itemSelectionPanel');
|
itemSelectionPanel.classList.add("itemSelectionPanel");
|
||||||
|
|
||||||
var parent = item.querySelector('.cardBox') || item.querySelector('.cardContent');
|
var parent = item.querySelector(".cardBox") || item.querySelector(".cardContent");
|
||||||
parent.classList.add('withMultiSelect');
|
parent.classList.add("withMultiSelect");
|
||||||
parent.appendChild(itemSelectionPanel);
|
parent.appendChild(itemSelectionPanel);
|
||||||
|
|
||||||
var cssClass = 'chkItemSelect';
|
var cssClass = "chkItemSelect";
|
||||||
if (isChecked && !browser.firefox) {
|
if (isChecked && !browser.firefox) {
|
||||||
// In firefox, the initial tap hold doesnt' get treated as a click
|
// In firefox, the initial tap hold doesnt' get treated as a click
|
||||||
// In other browsers it does, so we need to make sure that initial click is ignored
|
// In other browsers it does, so we need to make sure that initial click is ignored
|
||||||
cssClass += ' checkedInitial';
|
cssClass += " checkedInitial";
|
||||||
}
|
}
|
||||||
var checkedAttribute = isChecked ? ' checked' : '';
|
var checkedAttribute = isChecked ? " checked" : "";
|
||||||
itemSelectionPanel.innerHTML = '<label class="checkboxContainer"><input type="checkbox" is="emby-checkbox" data-outlineclass="multiSelectCheckboxOutline" class="' + cssClass + '"' + checkedAttribute + '/><span></span></label>';
|
itemSelectionPanel.innerHTML = '<label class="checkboxContainer"><input type="checkbox" is="emby-checkbox" data-outlineclass="multiSelectCheckboxOutline" class="' + cssClass + '"' + checkedAttribute + '/><span></span></label>';
|
||||||
var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
|
var chkItemSelect = itemSelectionPanel.querySelector(".chkItemSelect");
|
||||||
chkItemSelect.addEventListener('change', onSelectionChange);
|
chkItemSelect.addEventListener("change", onSelectionChange);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -118,27 +118,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
if (!selectionCommandsPanel) {
|
if (!selectionCommandsPanel) {
|
||||||
|
|
||||||
selectionCommandsPanel = document.createElement('div');
|
selectionCommandsPanel = document.createElement("div");
|
||||||
selectionCommandsPanel.classList.add('selectionCommandsPanel');
|
selectionCommandsPanel.classList.add("selectionCommandsPanel");
|
||||||
|
|
||||||
document.body.appendChild(selectionCommandsPanel);
|
document.body.appendChild(selectionCommandsPanel);
|
||||||
currentSelectionCommandsPanel = selectionCommandsPanel;
|
currentSelectionCommandsPanel = selectionCommandsPanel;
|
||||||
|
|
||||||
var html = '';
|
var html = "";
|
||||||
|
|
||||||
html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><i class="md-icon">close</i></button>';
|
html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><i class="md-icon">close</i></button>';
|
||||||
html += '<h1 class="itemSelectionCount"></h1>';
|
html += '<h1 class="itemSelectionCount"></h1>';
|
||||||
|
|
||||||
var moreIcon = 'more_horiz';
|
var moreIcon = "more_horiz";
|
||||||
html += '<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><i class="md-icon">' + moreIcon + '</i></button>';
|
html += '<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><i class="md-icon">' + moreIcon + '</i></button>';
|
||||||
|
|
||||||
selectionCommandsPanel.innerHTML = html;
|
selectionCommandsPanel.innerHTML = html;
|
||||||
|
|
||||||
selectionCommandsPanel.querySelector('.btnCloseSelectionPanel').addEventListener('click', hideSelections);
|
selectionCommandsPanel.querySelector(".btnCloseSelectionPanel").addEventListener("click", hideSelections);
|
||||||
|
|
||||||
var btnSelectionPanelOptions = selectionCommandsPanel.querySelector('.btnSelectionPanelOptions');
|
var btnSelectionPanelOptions = selectionCommandsPanel.querySelector(".btnSelectionPanelOptions");
|
||||||
|
|
||||||
dom.addEventListener(btnSelectionPanelOptions, 'click', showMenuForSelectedItems, { passive: true });
|
dom.addEventListener(btnSelectionPanelOptions, "click", showMenuForSelectedItems, { passive: true });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -146,7 +146,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise(function (resolve, reject) {
|
||||||
|
|
||||||
require(['alert'], function (alert) {
|
require(["alert"], function (alert) {
|
||||||
alert(options).then(resolve, resolve);
|
alert(options).then(resolve, resolve);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -156,15 +156,15 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise(function (resolve, reject) {
|
||||||
|
|
||||||
var msg = globalize.translate('ConfirmDeleteItem');
|
var msg = globalize.translate("ConfirmDeleteItem");
|
||||||
var title = globalize.translate('HeaderDeleteItem');
|
var title = globalize.translate("HeaderDeleteItem");
|
||||||
|
|
||||||
if (itemIds.length > 1) {
|
if (itemIds.length > 1) {
|
||||||
msg = globalize.translate('ConfirmDeleteItems');
|
msg = globalize.translate("ConfirmDeleteItems");
|
||||||
title = globalize.translate('HeaderDeleteItems');
|
title = globalize.translate("HeaderDeleteItems");
|
||||||
}
|
}
|
||||||
|
|
||||||
require(['confirm'], function (confirm) {
|
require(["confirm"], function (confirm) {
|
||||||
|
|
||||||
confirm(msg, title).then(function () {
|
confirm(msg, title).then(function () {
|
||||||
var promises = itemIds.map(function (itemId) {
|
var promises = itemIds.map(function (itemId) {
|
||||||
|
|
@ -173,7 +173,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
Promise.all(promises).then(resolve, function () {
|
Promise.all(promises).then(resolve, function () {
|
||||||
|
|
||||||
alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject);
|
alertText(globalize.translate("ErrorDeletingItem")).then(reject, reject);
|
||||||
});
|
});
|
||||||
}, reject);
|
}, reject);
|
||||||
|
|
||||||
|
|
@ -190,59 +190,60 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
var menuItems = [];
|
var menuItems = [];
|
||||||
|
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate('AddToCollection'),
|
name: globalize.translate("AddToCollection"),
|
||||||
id: 'addtocollection',
|
id: "addtocollection",
|
||||||
ironIcon: 'add'
|
icon: "add"
|
||||||
});
|
});
|
||||||
|
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate('AddToPlaylist'),
|
name: globalize.translate("AddToPlaylist"),
|
||||||
id: 'playlist',
|
id: "playlist",
|
||||||
ironIcon: 'playlist-add'
|
icon: "playlist_add"
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO: Be more dynamic based on what is selected
|
// TODO: Be more dynamic based on what is selected
|
||||||
if (user.Policy.EnableContentDeletion) {
|
if (user.Policy.EnableContentDeletion) {
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate('Delete'),
|
name: globalize.translate("Delete"),
|
||||||
id: 'delete',
|
id: "delete",
|
||||||
ironIcon: 'delete'
|
icon: "delete"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
|
if (user.Policy.EnableContentDownloading && appHost.supports("filedownload")) {
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: Globalize.translate('ButtonDownload'),
|
name: Globalize.translate("ButtonDownload"),
|
||||||
id: 'download',
|
id: "download",
|
||||||
ironIcon: 'file-download'
|
icon: "file_download"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (user.Policy.IsAdministrator) {
|
if (user.Policy.IsAdministrator) {
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate('GroupVersions'),
|
name: globalize.translate("GroupVersions"),
|
||||||
id: 'groupvideos',
|
id: "groupvideos",
|
||||||
ironIcon: 'call-merge'
|
icon: "call_merge"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate('MarkPlayed'),
|
name: globalize.translate("MarkPlayed"),
|
||||||
id: 'markplayed'
|
id: "markplayed",
|
||||||
|
icon: "check_box"
|
||||||
});
|
});
|
||||||
|
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate('MarkUnplayed'),
|
name: globalize.translate("MarkUnplayed"),
|
||||||
id: 'markunplayed'
|
id: "markunplayed",
|
||||||
|
icon: "check_box_outline_blank"
|
||||||
});
|
});
|
||||||
|
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate('RefreshMetadata'),
|
name: globalize.translate("RefreshMetadata"),
|
||||||
id: 'refresh'
|
id: "refresh",
|
||||||
|
icon: "refresh"
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
require(['actionsheet'], function (actionsheet) {
|
require(['actionsheet'], function (actionsheet) {
|
||||||
actionsheet.show({
|
actionsheet.show({
|
||||||
items: menuItems,
|
items: menuItems,
|
||||||
|
|
@ -252,8 +253,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
var serverId = apiClient.serverInfo().Id;
|
var serverId = apiClient.serverInfo().Id;
|
||||||
|
|
||||||
switch (id) {
|
switch (id) {
|
||||||
case 'addtocollection':
|
case "addtocollection":
|
||||||
require(['collectionEditor'], function (collectionEditor) {
|
require(["collectionEditor"], function (collectionEditor) {
|
||||||
new collectionEditor().show({
|
new collectionEditor().show({
|
||||||
items: items,
|
items: items,
|
||||||
serverId: serverId
|
serverId: serverId
|
||||||
|
|
@ -262,8 +263,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
hideSelections();
|
hideSelections();
|
||||||
dispatchNeedsRefresh();
|
dispatchNeedsRefresh();
|
||||||
break;
|
break;
|
||||||
case 'playlist':
|
case "playlist":
|
||||||
require(['playlistEditor'], function (playlistEditor) {
|
require(["playlistEditor"], function (playlistEditor) {
|
||||||
new playlistEditor().show({
|
new playlistEditor().show({
|
||||||
items: items,
|
items: items,
|
||||||
serverId: serverId
|
serverId: serverId
|
||||||
|
|
@ -272,30 +273,30 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
hideSelections();
|
hideSelections();
|
||||||
dispatchNeedsRefresh();
|
dispatchNeedsRefresh();
|
||||||
break;
|
break;
|
||||||
case 'delete':
|
case "delete":
|
||||||
deleteItems(apiClient, items).then(dispatchNeedsRefresh);
|
deleteItems(apiClient, items).then(dispatchNeedsRefresh);
|
||||||
hideSelections();
|
hideSelections();
|
||||||
dispatchNeedsRefresh();
|
dispatchNeedsRefresh();
|
||||||
break;
|
break;
|
||||||
case 'groupvideos':
|
case "groupvideos":
|
||||||
combineVersions(apiClient, items);
|
combineVersions(apiClient, items);
|
||||||
break;
|
break;
|
||||||
case 'markplayed':
|
case "markplayed":
|
||||||
items.forEach(function (itemId) {
|
items.forEach(function (itemId) {
|
||||||
apiClient.markPlayed(apiClient.getCurrentUserId(), itemId);
|
apiClient.markPlayed(apiClient.getCurrentUserId(), itemId);
|
||||||
});
|
});
|
||||||
hideSelections();
|
hideSelections();
|
||||||
dispatchNeedsRefresh();
|
dispatchNeedsRefresh();
|
||||||
break;
|
break;
|
||||||
case 'markunplayed':
|
case "markunplayed":
|
||||||
items.forEach(function (itemId) {
|
items.forEach(function (itemId) {
|
||||||
apiClient.markUnplayed(apiClient.getCurrentUserId(), itemId);
|
apiClient.markUnplayed(apiClient.getCurrentUserId(), itemId);
|
||||||
});
|
});
|
||||||
hideSelections();
|
hideSelections();
|
||||||
dispatchNeedsRefresh();
|
dispatchNeedsRefresh();
|
||||||
break;
|
break;
|
||||||
case 'refresh':
|
case "refresh":
|
||||||
require(['refreshDialog'], function (refreshDialog) {
|
require(["refreshDialog"], function (refreshDialog) {
|
||||||
new refreshDialog({
|
new refreshDialog({
|
||||||
itemIds: items,
|
itemIds: items,
|
||||||
serverId: serverId
|
serverId: serverId
|
||||||
|
|
@ -320,7 +321,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
[].forEach.call(selectedElements, function (i) {
|
[].forEach.call(selectedElements, function (i) {
|
||||||
|
|
||||||
var container = dom.parentWithAttribute(i, 'is', 'emby-itemscontainer');
|
var container = dom.parentWithAttribute(i, "is", "emby-itemscontainer");
|
||||||
|
|
||||||
if (container && elems.indexOf(container) === -1) {
|
if (container && elems.indexOf(container) === -1) {
|
||||||
elems.push(container);
|
elems.push(container);
|
||||||
|
|
@ -336,9 +337,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
if (selection.length < 2) {
|
if (selection.length < 2) {
|
||||||
|
|
||||||
require(['alert'], function (alert) {
|
require(["alert"], function (alert) {
|
||||||
alert({
|
alert({
|
||||||
text: globalize.translate('PleaseSelectTwoItems')
|
text: globalize.translate("PleaseSelectTwoItems")
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
|
@ -349,7 +350,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
apiClient.ajax({
|
apiClient.ajax({
|
||||||
|
|
||||||
type: "POST",
|
type: "POST",
|
||||||
url: apiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(',') })
|
url: apiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(",") })
|
||||||
|
|
||||||
}).then(function () {
|
}).then(function () {
|
||||||
|
|
||||||
|
|
@ -361,8 +362,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
function showSelections(initialCard) {
|
function showSelections(initialCard) {
|
||||||
|
|
||||||
require(['emby-checkbox'], function () {
|
require(["emby-checkbox"], function () {
|
||||||
var cards = document.querySelectorAll('.card');
|
var cards = document.querySelectorAll(".card");
|
||||||
for (var i = 0, length = cards.length; i < length; i++) {
|
for (var i = 0, length = cards.length; i < length; i++) {
|
||||||
showSelection(cards[i], initialCard === cards[i]);
|
showSelection(cards[i], initialCard === cards[i]);
|
||||||
}
|
}
|
||||||
|
|
@ -378,9 +379,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
if (selectedItems.length) {
|
if (selectedItems.length) {
|
||||||
|
|
||||||
var card = dom.parentWithClass(target, 'card');
|
var card = dom.parentWithClass(target, "card");
|
||||||
if (card) {
|
if (card) {
|
||||||
var itemSelectionPanel = card.querySelector('.itemSelectionPanel');
|
var itemSelectionPanel = card.querySelector(".itemSelectionPanel");
|
||||||
if (itemSelectionPanel) {
|
if (itemSelectionPanel) {
|
||||||
return onItemSelectionPanelClick(e, itemSelectionPanel);
|
return onItemSelectionPanelClick(e, itemSelectionPanel);
|
||||||
}
|
}
|
||||||
|
|
@ -392,7 +393,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
document.addEventListener('viewbeforehide', hideSelections);
|
document.addEventListener("viewbeforehide", hideSelections);
|
||||||
|
|
||||||
return function (options) {
|
return function (options) {
|
||||||
|
|
||||||
|
|
@ -402,7 +403,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
function onTapHold(e) {
|
function onTapHold(e) {
|
||||||
|
|
||||||
var card = dom.parentWithClass(e.target, 'card');
|
var card = dom.parentWithClass(e.target, "card");
|
||||||
|
|
||||||
if (card) {
|
if (card) {
|
||||||
|
|
||||||
|
|
@ -439,7 +440,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
var element = touch.target;
|
var element = touch.target;
|
||||||
|
|
||||||
if (element) {
|
if (element) {
|
||||||
var card = dom.parentWithClass(element, 'card');
|
var card = dom.parentWithClass(element, "card");
|
||||||
|
|
||||||
if (card) {
|
if (card) {
|
||||||
|
|
||||||
|
|
@ -508,7 +509,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var card = dom.parentWithClass(touchTarget, 'card');
|
var card = dom.parentWithClass(touchTarget, "card");
|
||||||
touchTarget = null;
|
touchTarget = null;
|
||||||
|
|
||||||
if (card) {
|
if (card) {
|
||||||
|
|
@ -521,27 +522,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
|
|
||||||
// mobile safari doesn't allow contextmenu override
|
// mobile safari doesn't allow contextmenu override
|
||||||
if (browser.touch && !browser.safari) {
|
if (browser.touch && !browser.safari) {
|
||||||
element.addEventListener('contextmenu', onTapHold);
|
element.addEventListener("contextmenu", onTapHold);
|
||||||
} else {
|
} else {
|
||||||
dom.addEventListener(element, 'touchstart', onTouchStart, {
|
dom.addEventListener(element, "touchstart", onTouchStart, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.addEventListener(element, 'touchmove', onTouchMove, {
|
dom.addEventListener(element, "touchmove", onTouchMove, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.addEventListener(element, 'touchend', onTouchEnd, {
|
dom.addEventListener(element, "touchend", onTouchEnd, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.addEventListener(element, 'touchcancel', onTouchEnd, {
|
dom.addEventListener(element, "touchcancel", onTouchEnd, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.addEventListener(element, 'mousedown', onMouseDown, {
|
dom.addEventListener(element, "mousedown", onMouseDown, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.addEventListener(element, 'mouseleave', onMouseOut, {
|
dom.addEventListener(element, "mouseleave", onMouseOut, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.addEventListener(element, 'mouseup', onMouseOut, {
|
dom.addEventListener(element, "mouseup", onMouseOut, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -550,38 +551,38 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
|
||||||
initTapHold(container);
|
initTapHold(container);
|
||||||
|
|
||||||
if (options.bindOnClick !== false) {
|
if (options.bindOnClick !== false) {
|
||||||
container.addEventListener('click', onContainerClick);
|
container.addEventListener("click", onContainerClick);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.onContainerClick = onContainerClick;
|
self.onContainerClick = onContainerClick;
|
||||||
|
|
||||||
self.destroy = function () {
|
self.destroy = function () {
|
||||||
|
|
||||||
container.removeEventListener('click', onContainerClick);
|
container.removeEventListener("click", onContainerClick);
|
||||||
container.removeEventListener('contextmenu', onTapHold);
|
container.removeEventListener("contextmenu", onTapHold);
|
||||||
|
|
||||||
var element = container;
|
var element = container;
|
||||||
|
|
||||||
dom.removeEventListener(element, 'touchstart', onTouchStart, {
|
dom.removeEventListener(element, "touchstart", onTouchStart, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.removeEventListener(element, 'touchmove', onTouchMove, {
|
dom.removeEventListener(element, "touchmove", onTouchMove, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.removeEventListener(element, 'touchend', onTouchEnd, {
|
dom.removeEventListener(element, "touchend", onTouchEnd, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
// this fires in safari due to magnifying class
|
// this fires in safari due to magnifying class
|
||||||
//dom.removeEventListener(element, 'touchcancel', onTouchEnd, {
|
//dom.removeEventListener(element, "touchcancel", onTouchEnd, {
|
||||||
// passive: true
|
// passive: true
|
||||||
//});
|
//});
|
||||||
dom.removeEventListener(element, 'mousedown', onMouseDown, {
|
dom.removeEventListener(element, "mousedown", onMouseDown, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.removeEventListener(element, 'mouseleave', onMouseOut, {
|
dom.removeEventListener(element, "mouseleave", onMouseOut, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
dom.removeEventListener(element, 'mouseup', onMouseOut, {
|
dom.removeEventListener(element, "mouseup", onMouseOut, {
|
||||||
passive: true
|
passive: true
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -21,13 +21,13 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
}
|
}
|
||||||
|
|
||||||
function onMenuTouchMove(e) {
|
function onMenuTouchMove(e) {
|
||||||
var isOpen = self.visible,
|
var isOpen = self.visible;
|
||||||
touches = getTouches(e),
|
var touches = getTouches(e);
|
||||||
touch = touches[0] || {},
|
var touch = touches[0] || {};
|
||||||
endX = touch.clientX || 0,
|
var endX = touch.clientX || 0;
|
||||||
endY = touch.clientY || 0,
|
var endY = touch.clientY || 0;
|
||||||
deltaX = endX - (menuTouchStartX || 0),
|
var deltaX = endX - (menuTouchStartX || 0);
|
||||||
deltaY = endY - (menuTouchStartY || 0);
|
var deltaY = endY - (menuTouchStartY || 0);
|
||||||
setVelocity(deltaX), isOpen && 1 !== dragMode && deltaX > 0 && (dragMode = 2), 0 === dragMode && (!isOpen || Math.abs(deltaX) >= 10) && Math.abs(deltaY) < 5 ? (dragMode = 1, scrollContainer.addEventListener("scroll", disableEvent), self.showMask()) : 0 === dragMode && Math.abs(deltaY) >= 5 && (dragMode = 2), 1 === dragMode && (newPos = currentPos + deltaX, self.changeMenuPos())
|
setVelocity(deltaX), isOpen && 1 !== dragMode && deltaX > 0 && (dragMode = 2), 0 === dragMode && (!isOpen || Math.abs(deltaX) >= 10) && Math.abs(deltaY) < 5 ? (dragMode = 1, scrollContainer.addEventListener("scroll", disableEvent), self.showMask()) : 0 === dragMode && Math.abs(deltaY) >= 5 && (dragMode = 2), 1 === dragMode && (newPos = currentPos + deltaX, self.changeMenuPos())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -36,12 +36,12 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
scrollContainer.removeEventListener("scroll", disableEvent);
|
scrollContainer.removeEventListener("scroll", disableEvent);
|
||||||
dragMode = 0;
|
dragMode = 0;
|
||||||
|
|
||||||
var touches = getTouches(e),
|
var touches = getTouches(e);
|
||||||
touch = touches[0] || {},
|
var touch = touches[0] || {};
|
||||||
endX = touch.clientX || 0,
|
var endX = touch.clientX || 0;
|
||||||
endY = touch.clientY || 0,
|
var endY = touch.clientY || 0;
|
||||||
deltaX = endX - (menuTouchStartX || 0),
|
var deltaX = endX - (menuTouchStartX || 0);
|
||||||
deltaY = endY - (menuTouchStartY || 0);
|
var deltaY = endY - (menuTouchStartY || 0);
|
||||||
|
|
||||||
currentPos = deltaX;
|
currentPos = deltaX;
|
||||||
self.checkMenuState(deltaX, deltaY);
|
self.checkMenuState(deltaX, deltaY);
|
||||||
|
|
@ -78,15 +78,15 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
}
|
}
|
||||||
|
|
||||||
function onBackgroundTouchStart(e) {
|
function onBackgroundTouchStart(e) {
|
||||||
var touches = getTouches(e),
|
var touches = getTouches(e);
|
||||||
touch = touches[0] || {};
|
var touch = touches[0] || {};
|
||||||
backgroundTouchStartX = touch.clientX, backgroundTouchStartTime = (new Date).getTime()
|
backgroundTouchStartX = touch.clientX, backgroundTouchStartTime = (new Date).getTime()
|
||||||
}
|
}
|
||||||
|
|
||||||
function onBackgroundTouchMove(e) {
|
function onBackgroundTouchMove(e) {
|
||||||
var touches = getTouches(e),
|
var touches = getTouches(e);
|
||||||
touch = touches[0] || {},
|
var touch = touches[0] || {};
|
||||||
endX = touch.clientX || 0;
|
var endX = touch.clientX || 0;
|
||||||
if (endX <= options.width && self.isVisible) {
|
if (endX <= options.width && self.isVisible) {
|
||||||
countStart++;
|
countStart++;
|
||||||
var deltaX = endX - (backgroundTouchStartX || 0);
|
var deltaX = endX - (backgroundTouchStartX || 0);
|
||||||
|
|
@ -100,10 +100,10 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
}
|
}
|
||||||
|
|
||||||
function onBackgroundTouchEnd(e) {
|
function onBackgroundTouchEnd(e) {
|
||||||
var touches = getTouches(e),
|
var touches = getTouches(e);
|
||||||
touch = touches[0] || {},
|
var touch = touches[0] || {};
|
||||||
endX = touch.clientX || 0,
|
var endX = touch.clientX || 0;
|
||||||
deltaX = endX - (backgroundTouchStartX || 0);
|
var deltaX = endX - (backgroundTouchStartX || 0);
|
||||||
self.checkMenuState(deltaX), countStart = 0
|
self.checkMenuState(deltaX), countStart = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -111,21 +111,24 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
var classList = mask.classList;
|
var classList = mask.classList;
|
||||||
classList.contains("backdrop") || classList.add("hide")
|
classList.contains("backdrop") || classList.add("hide")
|
||||||
}
|
}
|
||||||
var self, defaults, mask, newPos = 0,
|
var self;
|
||||||
currentPos = 0,
|
var defaults;
|
||||||
startPoint = 0,
|
var mask;
|
||||||
countStart = 0,
|
var newPos = 0;
|
||||||
velocity = 0;
|
var currentPos = 0;
|
||||||
|
var startPoint = 0;
|
||||||
|
var countStart = 0;
|
||||||
|
var velocity = 0;
|
||||||
options.target.classList.add("transition");
|
options.target.classList.add("transition");
|
||||||
var dragMode = 0,
|
var dragMode = 0;
|
||||||
scrollContainer = options.target.querySelector(".mainDrawer-scrollContainer");
|
var scrollContainer = options.target.querySelector(".mainDrawer-scrollContainer");
|
||||||
scrollContainer.classList.add("scrollY");
|
scrollContainer.classList.add("scrollY");
|
||||||
var TouchMenuLA = function() {
|
var TouchMenuLA = function() {
|
||||||
self = this, defaults = {
|
self = this, defaults = {
|
||||||
width: 260,
|
width: 260,
|
||||||
handleSize: 10,
|
handleSize: 10,
|
||||||
disableMask: !1,
|
disableMask: !1,
|
||||||
maxMaskOpacity: .5
|
maxMaskOpacity: 0.5
|
||||||
}, this.isVisible = !1, this.initialize()
|
}, this.isVisible = !1, this.initialize()
|
||||||
};
|
};
|
||||||
TouchMenuLA.prototype.initElements = function() {
|
TouchMenuLA.prototype.initElements = function() {
|
||||||
|
|
@ -133,8 +136,11 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
passive: !0
|
passive: !0
|
||||||
}))
|
}))
|
||||||
};
|
};
|
||||||
var menuTouchStartX, menuTouchStartY, menuTouchStartTime, edgeContainer = document.querySelector(".mainDrawerHandle"),
|
var menuTouchStartX;
|
||||||
isPeeking = !1;
|
var menuTouchStartY;
|
||||||
|
var menuTouchStartTime;
|
||||||
|
var edgeContainer = document.querySelector(".mainDrawerHandle");
|
||||||
|
var isPeeking = false;
|
||||||
TouchMenuLA.prototype.animateToPosition = function(pos) {
|
TouchMenuLA.prototype.animateToPosition = function(pos) {
|
||||||
requestAnimationFrame(function() {
|
requestAnimationFrame(function() {
|
||||||
options.target.style.transform = pos ? "translateX(" + pos + "px)" : "none"
|
options.target.style.transform = pos ? "translateX(" + pos + "px)" : "none"
|
||||||
|
|
@ -146,7 +152,7 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
self.close()
|
self.close()
|
||||||
})
|
})
|
||||||
}, TouchMenuLA.prototype.checkMenuState = function(deltaX, deltaY) {
|
}, TouchMenuLA.prototype.checkMenuState = function(deltaX, deltaY) {
|
||||||
velocity >= .4 ? deltaX >= 0 || Math.abs(deltaY || 0) >= 70 ? self.open() : self.close() : newPos >= 100 ? self.open() : newPos && self.close()
|
velocity >= 0.4 ? deltaX >= 0 || Math.abs(deltaY || 0) >= 70 ? self.open() : self.close() : newPos >= 100 ? self.open() : newPos && self.close()
|
||||||
}, TouchMenuLA.prototype.open = function() {
|
}, TouchMenuLA.prototype.open = function() {
|
||||||
this.animateToPosition(options.width), currentPos = options.width, this.isVisible = !0, options.target.classList.add("drawer-open"), self.showMask(), self.invoke(options.onChange)
|
this.animateToPosition(options.width), currentPos = options.width, this.isVisible = !0, options.target.classList.add("drawer-open"), self.showMask(), self.invoke(options.onChange)
|
||||||
}, TouchMenuLA.prototype.close = function() {
|
}, TouchMenuLA.prototype.close = function() {
|
||||||
|
|
@ -154,7 +160,8 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
|
||||||
}, TouchMenuLA.prototype.toggle = function() {
|
}, TouchMenuLA.prototype.toggle = function() {
|
||||||
self.isVisible ? self.close() : self.open()
|
self.isVisible ? self.close() : self.open()
|
||||||
};
|
};
|
||||||
var backgroundTouchStartX, backgroundTouchStartTime;
|
var backgroundTouchStartX;
|
||||||
|
var backgroundTouchStartTime;
|
||||||
TouchMenuLA.prototype.showMask = function() {
|
TouchMenuLA.prototype.showMask = function() {
|
||||||
mask.classList.remove("hide"), mask.offsetWidth, mask.classList.add("backdrop")
|
mask.classList.remove("hide"), mask.offsetWidth, mask.classList.add("backdrop")
|
||||||
}, TouchMenuLA.prototype.hideMask = function() {
|
}, TouchMenuLA.prototype.hideMask = function() {
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
|
||||||
|
|
||||||
if (notification.close) {
|
if (notification.close) {
|
||||||
notification.close();
|
notification.close();
|
||||||
}
|
} else if (notification.cancel) {
|
||||||
else if (notification.cancel) {
|
|
||||||
notification.cancel();
|
notification.cancel();
|
||||||
}
|
}
|
||||||
}, timeoutMs);
|
}, timeoutMs);
|
||||||
|
|
@ -180,15 +179,12 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
|
||||||
if (status === 'completed') {
|
if (status === 'completed') {
|
||||||
notification.title = globalize.translate('PackageInstallCompleted').replace('{0}', installation.Name + ' ' + installation.Version);
|
notification.title = globalize.translate('PackageInstallCompleted').replace('{0}', installation.Name + ' ' + installation.Version);
|
||||||
notification.vibrate = true;
|
notification.vibrate = true;
|
||||||
}
|
} else if (status === 'cancelled') {
|
||||||
else if (status === 'cancelled') {
|
|
||||||
notification.title = globalize.translate('PackageInstallCancelled').replace('{0}', installation.Name + ' ' + installation.Version);
|
notification.title = globalize.translate('PackageInstallCancelled').replace('{0}', installation.Name + ' ' + installation.Version);
|
||||||
}
|
} else if (status === 'failed') {
|
||||||
else if (status === 'failed') {
|
|
||||||
notification.title = globalize.translate('PackageInstallFailed').replace('{0}', installation.Name + ' ' + installation.Version);
|
notification.title = globalize.translate('PackageInstallFailed').replace('{0}', installation.Name + ' ' + installation.Version);
|
||||||
notification.vibrate = true;
|
notification.vibrate = true;
|
||||||
}
|
} else if (status === 'progress') {
|
||||||
else if (status === 'progress') {
|
|
||||||
notification.title = globalize.translate('InstallingPackage').replace('{0}', installation.Name + ' ' + installation.Version);
|
notification.title = globalize.translate('InstallingPackage').replace('{0}', installation.Name + ' ' + installation.Version);
|
||||||
|
|
||||||
notification.actions =
|
notification.actions =
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
playPauseButtons = elem.querySelectorAll('.playPauseButton');
|
playPauseButtons = elem.querySelectorAll('.playPauseButton');
|
||||||
for (i = 0, length = playPauseButtons.length; i < length; i++) {
|
for (i = 0, length = playPauseButtons.length; i < length; i++) {
|
||||||
playPauseButtons[i].addEventListener('click', onPlayPauseClick);
|
playPauseButtons[i].addEventListener('click', onPlayPauseClick);
|
||||||
|
|
@ -195,7 +196,6 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
volumeSlider.addEventListener('mousemove', setVolume);
|
volumeSlider.addEventListener('mousemove', setVolume);
|
||||||
volumeSlider.addEventListener('touchmove', setVolume);
|
volumeSlider.addEventListener('touchmove', setVolume);
|
||||||
|
|
||||||
|
|
||||||
positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
|
positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
|
||||||
positionSlider.addEventListener('change', function () {
|
positionSlider.addEventListener('change', function () {
|
||||||
|
|
||||||
|
|
@ -282,8 +282,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
}
|
}
|
||||||
|
|
||||||
function updatePlayPauseState(isPaused) {
|
function updatePlayPauseState(isPaused) {
|
||||||
|
var i;
|
||||||
var i, length;
|
var length;
|
||||||
|
|
||||||
if (playPauseButtons) {
|
if (playPauseButtons) {
|
||||||
if (isPaused) {
|
if (isPaused) {
|
||||||
|
|
@ -345,8 +345,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
|
||||||
if (repeatMode === 'RepeatAll') {
|
if (repeatMode === 'RepeatAll') {
|
||||||
toggleRepeatButtonIcon.innerHTML = "repeat";
|
toggleRepeatButtonIcon.innerHTML = "repeat";
|
||||||
toggleRepeatButton.classList.add('repeatButton-active');
|
toggleRepeatButton.classList.add('repeatButton-active');
|
||||||
}
|
} else if (repeatMode === 'RepeatOne') {
|
||||||
else if (repeatMode === 'RepeatOne') {
|
|
||||||
toggleRepeatButtonIcon.innerHTML = "repeat_one";
|
toggleRepeatButtonIcon.innerHTML = "repeat_one";
|
||||||
toggleRepeatButton.classList.add('repeatButton-active');
|
toggleRepeatButton.classList.add('repeatButton-active');
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -48,9 +48,7 @@ define([], function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
timeout = setTimeout(testAutoplay, 500);
|
timeout = setTimeout(testAutoplay, 500);
|
||||||
}
|
} catch (e) {
|
||||||
|
|
||||||
catch (e) {
|
|
||||||
reject();
|
reject();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -103,8 +103,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
|
||||||
if (iconElement) {
|
if (iconElement) {
|
||||||
if (brightness >= 80) {
|
if (brightness >= 80) {
|
||||||
iconElement.innerHTML = 'brightness_high';
|
iconElement.innerHTML = 'brightness_high';
|
||||||
}
|
} else if (brightness >= 20) {
|
||||||
else if (brightness >= 20) {
|
|
||||||
iconElement.innerHTML = 'brightness_medium';
|
iconElement.innerHTML = 'brightness_medium';
|
||||||
} else {
|
} else {
|
||||||
iconElement.innerHTML = 'brightness_low';
|
iconElement.innerHTML = 'brightness_low';
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,7 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
|
||||||
|
|
||||||
lastUpdateTime = now;
|
lastUpdateTime = now;
|
||||||
|
|
||||||
if (navigator.mediaSession){
|
if (navigator.mediaSession) {
|
||||||
navigator.mediaSession.metadata = new MediaMetadata({
|
navigator.mediaSession.metadata = new MediaMetadata({
|
||||||
title: title,
|
title: title,
|
||||||
artist: artist,
|
artist: artist,
|
||||||
|
|
@ -278,7 +278,6 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
|
||||||
}
|
}
|
||||||
if (navigator.mediaSession) {
|
if (navigator.mediaSession) {
|
||||||
|
|
||||||
|
|
||||||
navigator.mediaSession.setActionHandler('previoustrack', function () {
|
navigator.mediaSession.setActionHandler('previoustrack', function () {
|
||||||
execute('previousTrack');
|
execute('previousTrack');
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,7 @@ define([], function () {
|
||||||
} else if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
|
} else if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
|
||||||
|
|
||||||
bottomText = nowPlayingItem.Artists.join(', ');
|
bottomText = nowPlayingItem.Artists.join(', ');
|
||||||
}
|
} else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
|
||||||
else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
|
|
||||||
bottomText = topText;
|
bottomText = topText;
|
||||||
topText = nowPlayingItem.SeriesName || nowPlayingItem.Album;
|
topText = nowPlayingItem.SeriesName || nowPlayingItem.Album;
|
||||||
|
|
||||||
|
|
@ -60,8 +59,7 @@ define([], function () {
|
||||||
} else {
|
} else {
|
||||||
topItem = null;
|
topItem = null;
|
||||||
}
|
}
|
||||||
}
|
} else if (nowPlayingItem.ProductionYear && includeNonNameInfo !== false) {
|
||||||
else if (nowPlayingItem.ProductionYear && includeNonNameInfo !== false) {
|
|
||||||
bottomText = nowPlayingItem.ProductionYear;
|
bottomText = nowPlayingItem.ProductionYear;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,8 +107,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
TotalRecordCount: 1
|
TotalRecordCount: 1
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
query.Limit = query.Limit || 300;
|
query.Limit = query.Limit || 300;
|
||||||
query.Fields = "Chapters";
|
query.Fields = "Chapters";
|
||||||
|
|
@ -182,8 +181,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
if (container === 'm4a') {
|
if (container === 'm4a') {
|
||||||
return 'audio/mp4';
|
return 'audio/mp4';
|
||||||
}
|
}
|
||||||
}
|
} else if (type === 'video') {
|
||||||
else if (type === 'video') {
|
|
||||||
if (container === 'mkv') {
|
if (container === 'mkv') {
|
||||||
return 'video/x-matroska';
|
return 'video/x-matroska';
|
||||||
}
|
}
|
||||||
|
|
@ -212,8 +210,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
var results = regex.exec(url);
|
var results = regex.exec(url);
|
||||||
if (results == null) {
|
if (results == null) {
|
||||||
return "";
|
return "";
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return decodeURIComponent(results[1].replace(/\+/g, " "));
|
return decodeURIComponent(results[1].replace(/\+/g, " "));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -649,13 +646,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
// If this is the only way it can be played, then allow it
|
// If this is the only way it can be played, then allow it
|
||||||
if (!mediaSource.SupportsDirectStream && !mediaSource.SupportsTranscoding) {
|
if (!mediaSource.SupportsDirectStream && !mediaSource.SupportsTranscoding) {
|
||||||
return Promise.resolve(true);
|
return Promise.resolve(true);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return isHostReachable(mediaSource, apiClient);
|
return isHostReachable(mediaSource, apiClient);
|
||||||
}
|
}
|
||||||
}
|
} else if (mediaSource.Protocol === 'File') {
|
||||||
|
|
||||||
else if (mediaSource.Protocol === 'File') {
|
|
||||||
|
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise(function (resolve, reject) {
|
||||||
|
|
||||||
|
|
@ -1272,7 +1266,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
|
|
||||||
var currentMediaSource = self.currentMediaSource(player);
|
var currentMediaSource = self.currentMediaSource(player);
|
||||||
var mediaStreams = [];
|
var mediaStreams = [];
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
|
for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
|
||||||
if (currentMediaSource.MediaStreams[i].Type === 'Audio') {
|
if (currentMediaSource.MediaStreams[i].Type === 'Audio') {
|
||||||
mediaStreams.push(currentMediaSource.MediaStreams[i]);
|
mediaStreams.push(currentMediaSource.MediaStreams[i]);
|
||||||
|
|
@ -1316,7 +1311,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
|
|
||||||
var currentMediaSource = self.currentMediaSource(player);
|
var currentMediaSource = self.currentMediaSource(player);
|
||||||
var mediaStreams = [];
|
var mediaStreams = [];
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
|
for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
|
||||||
if (currentMediaSource.MediaStreams[i].Type === 'Subtitle') {
|
if (currentMediaSource.MediaStreams[i].Type === 'Subtitle') {
|
||||||
mediaStreams.push(currentMediaSource.MediaStreams[i]);
|
mediaStreams.push(currentMediaSource.MediaStreams[i]);
|
||||||
|
|
@ -1360,7 +1356,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
function isAudioStreamSupported(mediaSource, index, deviceProfile) {
|
function isAudioStreamSupported(mediaSource, index, deviceProfile) {
|
||||||
|
|
||||||
var mediaStream;
|
var mediaStream;
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
var mediaStreams = mediaSource.MediaStreams;
|
var mediaStreams = mediaSource.MediaStreams;
|
||||||
|
|
||||||
for (i = 0, length = mediaStreams.length; i < length; i++) {
|
for (i = 0, length = mediaStreams.length; i < length; i++) {
|
||||||
|
|
@ -1423,8 +1420,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
if (isAudioStreamSupported(self.currentMediaSource(player), index, profile)) {
|
if (isAudioStreamSupported(self.currentMediaSource(player), index, profile)) {
|
||||||
player.setAudioStreamIndex(index);
|
player.setAudioStreamIndex(index);
|
||||||
getPlayerData(player).audioStreamIndex = index;
|
getPlayerData(player).audioStreamIndex = index;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
changeStream(player, getCurrentTicks(player), { AudioStreamIndex: index });
|
changeStream(player, getCurrentTicks(player), { AudioStreamIndex: index });
|
||||||
getPlayerData(player).audioStreamIndex = index;
|
getPlayerData(player).audioStreamIndex = index;
|
||||||
}
|
}
|
||||||
|
|
@ -1595,8 +1591,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
// Need to change the transcoded stream to remove subs
|
// Need to change the transcoded stream to remove subs
|
||||||
changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: -1 });
|
changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: -1 });
|
||||||
}
|
}
|
||||||
}
|
} else if (!currentStream && newStream) {
|
||||||
else if (!currentStream && newStream) {
|
|
||||||
|
|
||||||
if (getDeliveryMethod(newStream) === 'External') {
|
if (getDeliveryMethod(newStream) === 'External') {
|
||||||
selectedTrackElementIndex = index;
|
selectedTrackElementIndex = index;
|
||||||
|
|
@ -1607,8 +1602,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
// Need to change the transcoded stream to add subs
|
// Need to change the transcoded stream to add subs
|
||||||
changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: index });
|
changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: index });
|
||||||
}
|
}
|
||||||
}
|
} else if (currentStream && newStream) {
|
||||||
else if (currentStream && newStream) {
|
|
||||||
|
|
||||||
// Switching tracks
|
// Switching tracks
|
||||||
// We can handle this clientside if the new track is external or the new track is embedded and we're not transcoding
|
// We can handle this clientside if the new track is external or the new track is embedded and we're not transcoding
|
||||||
|
|
@ -1645,7 +1639,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
player = player || self._currentPlayer;
|
player = player || self._currentPlayer;
|
||||||
if (player.disableShowingSubtitleOffset) {
|
if (player.disableShowingSubtitleOffset) {
|
||||||
player.disableShowingSubtitleOffset();
|
player.disableShowingSubtitleOffset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
self.isShowingSubtitleOffsetEnabled = function(player) {
|
self.isShowingSubtitleOffsetEnabled = function(player) {
|
||||||
|
|
@ -1674,7 +1668,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
|
|
||||||
self.canHandleOffsetOnCurrentSubtitle = function(player) {
|
self.canHandleOffsetOnCurrentSubtitle = function(player) {
|
||||||
var index = self.getSubtitleStreamIndex(player);
|
var index = self.getSubtitleStreamIndex(player);
|
||||||
return index !== -1 && self.isSubtitleStreamExternal(index, player);
|
return index !== -1 && self.isSubtitleStreamExternal(index, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.seek = function (ticks, player) {
|
self.seek = function (ticks, player) {
|
||||||
|
|
@ -1865,17 +1859,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
if (firstItem.Type === "Program") {
|
if (firstItem.Type === "Program") {
|
||||||
|
|
||||||
promise = getItemsForPlayback(serverId, {
|
promise = getItemsForPlayback(serverId, {
|
||||||
Ids: firstItem.ChannelId,
|
Ids: firstItem.ChannelId
|
||||||
});
|
});
|
||||||
}
|
} else if (firstItem.Type === "Playlist") {
|
||||||
else if (firstItem.Type === "Playlist") {
|
|
||||||
|
|
||||||
promise = getItemsForPlayback(serverId, {
|
promise = getItemsForPlayback(serverId, {
|
||||||
ParentId: firstItem.Id,
|
ParentId: firstItem.Id,
|
||||||
SortBy: options.shuffle ? 'Random' : null
|
SortBy: options.shuffle ? 'Random' : null
|
||||||
});
|
});
|
||||||
}
|
} else if (firstItem.Type === "MusicArtist") {
|
||||||
else if (firstItem.Type === "MusicArtist") {
|
|
||||||
|
|
||||||
promise = getItemsForPlayback(serverId, {
|
promise = getItemsForPlayback(serverId, {
|
||||||
ArtistIds: firstItem.Id,
|
ArtistIds: firstItem.Id,
|
||||||
|
|
@ -1885,8 +1877,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
MediaTypes: "Audio"
|
MediaTypes: "Audio"
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
} else if (firstItem.MediaType === "Photo") {
|
||||||
else if (firstItem.MediaType === "Photo") {
|
|
||||||
|
|
||||||
promise = getItemsForPlayback(serverId, {
|
promise = getItemsForPlayback(serverId, {
|
||||||
ParentId: firstItem.ParentId,
|
ParentId: firstItem.ParentId,
|
||||||
|
|
@ -1915,8 +1906,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
return Promise.resolve(result);
|
return Promise.resolve(result);
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
} else if (firstItem.Type === "PhotoAlbum") {
|
||||||
else if (firstItem.Type === "PhotoAlbum") {
|
|
||||||
|
|
||||||
promise = getItemsForPlayback(serverId, {
|
promise = getItemsForPlayback(serverId, {
|
||||||
ParentId: firstItem.Id,
|
ParentId: firstItem.Id,
|
||||||
|
|
@ -1928,8 +1918,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
Limit: 1000
|
Limit: 1000
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
} else if (firstItem.Type === "MusicGenre") {
|
||||||
else if (firstItem.Type === "MusicGenre") {
|
|
||||||
|
|
||||||
promise = getItemsForPlayback(serverId, {
|
promise = getItemsForPlayback(serverId, {
|
||||||
GenreIds: firstItem.Id,
|
GenreIds: firstItem.Id,
|
||||||
|
|
@ -1938,8 +1927,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
SortBy: options.shuffle ? 'Random' : 'SortName',
|
SortBy: options.shuffle ? 'Random' : 'SortName',
|
||||||
MediaTypes: "Audio"
|
MediaTypes: "Audio"
|
||||||
});
|
});
|
||||||
}
|
} else if (firstItem.IsFolder) {
|
||||||
else if (firstItem.IsFolder) {
|
|
||||||
|
|
||||||
promise = getItemsForPlayback(serverId, mergePlaybackQueries({
|
promise = getItemsForPlayback(serverId, mergePlaybackQueries({
|
||||||
|
|
||||||
|
|
@ -1951,8 +1939,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
MediaTypes: "Audio,Video"
|
MediaTypes: "Audio,Video"
|
||||||
|
|
||||||
}, queryOptions));
|
}, queryOptions));
|
||||||
}
|
} else if (firstItem.Type === "Episode" && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
|
||||||
else if (firstItem.Type === "Episode" && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
|
|
||||||
|
|
||||||
promise = new Promise(function (resolve, reject) {
|
promise = new Promise(function (resolve, reject) {
|
||||||
var apiClient = connectionManager.getApiClient(firstItem.ServerId);
|
var apiClient = connectionManager.getApiClient(firstItem.ServerId);
|
||||||
|
|
@ -2537,16 +2524,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
|
|
||||||
playMethod = 'DirectPlay';
|
playMethod = 'DirectPlay';
|
||||||
|
|
||||||
}
|
} else if (mediaSource.StreamUrl) {
|
||||||
|
|
||||||
else if (mediaSource.StreamUrl) {
|
|
||||||
|
|
||||||
// Only used for audio
|
// Only used for audio
|
||||||
playMethod = 'Transcode';
|
playMethod = 'Transcode';
|
||||||
mediaUrl = mediaSource.StreamUrl;
|
mediaUrl = mediaSource.StreamUrl;
|
||||||
}
|
} else if (mediaSource.SupportsDirectStream) {
|
||||||
|
|
||||||
else if (mediaSource.SupportsDirectStream) {
|
|
||||||
|
|
||||||
directOptions = {
|
directOptions = {
|
||||||
Static: true,
|
Static: true,
|
||||||
|
|
@ -2706,9 +2689,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
return p.canPlayItem(item, playOptions);
|
return p.canPlayItem(item, playOptions);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
} else if (item.Url && p.canPlayUrl) {
|
||||||
|
|
||||||
else if (item.Url && p.canPlayUrl) {
|
|
||||||
return p.canPlayUrl(item.Url);
|
return p.canPlayUrl(item.Url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -3222,8 +3203,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
|
||||||
|
|
||||||
if (displayErrorCode && typeof (displayErrorCode) === 'string') {
|
if (displayErrorCode && typeof (displayErrorCode) === 'string') {
|
||||||
showPlaybackInfoErrorMessage(self, displayErrorCode, nextItem);
|
showPlaybackInfoErrorMessage(self, displayErrorCode, nextItem);
|
||||||
}
|
} else if (nextItem) {
|
||||||
else if (nextItem) {
|
|
||||||
self.nextTrack();
|
self.nextTrack();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,7 @@ define(['playbackManager', 'layoutManager', 'events'], function (playbackManager
|
||||||
// returns a boolean
|
// returns a boolean
|
||||||
orientationLocked = promise;
|
orientationLocked = promise;
|
||||||
}
|
}
|
||||||
}
|
} catch (err) {
|
||||||
catch (err) {
|
|
||||||
onOrientationChangeError(err);
|
onOrientationChangeError(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -46,8 +45,7 @@ define(['playbackManager', 'layoutManager', 'events'], function (playbackManager
|
||||||
if (unlockOrientation) {
|
if (unlockOrientation) {
|
||||||
try {
|
try {
|
||||||
unlockOrientation();
|
unlockOrientation();
|
||||||
}
|
} catch (err) {
|
||||||
catch (err) {
|
|
||||||
console.log('error unlocking orientation: ' + err);
|
console.log('error unlocking orientation: ' + err);
|
||||||
}
|
}
|
||||||
orientationLocked = false;
|
orientationLocked = false;
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,6 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function disconnectFromPlayer(currentDeviceName) {
|
function disconnectFromPlayer(currentDeviceName) {
|
||||||
|
|
||||||
if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
|
if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
|
||||||
|
|
@ -193,7 +192,6 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
playbackManager.setDefaultPlayerActive();
|
playbackManager.setDefaultPlayerActive();
|
||||||
|
|
@ -275,8 +273,7 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
|
||||||
dialogHelper.open(dlg).then(function () {
|
dialogHelper.open(dlg).then(function () {
|
||||||
if (destination === 'nowplaying') {
|
if (destination === 'nowplaying') {
|
||||||
appRouter.showNowPlaying();
|
appRouter.showNowPlaying();
|
||||||
}
|
} else if (destination === 'disconnectFromPlayer') {
|
||||||
else if (destination === 'disconnectFromPlayer') {
|
|
||||||
disconnectFromPlayer(currentDeviceName);
|
disconnectFromPlayer(currentDeviceName);
|
||||||
}
|
}
|
||||||
}, emptyCallback);
|
}, emptyCallback);
|
||||||
|
|
|
||||||
|
|
@ -9,14 +9,11 @@ define([], function () {
|
||||||
|
|
||||||
if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) {
|
if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) {
|
||||||
return 'DirectStream';
|
return 'DirectStream';
|
||||||
}
|
} else if (session.PlayState.PlayMethod === 'Transcode') {
|
||||||
else if (session.PlayState.PlayMethod === 'Transcode') {
|
|
||||||
return 'Transcode';
|
return 'Transcode';
|
||||||
}
|
} else if (session.PlayState.PlayMethod === 'DirectStream') {
|
||||||
else if (session.PlayState.PlayMethod === 'DirectStream') {
|
|
||||||
return 'DirectPlay';
|
return 'DirectPlay';
|
||||||
}
|
} else if (session.PlayState.PlayMethod === 'DirectPlay') {
|
||||||
else if (session.PlayState.PlayMethod === 'DirectPlay') {
|
|
||||||
return 'DirectPlay';
|
return 'DirectPlay';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,15 +58,15 @@ define([], function () {
|
||||||
|
|
||||||
function arrayInsertAt(destArray, pos, arrayToInsert) {
|
function arrayInsertAt(destArray, pos, arrayToInsert) {
|
||||||
var args = [];
|
var args = [];
|
||||||
args.push(pos); // where to insert
|
args.push(pos); // where to insert
|
||||||
args.push(0); // nothing to remove
|
args.push(0); // nothing to remove
|
||||||
args = args.concat(arrayToInsert); // add on array to insert
|
args = args.concat(arrayToInsert); // add on array to insert
|
||||||
destArray.splice.apply(destArray, args); // splice it in
|
destArray.splice.apply(destArray, args); // splice it in
|
||||||
}
|
}
|
||||||
|
|
||||||
PlayQueueManager.prototype.queueNext = function (items) {
|
PlayQueueManager.prototype.queueNext = function (items) {
|
||||||
|
var i;
|
||||||
var i, length;
|
var length;
|
||||||
|
|
||||||
for (i = 0, length = items.length; i < length; i++) {
|
for (i = 0, length = items.length; i < length; i++) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -364,8 +364,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'playMeth
|
||||||
var category = playerStats[i];
|
var category = playerStats[i];
|
||||||
if (category.type === 'audio') {
|
if (category.type === 'audio') {
|
||||||
category.name = 'Audio Info';
|
category.name = 'Audio Info';
|
||||||
}
|
} else if (category.type === 'video') {
|
||||||
else if (category.type === 'video') {
|
|
||||||
category.name = 'Video Info';
|
category.name = 'Video Info';
|
||||||
}
|
}
|
||||||
categories.push(category);
|
categories.push(category);
|
||||||
|
|
|
||||||
|
|
@ -46,16 +46,13 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
|
||||||
|
|
||||||
if (item.Type === 'SeriesTimer') {
|
if (item.Type === 'SeriesTimer') {
|
||||||
return 'fiber_smart_record';
|
return 'fiber_smart_record';
|
||||||
}
|
} else if (item.TimerId || item.SeriesTimerId) {
|
||||||
else if (item.TimerId || item.SeriesTimerId) {
|
|
||||||
|
|
||||||
status = item.Status || 'Cancelled';
|
status = item.Status || 'Cancelled';
|
||||||
}
|
} else if (item.Type === 'Timer') {
|
||||||
else if (item.Type === 'Timer') {
|
|
||||||
|
|
||||||
status = item.Status;
|
status = item.Status;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return 'fiber_manual_record';
|
return 'fiber_manual_record';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,8 +40,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
|
||||||
maxHeight: imageHeight,
|
maxHeight: imageHeight,
|
||||||
tag: item.ImageTags.Primary
|
tag: item.ImageTags.Primary
|
||||||
});
|
});
|
||||||
}
|
} else if (imageTags.Thumb) {
|
||||||
else if (imageTags.Thumb) {
|
|
||||||
|
|
||||||
return apiClient.getScaledImageUrl(item.Id, {
|
return apiClient.getScaledImageUrl(item.Id, {
|
||||||
type: "Thumb",
|
type: "Thumb",
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
|
||||||
currentResolve = resolve;
|
currentResolve = resolve;
|
||||||
|
|
||||||
require(['text!./recordingeditor.template.html'], function (template) {
|
require(['text!./recordingeditor.template.html'], function (template) {
|
||||||
|
|
||||||
var dialogOptions = {
|
var dialogOptions = {
|
||||||
removeOnClose: true,
|
removeOnClose: true,
|
||||||
scrollY: false
|
scrollY: false
|
||||||
|
|
@ -103,7 +102,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
|
||||||
|
|
||||||
if (layoutManager.tv) {
|
if (layoutManager.tv) {
|
||||||
dialogOptions.size = 'fullscreen';
|
dialogOptions.size = 'fullscreen';
|
||||||
} else {
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var dlg = dialogHelper.createDialog(dialogOptions);
|
var dlg = dialogHelper.createDialog(dialogOptions);
|
||||||
|
|
|
||||||
|
|
@ -166,8 +166,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
|
||||||
loading.show();
|
loading.show();
|
||||||
|
|
||||||
cancelTimer(apiClient, timerId, true).then(resolve, reject);
|
cancelTimer(apiClient, timerId, true).then(resolve, reject);
|
||||||
}
|
} else if (result === 'cancelseriestimer') {
|
||||||
else if (result === 'cancelseriestimer') {
|
|
||||||
|
|
||||||
loading.show();
|
loading.show();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
|
||||||
|
|
||||||
context.querySelector('.selectKeepUpTo').innerHTML = html;
|
context.querySelector('.selectKeepUpTo').innerHTML = html;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onFieldChange(e) {
|
function onFieldChange(e) {
|
||||||
this.querySelector('.btnSubmit').click();
|
this.querySelector('.btnSubmit').click();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -179,15 +179,15 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
|
||||||
if (player) {
|
if (player) {
|
||||||
switch (playbackManager.getRepeatMode(player)) {
|
switch (playbackManager.getRepeatMode(player)) {
|
||||||
case "RepeatNone":
|
case "RepeatNone":
|
||||||
playbackManager.setRepeatMode("RepeatAll", player);
|
playbackManager.setRepeatMode("RepeatAll", player);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "RepeatAll":
|
case "RepeatAll":
|
||||||
playbackManager.setRepeatMode("RepeatOne", player);
|
playbackManager.setRepeatMode("RepeatOne", player);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "RepeatOne":
|
case "RepeatOne":
|
||||||
playbackManager.setRepeatMode("RepeatNone", player);
|
playbackManager.setRepeatMode("RepeatNone", player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,18 +34,14 @@ define([], function () {
|
||||||
// when parsing previous hi-surrogate, 3 is added to byteLength
|
// when parsing previous hi-surrogate, 3 is added to byteLength
|
||||||
if (prevCodePoint != null && isHighSurrogate(prevCodePoint)) {
|
if (prevCodePoint != null && isHighSurrogate(prevCodePoint)) {
|
||||||
byteLength += 1;
|
byteLength += 1;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
byteLength += 3;
|
byteLength += 3;
|
||||||
}
|
}
|
||||||
}
|
} else if (codePoint <= 0x7f) {
|
||||||
else if (codePoint <= 0x7f) {
|
|
||||||
byteLength += 1;
|
byteLength += 1;
|
||||||
}
|
} else if (codePoint >= 0x80 && codePoint <= 0x7ff) {
|
||||||
else if (codePoint >= 0x80 && codePoint <= 0x7ff) {
|
|
||||||
byteLength += 2;
|
byteLength += 2;
|
||||||
}
|
} else if (codePoint >= 0x800 && codePoint <= 0xffff) {
|
||||||
else if (codePoint >= 0x800 && codePoint <= 0xffff) {
|
|
||||||
byteLength += 3;
|
byteLength += 3;
|
||||||
}
|
}
|
||||||
prevCodePoint = codePoint;
|
prevCodePoint = codePoint;
|
||||||
|
|
@ -77,8 +73,7 @@ define([], function () {
|
||||||
|
|
||||||
if (curByteLength === byteLength) {
|
if (curByteLength === byteLength) {
|
||||||
return string.slice(0, i + 1);
|
return string.slice(0, i + 1);
|
||||||
}
|
} else if (curByteLength > byteLength) {
|
||||||
else if (curByteLength > byteLength) {
|
|
||||||
return string.slice(0, i - segment.length + 1);
|
return string.slice(0, i - segment.length + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -89,11 +84,11 @@ define([], function () {
|
||||||
return {
|
return {
|
||||||
sanitize: function (input, replacement) {
|
sanitize: function (input, replacement) {
|
||||||
var sanitized = input
|
var sanitized = input
|
||||||
.replace(illegalRe, replacement)
|
.replace(illegalRe, replacement)
|
||||||
.replace(controlRe, replacement)
|
.replace(controlRe, replacement)
|
||||||
.replace(reservedRe, replacement)
|
.replace(reservedRe, replacement)
|
||||||
.replace(windowsReservedRe, replacement)
|
.replace(windowsReservedRe, replacement)
|
||||||
.replace(windowsTrailingRe, replacement);
|
.replace(windowsTrailingRe, replacement);
|
||||||
return truncate(sanitized, 255);
|
return truncate(sanitized, 255);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
|
||||||
intervactive: null, // Selector for special interactive elements.
|
intervactive: null, // Selector for special interactive elements.
|
||||||
|
|
||||||
// Mixed options
|
// Mixed options
|
||||||
speed: 0, // Animations speed in milliseconds. 0 to disable animations.
|
speed: 0 // Animations speed in milliseconds. 0 to disable animations.
|
||||||
|
|
||||||
}, options);
|
}, options);
|
||||||
|
|
||||||
|
|
@ -93,17 +93,14 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
|
||||||
// in cases with firefox, if the smooth scroll api is supported then use that because their implementation is very good
|
// in cases with firefox, if the smooth scroll api is supported then use that because their implementation is very good
|
||||||
if (options.allowNativeScroll === false) {
|
if (options.allowNativeScroll === false) {
|
||||||
options.enableNativeScroll = false;
|
options.enableNativeScroll = false;
|
||||||
}
|
} else if (isSmoothScrollSupported && ((browser.firefox && !layoutManager.tv) || options.allowNativeSmoothScroll)) {
|
||||||
else if (isSmoothScrollSupported && ((browser.firefox && !layoutManager.tv) || options.allowNativeSmoothScroll)) {
|
|
||||||
// native smooth scroll
|
// native smooth scroll
|
||||||
options.enableNativeScroll = true;
|
options.enableNativeScroll = true;
|
||||||
}
|
} else if (options.requireAnimation && (browser.animate || browser.supportsCssAnimation())) {
|
||||||
else if (options.requireAnimation && (browser.animate || browser.supportsCssAnimation())) {
|
|
||||||
|
|
||||||
// transform is the only way to guarantee animation
|
// transform is the only way to guarantee animation
|
||||||
options.enableNativeScroll = false;
|
options.enableNativeScroll = false;
|
||||||
}
|
} else if (!layoutManager.tv || !browser.animate) {
|
||||||
else if (!layoutManager.tv || !browser.animate) {
|
|
||||||
|
|
||||||
options.enableNativeScroll = true;
|
options.enableNativeScroll = true;
|
||||||
}
|
}
|
||||||
|
|
@ -211,7 +208,9 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
|
||||||
self.frameResizeObserver.observe(frame);
|
self.frameResizeObserver.observe(frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.reload = function () { load(); };
|
self.reload = function () {
|
||||||
|
load();
|
||||||
|
};
|
||||||
|
|
||||||
self.getScrollEventName = function () {
|
self.getScrollEventName = function () {
|
||||||
return transform ? 'scrollanimate' : 'scroll';
|
return transform ? 'scrollanimate' : 'scroll';
|
||||||
|
|
@ -227,7 +226,6 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
|
||||||
|
|
||||||
function nativeScrollTo(container, pos, immediate) {
|
function nativeScrollTo(container, pos, immediate) {
|
||||||
|
|
||||||
|
|
||||||
if (container.scroll) {
|
if (container.scroll) {
|
||||||
if (o.horizontal) {
|
if (o.horizontal) {
|
||||||
|
|
||||||
|
|
@ -242,8 +240,7 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
|
||||||
behavior: immediate ? 'instant' : 'smooth'
|
behavior: immediate ? 'instant' : 'smooth'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
} else if (!immediate && container.scrollTo) {
|
||||||
else if (!immediate && container.scrollTo) {
|
|
||||||
if (o.horizontal) {
|
if (o.horizontal) {
|
||||||
container.scrollTo(Math.round(pos), 0);
|
container.scrollTo(Math.round(pos), 0);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,7 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
if (instance.options.collectionType === 'tvshows') {
|
if (instance.options.collectionType === 'tvshows') {
|
||||||
if (query.IncludeArtists) {
|
if (query.IncludeArtists) {
|
||||||
allowSearch = false;
|
allowSearch = false;
|
||||||
}
|
} else if (queryIncludeItemTypes === 'Movie' ||
|
||||||
else if (queryIncludeItemTypes === 'Movie' ||
|
|
||||||
queryIncludeItemTypes === 'LiveTvProgram' ||
|
queryIncludeItemTypes === 'LiveTvProgram' ||
|
||||||
queryIncludeItemTypes === 'MusicAlbum' ||
|
queryIncludeItemTypes === 'MusicAlbum' ||
|
||||||
queryIncludeItemTypes === 'Audio' ||
|
queryIncludeItemTypes === 'Audio' ||
|
||||||
|
|
@ -69,12 +68,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
query.MediaTypes === 'Photo') {
|
query.MediaTypes === 'Photo') {
|
||||||
allowSearch = false;
|
allowSearch = false;
|
||||||
}
|
}
|
||||||
}
|
} else if (instance.options.collectionType === 'movies') {
|
||||||
else if (instance.options.collectionType === 'movies') {
|
|
||||||
if (query.IncludeArtists) {
|
if (query.IncludeArtists) {
|
||||||
allowSearch = false;
|
allowSearch = false;
|
||||||
}
|
} else if (queryIncludeItemTypes === 'Series' ||
|
||||||
else if (queryIncludeItemTypes === 'Series' ||
|
|
||||||
queryIncludeItemTypes === 'Episode' ||
|
queryIncludeItemTypes === 'Episode' ||
|
||||||
queryIncludeItemTypes === 'LiveTvProgram' ||
|
queryIncludeItemTypes === 'LiveTvProgram' ||
|
||||||
queryIncludeItemTypes === 'MusicAlbum' ||
|
queryIncludeItemTypes === 'MusicAlbum' ||
|
||||||
|
|
@ -87,23 +84,19 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
query.MediaTypes === 'Photo') {
|
query.MediaTypes === 'Photo') {
|
||||||
allowSearch = false;
|
allowSearch = false;
|
||||||
}
|
}
|
||||||
}
|
} else if (instance.options.collectionType === 'music') {
|
||||||
else if (instance.options.collectionType === 'music') {
|
|
||||||
if (query.People) {
|
if (query.People) {
|
||||||
allowSearch = false;
|
allowSearch = false;
|
||||||
}
|
} else if (queryIncludeItemTypes === 'Series' ||
|
||||||
else if (queryIncludeItemTypes === 'Series' ||
|
|
||||||
queryIncludeItemTypes === 'Episode' ||
|
queryIncludeItemTypes === 'Episode' ||
|
||||||
queryIncludeItemTypes === 'LiveTvProgram' ||
|
queryIncludeItemTypes === 'LiveTvProgram' ||
|
||||||
queryIncludeItemTypes === 'Movie') {
|
queryIncludeItemTypes === 'Movie') {
|
||||||
allowSearch = false;
|
allowSearch = false;
|
||||||
}
|
}
|
||||||
}
|
} else if (instance.options.collectionType === 'livetv') {
|
||||||
else if (instance.options.collectionType === 'livetv') {
|
|
||||||
if (query.IncludeArtists || query.IncludePeople) {
|
if (query.IncludeArtists || query.IncludePeople) {
|
||||||
allowSearch = false;
|
allowSearch = false;
|
||||||
}
|
} else if (queryIncludeItemTypes === 'Series' ||
|
||||||
else if (queryIncludeItemTypes === 'Series' ||
|
|
||||||
queryIncludeItemTypes === 'Episode' ||
|
queryIncludeItemTypes === 'Episode' ||
|
||||||
queryIncludeItemTypes === 'MusicAlbum' ||
|
queryIncludeItemTypes === 'MusicAlbum' ||
|
||||||
queryIncludeItemTypes === 'Audio' ||
|
queryIncludeItemTypes === 'Audio' ||
|
||||||
|
|
@ -142,7 +135,7 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
} else if (query.IncludeArtists) {
|
} else if (query.IncludeArtists) {
|
||||||
methodName = 'getArtists';
|
methodName = 'getArtists';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return apiClient[methodName](apiClient.getCurrentUserId(), query);
|
return apiClient[methodName](apiClient.getCurrentUserId(), query);
|
||||||
|
|
@ -179,19 +172,19 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.movieResults', {
|
}, context, '.movieResults', {
|
||||||
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
inheritThumb: false,
|
inheritThumb: false,
|
||||||
shape: (enableScrollX() ? 'overflowPortrait' : 'portrait'),
|
shape: (enableScrollX() ? 'overflowPortrait' : 'portrait'),
|
||||||
showParentTitleOrTitle: true,
|
showParentTitleOrTitle: true,
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
overlayMoreButton: true,
|
overlayMoreButton: true,
|
||||||
showAirTime: true,
|
showAirTime: true,
|
||||||
showAirDateTime: true,
|
showAirDateTime: true,
|
||||||
showChannelName: true
|
showChannelName: true
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
|
|
@ -205,11 +198,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.movieResults', {
|
}, context, '.movieResults', {
|
||||||
|
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
showYear: true
|
showYear: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
|
|
@ -223,11 +216,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.seriesResults', {
|
}, context, '.seriesResults', {
|
||||||
|
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
showYear: true
|
showYear: true
|
||||||
});
|
});
|
||||||
|
|
||||||
if (instance.options.collectionType === 'livetv') {
|
if (instance.options.collectionType === 'livetv') {
|
||||||
|
|
||||||
|
|
@ -246,19 +239,19 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.episodeResults', {
|
}, context, '.episodeResults', {
|
||||||
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
inheritThumb: false,
|
inheritThumb: false,
|
||||||
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
||||||
showParentTitleOrTitle: true,
|
showParentTitleOrTitle: true,
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
overlayMoreButton: true,
|
overlayMoreButton: true,
|
||||||
showAirTime: true,
|
showAirTime: true,
|
||||||
showAirDateTime: true,
|
showAirDateTime: true,
|
||||||
showChannelName: true
|
showChannelName: true
|
||||||
});
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
|
@ -273,10 +266,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.episodeResults', {
|
}, context, '.episodeResults', {
|
||||||
|
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
showParentTitle: true
|
showParentTitle: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
|
|
@ -292,20 +285,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.sportsResults', {
|
}, context, '.sportsResults', {
|
||||||
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
inheritThumb: false,
|
inheritThumb: false,
|
||||||
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
||||||
showParentTitleOrTitle: true,
|
showParentTitleOrTitle: true,
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
overlayMoreButton: true,
|
overlayMoreButton: true,
|
||||||
showAirTime: true,
|
showAirTime: true,
|
||||||
showAirDateTime: true,
|
showAirDateTime: true,
|
||||||
showChannelName: true
|
showChannelName: true
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -320,20 +313,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.kidsResults', {
|
}, context, '.kidsResults', {
|
||||||
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
inheritThumb: false,
|
inheritThumb: false,
|
||||||
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
||||||
showParentTitleOrTitle: true,
|
showParentTitleOrTitle: true,
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
overlayMoreButton: true,
|
overlayMoreButton: true,
|
||||||
showAirTime: true,
|
showAirTime: true,
|
||||||
showAirDateTime: true,
|
showAirDateTime: true,
|
||||||
showChannelName: true
|
showChannelName: true
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -348,20 +341,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.newsResults', {
|
}, context, '.newsResults', {
|
||||||
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
inheritThumb: false,
|
inheritThumb: false,
|
||||||
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
||||||
showParentTitleOrTitle: true,
|
showParentTitleOrTitle: true,
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
overlayMoreButton: true,
|
overlayMoreButton: true,
|
||||||
showAirTime: true,
|
showAirTime: true,
|
||||||
showAirDateTime: true,
|
showAirDateTime: true,
|
||||||
showChannelName: true
|
showChannelName: true
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -379,20 +372,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.programResults', {
|
}, context, '.programResults', {
|
||||||
|
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
inheritThumb: false,
|
inheritThumb: false,
|
||||||
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
|
||||||
showParentTitleOrTitle: true,
|
showParentTitleOrTitle: true,
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
overlayMoreButton: true,
|
overlayMoreButton: true,
|
||||||
showAirTime: true,
|
showAirTime: true,
|
||||||
showAirDateTime: true,
|
showAirDateTime: true,
|
||||||
showChannelName: true
|
showChannelName: true
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -406,11 +399,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.videoResults', {
|
}, context, '.videoResults', {
|
||||||
|
|
||||||
showParentTitle: true,
|
showParentTitle: true,
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -422,9 +415,9 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.peopleResults', {
|
}, context, '.peopleResults', {
|
||||||
|
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
showTitle: true
|
showTitle: true
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -435,9 +428,9 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
IncludeArtists: true
|
IncludeArtists: true
|
||||||
|
|
||||||
}, context, '.artistResults', {
|
}, context, '.artistResults', {
|
||||||
coverImage: true,
|
coverImage: true,
|
||||||
showTitle: true
|
showTitle: true
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -450,11 +443,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.albumResults', {
|
}, context, '.albumResults', {
|
||||||
|
|
||||||
showParentTitle: true,
|
showParentTitle: true,
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -467,13 +460,13 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.songResults', {
|
}, context, '.songResults', {
|
||||||
|
|
||||||
showParentTitle: true,
|
showParentTitle: true,
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
action: 'play'
|
action: 'play'
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -486,11 +479,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.photoResults', {
|
}, context, '.photoResults', {
|
||||||
|
|
||||||
showParentTitle: false,
|
showParentTitle: false,
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -503,10 +496,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.photoAlbumResults', {
|
}, context, '.photoAlbumResults', {
|
||||||
|
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -519,11 +512,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.bookResults', {
|
}, context, '.bookResults', {
|
||||||
|
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -536,10 +529,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.audioBookResults', {
|
}, context, '.audioBookResults', {
|
||||||
|
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
});
|
});
|
||||||
|
|
||||||
searchType(instance, apiClient, {
|
searchType(instance, apiClient, {
|
||||||
searchTerm: value,
|
searchTerm: value,
|
||||||
|
|
@ -552,10 +545,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
|
||||||
|
|
||||||
}, context, '.playlistResults', {
|
}, context, '.playlistResults', {
|
||||||
|
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function searchType(instance, apiClient, query, context, section, cardOptions) {
|
function searchType(instance, apiClient, query, context, section, cardOptions) {
|
||||||
|
|
|
||||||
|
|
@ -22,44 +22,44 @@
|
||||||
require(['apphost'], function (appHost) {
|
require(['apphost'], function (appHost) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var _GAMEPAD_A_BUTTON_INDEX = 0,
|
var _GAMEPAD_A_BUTTON_INDEX = 0;
|
||||||
_GAMEPAD_B_BUTTON_INDEX = 1,
|
var _GAMEPAD_B_BUTTON_INDEX = 1;
|
||||||
_GAMEPAD_DPAD_UP_BUTTON_INDEX = 12,
|
var _GAMEPAD_DPAD_UP_BUTTON_INDEX = 12;
|
||||||
_GAMEPAD_DPAD_DOWN_BUTTON_INDEX = 13,
|
var _GAMEPAD_DPAD_DOWN_BUTTON_INDEX = 13;
|
||||||
_GAMEPAD_DPAD_LEFT_BUTTON_INDEX = 14,
|
var _GAMEPAD_DPAD_LEFT_BUTTON_INDEX = 14;
|
||||||
_GAMEPAD_DPAD_RIGHT_BUTTON_INDEX = 15,
|
var _GAMEPAD_DPAD_RIGHT_BUTTON_INDEX = 15;
|
||||||
_GAMEPAD_A_KEY = "GamepadA",
|
var _GAMEPAD_A_KEY = "GamepadA";
|
||||||
_GAMEPAD_B_KEY = "GamepadB",
|
var _GAMEPAD_B_KEY = "GamepadB";
|
||||||
_GAMEPAD_DPAD_UP_KEY = "GamepadDPadUp",
|
var _GAMEPAD_DPAD_UP_KEY = "GamepadDPadUp";
|
||||||
_GAMEPAD_DPAD_DOWN_KEY = "GamepadDPadDown",
|
var _GAMEPAD_DPAD_DOWN_KEY = "GamepadDPadDown";
|
||||||
_GAMEPAD_DPAD_LEFT_KEY = "GamepadDPadLeft",
|
var _GAMEPAD_DPAD_LEFT_KEY = "GamepadDPadLeft";
|
||||||
_GAMEPAD_DPAD_RIGHT_KEY = "GamepadDPadRight",
|
var _GAMEPAD_DPAD_RIGHT_KEY = "GamepadDPadRight";
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_UP_KEY = "GamepadLeftThumbStickUp",
|
var _GAMEPAD_LEFT_THUMBSTICK_UP_KEY = "GamepadLeftThumbStickUp";
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_DOWN_KEY = "GamepadLeftThumbStickDown",
|
var _GAMEPAD_LEFT_THUMBSTICK_DOWN_KEY = "GamepadLeftThumbStickDown";
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_LEFT_KEY = "GamepadLeftThumbStickLeft",
|
var _GAMEPAD_LEFT_THUMBSTICK_LEFT_KEY = "GamepadLeftThumbStickLeft";
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEY = "GamepadLeftThumbStickRight",
|
var _GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEY = "GamepadLeftThumbStickRight";
|
||||||
_GAMEPAD_A_KEYCODE = 0,
|
var _GAMEPAD_A_KEYCODE = 0;
|
||||||
_GAMEPAD_B_KEYCODE = 27,
|
var _GAMEPAD_B_KEYCODE = 27;
|
||||||
_GAMEPAD_DPAD_UP_KEYCODE = 38,
|
var _GAMEPAD_DPAD_UP_KEYCODE = 38;
|
||||||
_GAMEPAD_DPAD_DOWN_KEYCODE = 40,
|
var _GAMEPAD_DPAD_DOWN_KEYCODE = 40;
|
||||||
_GAMEPAD_DPAD_LEFT_KEYCODE = 37,
|
var _GAMEPAD_DPAD_LEFT_KEYCODE = 37;
|
||||||
_GAMEPAD_DPAD_RIGHT_KEYCODE = 39,
|
var _GAMEPAD_DPAD_RIGHT_KEYCODE = 39;
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_UP_KEYCODE = 38,
|
var _GAMEPAD_LEFT_THUMBSTICK_UP_KEYCODE = 38;
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_DOWN_KEYCODE = 40,
|
var _GAMEPAD_LEFT_THUMBSTICK_DOWN_KEYCODE = 40;
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_LEFT_KEYCODE = 37,
|
var _GAMEPAD_LEFT_THUMBSTICK_LEFT_KEYCODE = 37;
|
||||||
_GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEYCODE = 39,
|
var _GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEYCODE = 39;
|
||||||
_THUMB_STICK_THRESHOLD = 0.75;
|
var _THUMB_STICK_THRESHOLD = 0.75;
|
||||||
|
|
||||||
var _leftThumbstickUpPressed = false,
|
var _leftThumbstickUpPressed = false;
|
||||||
_leftThumbstickDownPressed = false,
|
var _leftThumbstickDownPressed = false;
|
||||||
_leftThumbstickLeftPressed = false,
|
var _leftThumbstickLeftPressed = false;
|
||||||
_leftThumbstickRightPressed = false,
|
var _leftThumbstickRightPressed = false;
|
||||||
_dPadUpPressed = false,
|
var _dPadUpPressed = false;
|
||||||
_dPadDownPressed = false,
|
var _dPadDownPressed = false;
|
||||||
_dPadLeftPressed = false,
|
var _dPadLeftPressed = false;
|
||||||
_dPadRightPressed = false,
|
var _dPadRightPressed = false;
|
||||||
_gamepadAPressed = false,
|
var _gamepadAPressed = false;
|
||||||
_gamepadBPressed = false;
|
var _gamepadBPressed = false;
|
||||||
|
|
||||||
// The set of buttons on the gamepad we listen for.
|
// The set of buttons on the gamepad we listen for.
|
||||||
var ProcessedButtons = [
|
var ProcessedButtons = [
|
||||||
|
|
@ -260,7 +260,9 @@ require(['apphost'], function (appHost) {
|
||||||
gamepads = navigator.webkitGetGamepads();
|
gamepads = navigator.webkitGetGamepads();
|
||||||
}
|
}
|
||||||
gamepads = gamepads || [];
|
gamepads = gamepads || [];
|
||||||
var i, j, len;
|
var i;
|
||||||
|
var j;
|
||||||
|
var len;
|
||||||
for (i = 0, len = gamepads.length; i < len; i++) {
|
for (i = 0, len = gamepads.length; i < len; i++) {
|
||||||
var gamepad = gamepads[i];
|
var gamepad = gamepads[i];
|
||||||
if (gamepad) {
|
if (gamepad) {
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
|
||||||
toast({ title: args.Header, text: args.Text });
|
toast({ title: args.Header, text: args.Text });
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
require(['alert'], function (alert) {
|
require(['alert'], function (alert) {
|
||||||
alert({ title: args.Header, text: args.Text });
|
alert({ title: args.Header, text: args.Text });
|
||||||
});
|
});
|
||||||
|
|
@ -157,11 +156,9 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
|
||||||
|
|
||||||
if (msg.Data.PlayCommand === "PlayNext") {
|
if (msg.Data.PlayCommand === "PlayNext") {
|
||||||
playbackManager.queueNext({ ids: msg.Data.ItemIds, serverId: serverId });
|
playbackManager.queueNext({ ids: msg.Data.ItemIds, serverId: serverId });
|
||||||
}
|
} else if (msg.Data.PlayCommand === "PlayLast") {
|
||||||
else if (msg.Data.PlayCommand === "PlayLast") {
|
|
||||||
playbackManager.queue({ ids: msg.Data.ItemIds, serverId: serverId });
|
playbackManager.queue({ ids: msg.Data.ItemIds, serverId: serverId });
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
playbackManager.play({
|
playbackManager.play({
|
||||||
ids: msg.Data.ItemIds,
|
ids: msg.Data.ItemIds,
|
||||||
startPositionTicks: msg.Data.StartPositionTicks,
|
startPositionTicks: msg.Data.StartPositionTicks,
|
||||||
|
|
@ -173,38 +170,29 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} else if (msg.MessageType === "Playstate") {
|
||||||
else if (msg.MessageType === "Playstate") {
|
|
||||||
|
|
||||||
if (msg.Data.Command === 'Stop') {
|
if (msg.Data.Command === 'Stop') {
|
||||||
inputManager.trigger('stop');
|
inputManager.trigger('stop');
|
||||||
}
|
} else if (msg.Data.Command === 'Pause') {
|
||||||
else if (msg.Data.Command === 'Pause') {
|
|
||||||
inputManager.trigger('pause');
|
inputManager.trigger('pause');
|
||||||
}
|
} else if (msg.Data.Command === 'Unpause') {
|
||||||
else if (msg.Data.Command === 'Unpause') {
|
|
||||||
inputManager.trigger('play');
|
inputManager.trigger('play');
|
||||||
}
|
} else if (msg.Data.Command === 'PlayPause') {
|
||||||
else if (msg.Data.Command === 'PlayPause') {
|
|
||||||
inputManager.trigger('playpause');
|
inputManager.trigger('playpause');
|
||||||
}
|
} else if (msg.Data.Command === 'Seek') {
|
||||||
else if (msg.Data.Command === 'Seek') {
|
|
||||||
playbackManager.seek(msg.Data.SeekPositionTicks);
|
playbackManager.seek(msg.Data.SeekPositionTicks);
|
||||||
}
|
} else if (msg.Data.Command === 'NextTrack') {
|
||||||
else if (msg.Data.Command === 'NextTrack') {
|
|
||||||
inputManager.trigger('next');
|
inputManager.trigger('next');
|
||||||
}
|
} else if (msg.Data.Command === 'PreviousTrack') {
|
||||||
else if (msg.Data.Command === 'PreviousTrack') {
|
|
||||||
inputManager.trigger('previous');
|
inputManager.trigger('previous');
|
||||||
} else {
|
} else {
|
||||||
notifyApp();
|
notifyApp();
|
||||||
}
|
}
|
||||||
}
|
} else if (msg.MessageType === "GeneralCommand") {
|
||||||
else if (msg.MessageType === "GeneralCommand") {
|
|
||||||
var cmd = msg.Data;
|
var cmd = msg.Data;
|
||||||
processGeneralCommand(cmd, apiClient);
|
processGeneralCommand(cmd, apiClient);
|
||||||
}
|
} else if (msg.MessageType === "UserDataChanged") {
|
||||||
else if (msg.MessageType === "UserDataChanged") {
|
|
||||||
|
|
||||||
if (msg.Data.UserId === apiClient.getCurrentUserId()) {
|
if (msg.Data.UserId === apiClient.getCurrentUserId()) {
|
||||||
|
|
||||||
|
|
@ -212,8 +200,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
|
||||||
events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]);
|
events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
events.trigger(serverNotifications, msg.MessageType, [apiClient, msg.Data]);
|
events.trigger(serverNotifications, msg.MessageType, [apiClient, msg.Data]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,7 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
|
||||||
var currentInstance;
|
var currentInstance;
|
||||||
|
|
||||||
function reloadPageWhenServerAvailable(retryCount) {
|
function reloadPageWhenServerAvailable(retryCount) {
|
||||||
|
|
||||||
var apiClient = currentApiClient;
|
var apiClient = currentApiClient;
|
||||||
|
|
||||||
if (!apiClient) {
|
if (!apiClient) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -31,7 +29,6 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
|
||||||
|
|
||||||
function retryReload(retryCount) {
|
function retryReload(retryCount) {
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
|
|
||||||
retryCount = retryCount || 0;
|
retryCount = retryCount || 0;
|
||||||
retryCount++;
|
retryCount++;
|
||||||
|
|
||||||
|
|
@ -42,15 +39,12 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
|
||||||
}
|
}
|
||||||
|
|
||||||
function startRestart(instance, apiClient, dlg) {
|
function startRestart(instance, apiClient, dlg) {
|
||||||
|
|
||||||
currentApiClient = apiClient;
|
currentApiClient = apiClient;
|
||||||
currentDlg = dlg;
|
currentDlg = dlg;
|
||||||
currentInstance = instance;
|
currentInstance = instance;
|
||||||
|
|
||||||
apiClient.restartServer().then(function () {
|
apiClient.restartServer().then(function () {
|
||||||
|
|
||||||
setTimeout(reloadPageWhenServerAvailable, 250);
|
setTimeout(reloadPageWhenServerAvailable, 250);
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -94,7 +88,8 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
|
||||||
|
|
||||||
dlg.querySelector('.text').innerHTML = globalize.translate('RestartPleaseWaitMessage');
|
dlg.querySelector('.text').innerHTML = globalize.translate('RestartPleaseWaitMessage');
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
var html = '';
|
var html = '';
|
||||||
for (i = 0, length = configuredButtons.length; i < length; i++) {
|
for (i = 0, length = configuredButtons.length; i < length; i++) {
|
||||||
var item = configuredButtons[i];
|
var item = configuredButtons[i];
|
||||||
|
|
@ -138,12 +133,10 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
|
||||||
}
|
}
|
||||||
|
|
||||||
function ServerRestartDialog(options) {
|
function ServerRestartDialog(options) {
|
||||||
|
|
||||||
this.options = options;
|
this.options = options;
|
||||||
}
|
}
|
||||||
|
|
||||||
ServerRestartDialog.prototype.show = function () {
|
ServerRestartDialog.prototype.show = function () {
|
||||||
|
|
||||||
var instance = this;
|
var instance = this;
|
||||||
loading.show();
|
loading.show();
|
||||||
|
|
||||||
|
|
@ -155,7 +148,6 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
|
||||||
};
|
};
|
||||||
|
|
||||||
ServerRestartDialog.prototype.destroy = function () {
|
ServerRestartDialog.prototype.destroy = function () {
|
||||||
|
|
||||||
currentApiClient = null;
|
currentApiClient = null;
|
||||||
currentDlg = null;
|
currentDlg = null;
|
||||||
currentInstance = null;
|
currentInstance = null;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ define([], function () {
|
||||||
} else {
|
} else {
|
||||||
window.open(url, target || '_blank');
|
window.open(url, target || '_blank');
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
canExec: false,
|
canExec: false,
|
||||||
exec: function (options) {
|
exec: function (options) {
|
||||||
|
|
|
||||||
|
|
@ -128,8 +128,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
|
||||||
|
|
||||||
if (result.command === 'playallfromhere' || result.command === 'queueallfromhere') {
|
if (result.command === 'playallfromhere' || result.command === 'queueallfromhere') {
|
||||||
executeAction(card, options.positionTo, result.command);
|
executeAction(card, options.positionTo, result.command);
|
||||||
}
|
} else if (result.updated || result.deleted) {
|
||||||
else if (result.updated || result.deleted) {
|
|
||||||
notifyRefreshNeeded(card, options.itemsContainer);
|
notifyRefreshNeeded(card, options.itemsContainer);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -204,21 +203,15 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
|
||||||
context: card.getAttribute('data-context'),
|
context: card.getAttribute('data-context'),
|
||||||
parentId: card.getAttribute('data-parentid')
|
parentId: card.getAttribute('data-parentid')
|
||||||
});
|
});
|
||||||
}
|
} else if (action === 'programdialog') {
|
||||||
|
|
||||||
else if (action === 'programdialog') {
|
|
||||||
|
|
||||||
showProgramDialog(item);
|
showProgramDialog(item);
|
||||||
}
|
} else if (action === 'instantmix') {
|
||||||
|
|
||||||
else if (action === 'instantmix') {
|
|
||||||
playbackManager.instantMix({
|
playbackManager.instantMix({
|
||||||
Id: playableItemId,
|
Id: playableItemId,
|
||||||
ServerId: serverId
|
ServerId: serverId
|
||||||
});
|
});
|
||||||
}
|
} else if (action === 'play' || action === 'resume') {
|
||||||
|
|
||||||
else if (action === 'play' || action === 'resume') {
|
|
||||||
|
|
||||||
var startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
|
var startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
|
||||||
|
|
||||||
|
|
@ -227,9 +220,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
|
||||||
startPositionTicks: startPositionTicks,
|
startPositionTicks: startPositionTicks,
|
||||||
serverId: serverId
|
serverId: serverId
|
||||||
});
|
});
|
||||||
}
|
} else if (action === 'queue') {
|
||||||
|
|
||||||
else if (action === 'queue') {
|
|
||||||
|
|
||||||
if (playbackManager.isPlaying()) {
|
if (playbackManager.isPlaying()) {
|
||||||
playbackManager.queue({
|
playbackManager.queue({
|
||||||
|
|
@ -243,25 +234,15 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
|
||||||
serverId: serverId
|
serverId: serverId
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
} else if (action === 'playallfromhere') {
|
||||||
|
|
||||||
else if (action === 'playallfromhere') {
|
|
||||||
playAllFromHere(card, serverId);
|
playAllFromHere(card, serverId);
|
||||||
}
|
} else if (action === 'queueallfromhere') {
|
||||||
|
|
||||||
else if (action === 'queueallfromhere') {
|
|
||||||
playAllFromHere(card, serverId, true);
|
playAllFromHere(card, serverId, true);
|
||||||
}
|
} else if (action === 'setplaylistindex') {
|
||||||
|
|
||||||
else if (action === 'setplaylistindex') {
|
|
||||||
playbackManager.setCurrentPlaylistItem(card.getAttribute('data-playlistitemid'));
|
playbackManager.setCurrentPlaylistItem(card.getAttribute('data-playlistitemid'));
|
||||||
}
|
} else if (action === 'record') {
|
||||||
|
|
||||||
else if (action === 'record') {
|
|
||||||
onRecordCommand(serverId, id, type, card.getAttribute('data-timerid'), card.getAttribute('data-seriestimerid'));
|
onRecordCommand(serverId, id, type, card.getAttribute('data-timerid'), card.getAttribute('data-seriestimerid'));
|
||||||
}
|
} else if (action === 'menu') {
|
||||||
|
|
||||||
else if (action === 'menu') {
|
|
||||||
|
|
||||||
var options = target.getAttribute('data-playoptions') === 'false' ?
|
var options = target.getAttribute('data-playoptions') === 'false' ?
|
||||||
{
|
{
|
||||||
|
|
@ -277,27 +258,17 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
|
||||||
options.positionTo = target;
|
options.positionTo = target;
|
||||||
|
|
||||||
showContextMenu(card, options);
|
showContextMenu(card, options);
|
||||||
}
|
} else if (action === 'playmenu') {
|
||||||
|
|
||||||
else if (action === 'playmenu') {
|
|
||||||
showPlayMenu(card, target);
|
showPlayMenu(card, target);
|
||||||
}
|
} else if (action === 'edit') {
|
||||||
|
|
||||||
else if (action === 'edit') {
|
|
||||||
getItem(target).then(function (item) {
|
getItem(target).then(function (item) {
|
||||||
editItem(item, serverId);
|
editItem(item, serverId);
|
||||||
});
|
});
|
||||||
}
|
} else if (action === 'playtrailer') {
|
||||||
|
|
||||||
else if (action === 'playtrailer') {
|
|
||||||
getItem(target).then(playTrailer);
|
getItem(target).then(playTrailer);
|
||||||
}
|
} else if (action === 'addtoplaylist') {
|
||||||
|
|
||||||
else if (action === 'addtoplaylist') {
|
|
||||||
getItem(target).then(addToPlaylist);
|
getItem(target).then(addToPlaylist);
|
||||||
}
|
} else if (action === 'custom') {
|
||||||
|
|
||||||
else if (action === 'custom') {
|
|
||||||
|
|
||||||
var customAction = target.getAttribute('data-customaction');
|
var customAction = target.getAttribute('data-customaction');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
|
||||||
} else {
|
} else {
|
||||||
Emby.Page.goHome();
|
Emby.Page.goHome();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
function getThemes() {
|
function getThemes() {
|
||||||
return [{
|
return [{
|
||||||
|
|
@ -36,7 +36,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
|
||||||
isDefaultServerDashboard: true
|
isDefaultServerDashboard: true
|
||||||
}, {
|
}, {
|
||||||
name: "Emby",
|
name: "Emby",
|
||||||
id: "emby",
|
id: "emby"
|
||||||
}, {
|
}, {
|
||||||
name: "Light",
|
name: "Light",
|
||||||
id: "light"
|
id: "light"
|
||||||
|
|
@ -47,7 +47,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
|
||||||
name: "Windows Media Center",
|
name: "Windows Media Center",
|
||||||
id: "wmc"
|
id: "wmc"
|
||||||
}];
|
}];
|
||||||
};
|
}
|
||||||
|
|
||||||
var skinManager = {
|
var skinManager = {
|
||||||
getThemes: getThemes,
|
getThemes: getThemes,
|
||||||
|
|
|
||||||
|
|
@ -77,8 +77,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
|
||||||
|
|
||||||
try {
|
try {
|
||||||
appHost.setUserScalable(scalable);
|
appHost.setUserScalable(scalable);
|
||||||
}
|
} catch (err) {
|
||||||
catch (err) {
|
|
||||||
console.log('error in appHost.setUserScalable: ' + err);
|
console.log('error in appHost.setUserScalable: ' + err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -192,8 +192,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
|
||||||
var lastLanguage = userSettings.get('subtitleeditor-language');
|
var lastLanguage = userSettings.get('subtitleeditor-language');
|
||||||
if (lastLanguage) {
|
if (lastLanguage) {
|
||||||
selectLanguage.value = lastLanguage;
|
selectLanguage.value = lastLanguage;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
apiClient.getCurrentUser().then(function (user) {
|
apiClient.getCurrentUser().then(function (user) {
|
||||||
|
|
||||||
|
|
@ -347,8 +346,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
|
||||||
|
|
||||||
if (typeof itemId === 'string') {
|
if (typeof itemId === 'string') {
|
||||||
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(onGetItem);
|
apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(onGetItem);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
onGetItem(itemId);
|
onGetItem(itemId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ define([], function () {
|
||||||
case 'smaller':
|
case 'smaller':
|
||||||
list.push({ name: 'font-size', value: '.8em' });
|
list.push({ name: 'font-size', value: '.8em' });
|
||||||
break;
|
break;
|
||||||
case 'small':
|
case 'small':
|
||||||
list.push({ name: 'font-size', value: 'inherit' });
|
list.push({ name: 'font-size', value: 'inherit' });
|
||||||
break;
|
break;
|
||||||
case 'larger':
|
case 'larger':
|
||||||
|
|
@ -132,7 +132,6 @@ define([], function () {
|
||||||
|
|
||||||
function applyStyleList(styles, elem) {
|
function applyStyleList(styles, elem) {
|
||||||
|
|
||||||
|
|
||||||
for (var i = 0, length = styles.length; i < length; i++) {
|
for (var i = 0, length = styles.length; i < length; i++) {
|
||||||
|
|
||||||
var style = styles[i];
|
var style = styles[i];
|
||||||
|
|
|
||||||
|
|
@ -25,10 +25,10 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
|
||||||
|
|
||||||
subtitleSyncTextField.addEventListener("keypress", function(event) {
|
subtitleSyncTextField.addEventListener("keypress", function(event) {
|
||||||
|
|
||||||
if(event.key === "Enter"){
|
if (event.key === "Enter") {
|
||||||
// if input key is enter search for float pattern
|
// if input key is enter search for float pattern
|
||||||
var inputOffset = /[-+]?\d+\.?\d*/g.exec(this.textContent);
|
var inputOffset = /[-+]?\d+\.?\d*/g.exec(this.textContent);
|
||||||
if(inputOffset) {
|
if (inputOffset) {
|
||||||
inputOffset = inputOffset[0];
|
inputOffset = inputOffset[0];
|
||||||
|
|
||||||
// replace current text by considered offset
|
// replace current text by considered offset
|
||||||
|
|
@ -48,7 +48,7 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
|
||||||
} else {
|
} else {
|
||||||
// keep focus to prevent fade with bottom layout
|
// keep focus to prevent fade with bottom layout
|
||||||
this.hasFocus = true;
|
this.hasFocus = true;
|
||||||
if(event.key.match(/[+-\d.s]/) === null) {
|
if (event.key.match(/[+-\d.s]/) === null) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -92,14 +92,13 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
|
||||||
instance.element = parent;
|
instance.element = parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function getOffsetFromPercentage(value) {
|
function getOffsetFromPercentage(value) {
|
||||||
// convert percent to fraction
|
// convert percent to fraction
|
||||||
var offset = (value - 50) / 50;
|
var offset = (value - 50) / 50;
|
||||||
// multiply by offset min/max range value (-x to +x) :
|
// multiply by offset min/max range value (-x to +x) :
|
||||||
offset *= 30;
|
offset *= 30;
|
||||||
return offset.toFixed(1);
|
return offset.toFixed(1);
|
||||||
};
|
}
|
||||||
|
|
||||||
function getPercentageFromOffset(value) {
|
function getPercentageFromOffset(value) {
|
||||||
// divide by offset min/max range value (-x to +x) :
|
// divide by offset min/max range value (-x to +x) :
|
||||||
|
|
@ -108,16 +107,16 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
|
||||||
percentValue *= 50;
|
percentValue *= 50;
|
||||||
percentValue += 50;
|
percentValue += 50;
|
||||||
return Math.min(100, Math.max(0, percentValue.toFixed()));
|
return Math.min(100, Math.max(0, percentValue.toFixed()));
|
||||||
};
|
}
|
||||||
|
|
||||||
function SubtitleSync(currentPlayer) {
|
function SubtitleSync(currentPlayer) {
|
||||||
player = currentPlayer;
|
player = currentPlayer;
|
||||||
init(this);
|
init(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
SubtitleSync.prototype.destroy = function(){
|
SubtitleSync.prototype.destroy = function() {
|
||||||
SubtitleSync.prototype.toggle("forceToHide");
|
SubtitleSync.prototype.toggle("forceToHide");
|
||||||
if(player){
|
if (player) {
|
||||||
playbackManager.disableShowingSubtitleOffset(player);
|
playbackManager.disableShowingSubtitleOffset(player);
|
||||||
playbackManager.setSubtitleOffset(0, player);
|
playbackManager.setSubtitleOffset(0, player);
|
||||||
}
|
}
|
||||||
|
|
@ -130,27 +129,30 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
|
||||||
|
|
||||||
SubtitleSync.prototype.toggle = function(action) {
|
SubtitleSync.prototype.toggle = function(action) {
|
||||||
|
|
||||||
if(player && playbackManager.supportSubtitleOffset(player)){
|
if (player && playbackManager.supportSubtitleOffset(player)) {
|
||||||
|
|
||||||
switch(action) {
|
switch (action) {
|
||||||
case undefined:
|
case undefined:
|
||||||
// if showing subtitle sync is enabled
|
// if showing subtitle sync is enabled
|
||||||
if(playbackManager.isShowingSubtitleOffsetEnabled(player) &&
|
if (playbackManager.isShowingSubtitleOffsetEnabled(player) &&
|
||||||
// if there is an external subtitle stream enabled
|
// if there is an external subtitle stream enabled
|
||||||
playbackManager.canHandleOffsetOnCurrentSubtitle(player)){
|
playbackManager.canHandleOffsetOnCurrentSubtitle(player)) {
|
||||||
// if no subtitle offset is defined
|
// if no subtitle offset is defined
|
||||||
if(!playbackManager.getPlayerSubtitleOffset(player)) {
|
if (!playbackManager.getPlayerSubtitleOffset(player)) {
|
||||||
// set default offset to '0' = 50%
|
// set default offset to '0' = 50%
|
||||||
subtitleSyncSlider.value = "50";
|
subtitleSyncSlider.value = "50";
|
||||||
subtitleSyncTextField.textContent = "0s";
|
subtitleSyncTextField.textContent = "0s";
|
||||||
playbackManager.setSubtitleOffset(0, player);
|
playbackManager.setSubtitleOffset(0, player);
|
||||||
}
|
}
|
||||||
// show subtitle sync
|
// show subtitle sync
|
||||||
subtitleSyncContainer.classList.remove("hide");
|
subtitleSyncContainer.classList.remove("hide");
|
||||||
break; // stop here
|
break; // stop here
|
||||||
} // else continue and hide
|
} // else continue and hide
|
||||||
case "hide":
|
case "hide":
|
||||||
if(subtitleSyncTextField.hasFocus){break;} // else continue and hide
|
// only break if element has focus
|
||||||
|
if (subtitleSyncTextField.hasFocus) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
case "forceToHide":
|
case "forceToHide":
|
||||||
subtitleSyncContainer.classList.add("hide");
|
subtitleSyncContainer.classList.add("hide");
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -246,7 +246,8 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
|
||||||
this.itemsContainer.setAttribute('data-parentid', params.parentId);
|
this.itemsContainer.setAttribute('data-parentid', params.parentId);
|
||||||
}
|
}
|
||||||
|
|
||||||
var i, length;
|
var i;
|
||||||
|
var length;
|
||||||
|
|
||||||
var btnViewSettings = view.querySelectorAll('.btnViewSettings');
|
var btnViewSettings = view.querySelectorAll('.btnViewSettings');
|
||||||
for (i = 0, length = btnViewSettings.length; i < length; i++) {
|
for (i = 0, length = btnViewSettings.length; i < length; i++) {
|
||||||
|
|
@ -559,7 +560,6 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
|
||||||
};
|
};
|
||||||
|
|
||||||
ItemsTab.prototype.onPause = function () {
|
ItemsTab.prototype.onPause = function () {
|
||||||
|
|
||||||
var scroller = this.scroller;
|
var scroller = this.scroller;
|
||||||
if (scroller && scroller.pause) {
|
if (scroller && scroller.pause) {
|
||||||
scroller.pause();
|
scroller.pause();
|
||||||
|
|
@ -573,7 +573,6 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
|
||||||
};
|
};
|
||||||
|
|
||||||
ItemsTab.prototype.destroy = function () {
|
ItemsTab.prototype.destroy = function () {
|
||||||
|
|
||||||
this.view = null;
|
this.view = null;
|
||||||
this.itemsContainer = null;
|
this.itemsContainer = null;
|
||||||
this.params = null;
|
this.params = null;
|
||||||
|
|
@ -585,6 +584,7 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
|
||||||
this.alphaPicker.destroy();
|
this.alphaPicker.destroy();
|
||||||
this.alphaPicker = null;
|
this.alphaPicker = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.sortButtons = null;
|
this.sortButtons = null;
|
||||||
this.btnSortText = null;
|
this.btnSortText = null;
|
||||||
this.btnSortIcon = null;
|
this.btnSortIcon = null;
|
||||||
|
|
|
||||||
|
|
@ -101,8 +101,7 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
|
||||||
|
|
||||||
if (!currentTabController) {
|
if (!currentTabController) {
|
||||||
mainTabsManager.selectedTabIndex(this.initialTabIndex);
|
mainTabsManager.selectedTabIndex(this.initialTabIndex);
|
||||||
}
|
} else if (currentTabController && currentTabController.onResume) {
|
||||||
else if (currentTabController && currentTabController.onResume) {
|
|
||||||
currentTabController.onResume({});
|
currentTabController.onResume({});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -94,8 +94,7 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
|
||||||
|
|
||||||
if (viewOptions.supportsThemeMedia) {
|
if (viewOptions.supportsThemeMedia) {
|
||||||
// Do nothing here, allow it to keep playing
|
// Do nothing here, allow it to keep playing
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
playThemeMedia([], null);
|
playThemeMedia([], null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,11 +78,9 @@ define(['dom', 'events'], function (dom, events) {
|
||||||
|
|
||||||
if (deltaX > swipeXThreshold && Math.abs(deltaY) < swipeXMaxY) {
|
if (deltaX > swipeXThreshold && Math.abs(deltaY) < swipeXMaxY) {
|
||||||
events.trigger(self, 'swiperight', [touchTarget]);
|
events.trigger(self, 'swiperight', [touchTarget]);
|
||||||
}
|
} else if (deltaX < (0 - swipeXThreshold) && Math.abs(deltaY) < swipeXMaxY) {
|
||||||
else if (deltaX < (0 - swipeXThreshold) && Math.abs(deltaY) < swipeXMaxY) {
|
|
||||||
events.trigger(self, 'swipeleft', [touchTarget]);
|
events.trigger(self, 'swipeleft', [touchTarget]);
|
||||||
}
|
} else if ((deltaY < (0 - swipeYThreshold) || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
|
||||||
else if ((deltaY < (0 - swipeYThreshold) || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
|
|
||||||
|
|
||||||
thresholdYMet = true;
|
thresholdYMet = true;
|
||||||
|
|
||||||
|
|
@ -94,8 +92,7 @@ define(['dom', 'events'], function (dom, events) {
|
||||||
currentDeltaX: currentDeltaX,
|
currentDeltaX: currentDeltaX,
|
||||||
currentDeltaY: currentDeltaY
|
currentDeltaY: currentDeltaY
|
||||||
}]);
|
}]);
|
||||||
}
|
} else if ((deltaY > swipeYThreshold || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
|
||||||
else if ((deltaY > swipeYThreshold || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
|
|
||||||
thresholdYMet = true;
|
thresholdYMet = true;
|
||||||
|
|
||||||
events.trigger(self, 'swipedown', [touchTarget, {
|
events.trigger(self, 'swipedown', [touchTarget, {
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
|
||||||
var isFavorite = this.getAttribute('data-isfavorite') === 'true';
|
var isFavorite = this.getAttribute('data-isfavorite') === 'true';
|
||||||
if (likes === 'true') {
|
if (likes === 'true') {
|
||||||
likes = true;
|
likes = true;
|
||||||
}
|
} else if (likes === 'false') {
|
||||||
else if (likes === 'false') {
|
|
||||||
likes = false;
|
likes = false;
|
||||||
} else {
|
} else {
|
||||||
likes = null;
|
likes = null;
|
||||||
|
|
@ -64,7 +63,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
|
||||||
|
|
||||||
if (icon) {
|
if (icon) {
|
||||||
icon.innerHTML = 'favorite';
|
icon.innerHTML = 'favorite';
|
||||||
icon.classList.add('ratingbutton-icon-withrating');
|
icon.classList.add('ratingbutton-icon-withrating');
|
||||||
}
|
}
|
||||||
|
|
||||||
button.classList.add('ratingbutton-withrating');
|
button.classList.add('ratingbutton-withrating');
|
||||||
|
|
@ -73,7 +72,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
|
||||||
|
|
||||||
if (icon) {
|
if (icon) {
|
||||||
icon.innerHTML = 'favorite';
|
icon.innerHTML = 'favorite';
|
||||||
icon.classList.remove('ratingbutton-icon-withrating');
|
icon.classList.remove('ratingbutton-icon-withrating');
|
||||||
//icon.innerHTML = 'thumb_up';
|
//icon.innerHTML = 'thumb_up';
|
||||||
}
|
}
|
||||||
button.classList.remove('ratingbutton-withrating');
|
button.classList.remove('ratingbutton-withrating');
|
||||||
|
|
@ -82,7 +81,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
|
||||||
|
|
||||||
if (icon) {
|
if (icon) {
|
||||||
icon.innerHTML = 'favorite';
|
icon.innerHTML = 'favorite';
|
||||||
icon.classList.remove('ratingbutton-icon-withrating');
|
icon.classList.remove('ratingbutton-icon-withrating');
|
||||||
//icon.innerHTML = 'thumb_down';
|
//icon.innerHTML = 'thumb_down';
|
||||||
}
|
}
|
||||||
button.classList.remove('ratingbutton-withrating');
|
button.classList.remove('ratingbutton-withrating');
|
||||||
|
|
@ -91,7 +90,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
|
||||||
|
|
||||||
if (icon) {
|
if (icon) {
|
||||||
icon.innerHTML = 'favorite';
|
icon.innerHTML = 'favorite';
|
||||||
icon.classList.remove('ratingbutton-icon-withrating');
|
icon.classList.remove('ratingbutton-icon-withrating');
|
||||||
//icon.innerHTML = 'thumbs_up_down';
|
//icon.innerHTML = 'thumbs_up_down';
|
||||||
}
|
}
|
||||||
button.classList.remove('ratingbutton-withrating');
|
button.classList.remove('ratingbutton-withrating');
|
||||||
|
|
@ -152,8 +151,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
|
||||||
var isFavorite = this.getAttribute('data-isfavorite') === 'true';
|
var isFavorite = this.getAttribute('data-isfavorite') === 'true';
|
||||||
if (likes === 'true') {
|
if (likes === 'true') {
|
||||||
likes = true;
|
likes = true;
|
||||||
}
|
} else if (likes === 'false') {
|
||||||
else if (likes === 'false') {
|
|
||||||
likes = false;
|
likes = false;
|
||||||
} else {
|
} else {
|
||||||
likes = null;
|
likes = null;
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,6 @@ define(["browser", "dom", "layoutManager", "css!components/viewManager/viewConta
|
||||||
var newViewInfo = normalizeNewView(options, isPluginpage);
|
var newViewInfo = normalizeNewView(options, isPluginpage);
|
||||||
var newView = newViewInfo.elem;
|
var newView = newViewInfo.elem;
|
||||||
|
|
||||||
|
|
||||||
if (isPluginpage) {
|
if (isPluginpage) {
|
||||||
require(["legacyDashboard"]);
|
require(["legacyDashboard"]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -50,8 +50,7 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
|
||||||
if (options.autoFocus !== false) {
|
if (options.autoFocus !== false) {
|
||||||
focusManager.autoFocus(view);
|
focusManager.autoFocus(view);
|
||||||
}
|
}
|
||||||
}
|
} else if (!layoutManager.mobile) {
|
||||||
else if (!layoutManager.mobile) {
|
|
||||||
if (view.activeElement && document.body.contains(view.activeElement) && focusManager.isCurrentlyFocusable(view.activeElement)) {
|
if (view.activeElement && document.body.contains(view.activeElement) && focusManager.isCurrentlyFocusable(view.activeElement)) {
|
||||||
focusManager.focus(view.activeElement);
|
focusManager.focus(view.activeElement);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
|
||||||
}
|
}
|
||||||
|
|
||||||
userSettings.set(settingsKey + '-imageType', context.querySelector('.selectImageType').value);
|
userSettings.set(settingsKey + '-imageType', context.querySelector('.selectImageType').value);
|
||||||
}
|
}
|
||||||
|
|
||||||
function centerFocus(elem, horiz, on) {
|
function centerFocus(elem, horiz, on) {
|
||||||
require(['scrollHelper'], function (scrollHelper) {
|
require(['scrollHelper'], function (scrollHelper) {
|
||||||
|
|
|
||||||
|
|
@ -22,17 +22,17 @@ define(['dom'], function (dom) {
|
||||||
|
|
||||||
var windowSize = dom.getWindowSize();
|
var windowSize = dom.getWindowSize();
|
||||||
|
|
||||||
var vpWidth = windowSize.innerWidth,
|
var vpWidth = windowSize.innerWidth;
|
||||||
vpHeight = windowSize.innerHeight;
|
var vpHeight = windowSize.innerHeight;
|
||||||
|
|
||||||
// Use this native browser method, if available.
|
// Use this native browser method, if available.
|
||||||
var rec = elem.getBoundingClientRect(),
|
var rec = elem.getBoundingClientRect();
|
||||||
tViz = rec.top >= 0 && rec.top < vpHeight + thresholdY,
|
var tViz = rec.top >= 0 && rec.top < vpHeight + thresholdY;
|
||||||
bViz = rec.bottom > 0 && rec.bottom <= vpHeight + thresholdY,
|
var bViz = rec.bottom > 0 && rec.bottom <= vpHeight + thresholdY;
|
||||||
lViz = rec.left >= 0 && rec.left < vpWidth + thresholdX,
|
var lViz = rec.left >= 0 && rec.left < vpWidth + thresholdX;
|
||||||
rViz = rec.right > 0 && rec.right <= vpWidth + thresholdX,
|
var rViz = rec.right > 0 && rec.right <= vpWidth + thresholdX;
|
||||||
vVisible = partial ? tViz || bViz : tViz && bViz,
|
var vVisible = partial ? tViz || bViz : tViz && bViz;
|
||||||
hVisible = partial ? lViz || rViz : lViz && rViz;
|
var hVisible = partial ? lViz || rViz : lViz && rViz;
|
||||||
|
|
||||||
return vVisible && hVisible;
|
return vVisible && hVisible;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,6 @@ define(['require', 'events', 'browser', 'appRouter', 'loading'], function (requi
|
||||||
|
|
||||||
require(['queryString'], function (queryString) {
|
require(['queryString'], function (queryString) {
|
||||||
|
|
||||||
|
|
||||||
instance._currentSrc = options.url;
|
instance._currentSrc = options.url;
|
||||||
var params = queryString.parse(options.url.split('?')[1]);
|
var params = queryString.parse(options.url.split('?')[1]);
|
||||||
// 3. This function creates an <iframe> (and YouTube player)
|
// 3. This function creates an <iframe> (and YouTube player)
|
||||||
|
|
|
||||||
|
|
@ -525,7 +525,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (session.UserId && session.UserPrimaryImageTag) {
|
if (session.UserId && session.UserPrimaryImageTag) {
|
||||||
return ApiClient.getUserImageUrl(session.UserId, {
|
return ApiClient.getUserImageUrl(session.UserId, {
|
||||||
tag: session.UserPrimaryImageTag,
|
tag: session.UserPrimaryImageTag,
|
||||||
height: 24,
|
|
||||||
type: "Primary"
|
type: "Primary"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -631,7 +630,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && item.BackdropImageTags && item.BackdropImageTags.length) {
|
if (item && item.BackdropImageTags && item.BackdropImageTags.length) {
|
||||||
return ApiClient.getScaledImageUrl(item.Id, {
|
return ApiClient.getScaledImageUrl(item.Id, {
|
||||||
type: "Backdrop",
|
type: "Backdrop",
|
||||||
width: 275,
|
|
||||||
tag: item.BackdropImageTags[0]
|
tag: item.BackdropImageTags[0]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -639,7 +637,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
|
if (item && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
|
||||||
return ApiClient.getScaledImageUrl(item.ParentBackdropItemId, {
|
return ApiClient.getScaledImageUrl(item.ParentBackdropItemId, {
|
||||||
type: "Backdrop",
|
type: "Backdrop",
|
||||||
width: 275,
|
|
||||||
tag: item.ParentBackdropImageTags[0]
|
tag: item.ParentBackdropImageTags[0]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -647,7 +644,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && item.BackdropImageTag) {
|
if (item && item.BackdropImageTag) {
|
||||||
return ApiClient.getScaledImageUrl(item.BackdropItemId, {
|
return ApiClient.getScaledImageUrl(item.BackdropItemId, {
|
||||||
type: "Backdrop",
|
type: "Backdrop",
|
||||||
width: 275,
|
|
||||||
tag: item.BackdropImageTag
|
tag: item.BackdropImageTag
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -657,7 +653,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && imageTags.Thumb) {
|
if (item && imageTags.Thumb) {
|
||||||
return ApiClient.getScaledImageUrl(item.Id, {
|
return ApiClient.getScaledImageUrl(item.Id, {
|
||||||
type: "Thumb",
|
type: "Thumb",
|
||||||
width: 275,
|
|
||||||
tag: imageTags.Thumb
|
tag: imageTags.Thumb
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -665,7 +660,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && item.ParentThumbImageTag) {
|
if (item && item.ParentThumbImageTag) {
|
||||||
return ApiClient.getScaledImageUrl(item.ParentThumbItemId, {
|
return ApiClient.getScaledImageUrl(item.ParentThumbItemId, {
|
||||||
type: "Thumb",
|
type: "Thumb",
|
||||||
width: 275,
|
|
||||||
tag: item.ParentThumbImageTag
|
tag: item.ParentThumbImageTag
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -673,7 +667,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && item.ThumbImageTag) {
|
if (item && item.ThumbImageTag) {
|
||||||
return ApiClient.getScaledImageUrl(item.ThumbItemId, {
|
return ApiClient.getScaledImageUrl(item.ThumbItemId, {
|
||||||
type: "Thumb",
|
type: "Thumb",
|
||||||
width: 275,
|
|
||||||
tag: item.ThumbImageTag
|
tag: item.ThumbImageTag
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -681,7 +674,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && imageTags.Primary) {
|
if (item && imageTags.Primary) {
|
||||||
return ApiClient.getScaledImageUrl(item.Id, {
|
return ApiClient.getScaledImageUrl(item.Id, {
|
||||||
type: "Primary",
|
type: "Primary",
|
||||||
width: 275,
|
|
||||||
tag: imageTags.Primary
|
tag: imageTags.Primary
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -689,7 +681,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && item.PrimaryImageTag) {
|
if (item && item.PrimaryImageTag) {
|
||||||
return ApiClient.getScaledImageUrl(item.PrimaryImageItemId, {
|
return ApiClient.getScaledImageUrl(item.PrimaryImageItemId, {
|
||||||
type: "Primary",
|
type: "Primary",
|
||||||
width: 275,
|
|
||||||
tag: item.PrimaryImageTag
|
tag: item.PrimaryImageTag
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -697,7 +688,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
if (item && item.AlbumPrimaryImageTag) {
|
if (item && item.AlbumPrimaryImageTag) {
|
||||||
return ApiClient.getScaledImageUrl(item.AlbumId, {
|
return ApiClient.getScaledImageUrl(item.AlbumId, {
|
||||||
type: "Primary",
|
type: "Primary",
|
||||||
width: 275,
|
|
||||||
tag: item.AlbumPrimaryImageTag
|
tag: item.AlbumPrimaryImageTag
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate("Edit"),
|
name: globalize.translate("Edit"),
|
||||||
id: "open",
|
id: "open",
|
||||||
ironIcon: "mode-edit"
|
icon: "mode_edit"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -43,7 +43,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: globalize.translate("Delete"),
|
name: globalize.translate("Delete"),
|
||||||
id: "delete",
|
id: "delete",
|
||||||
ironIcon: "delete"
|
icon: "delete"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "apphost", "layoutManager", "focusManager", "emby-itemscontainer", "emby-scroller"], function(appRouter, cardBuilder, dom, globalize, connectionManager, appHost, layoutManager, focusManager) {
|
define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "apphost", "layoutManager", "focusManager", "emby-itemscontainer", "emby-scroller"], function (appRouter, cardBuilder, dom, globalize, connectionManager, appHost, layoutManager, focusManager) {
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
function enableScrollX() {
|
function enableScrollX() {
|
||||||
|
|
@ -22,92 +22,103 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap
|
||||||
name: "HeaderFavoriteMovies",
|
name: "HeaderFavoriteMovies",
|
||||||
types: "Movie",
|
types: "Movie",
|
||||||
shape: getPosterShape(),
|
shape: getPosterShape(),
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
showYear: !0,
|
showYear: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
centerText: !0
|
centerText: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteShows",
|
name: "HeaderFavoriteShows",
|
||||||
types: "Series",
|
types: "Series",
|
||||||
shape: getPosterShape(),
|
shape: getPosterShape(),
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
showYear: !0,
|
showYear: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
centerText: !0
|
centerText: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteEpisodes",
|
name: "HeaderFavoriteEpisodes",
|
||||||
types: "Episode",
|
types: "Episode",
|
||||||
shape: getThumbShape(),
|
shape: getThumbShape(),
|
||||||
preferThumb: !1,
|
preferThumb: false,
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
showParentTitle: !0,
|
showParentTitle: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
centerText: !0
|
centerText: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteVideos",
|
name: "HeaderFavoriteVideos",
|
||||||
types: "Video",
|
types: "Video",
|
||||||
shape: getThumbShape(),
|
shape: getThumbShape(),
|
||||||
preferThumb: !0,
|
preferThumb: true,
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
centerText: !0
|
centerText: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteCollections",
|
name: "HeaderFavoriteCollections",
|
||||||
types: "BoxSet",
|
types: "BoxSet",
|
||||||
shape: getPosterShape(),
|
shape: getPosterShape(),
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
centerText: !0
|
centerText: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoritePlaylists",
|
name: "HeaderFavoritePlaylists",
|
||||||
types: "Playlist",
|
types: "Playlist",
|
||||||
shape: getSquareShape(),
|
shape: getSquareShape(),
|
||||||
preferThumb: !1,
|
preferThumb: false,
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
showParentTitle: !1,
|
showParentTitle: false,
|
||||||
centerText: !0,
|
centerText: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
coverImage: !0
|
coverImage: true
|
||||||
|
}, {
|
||||||
|
name: "HeaderFavoritePeople",
|
||||||
|
types: "Person",
|
||||||
|
shape: getPosterShape(),
|
||||||
|
preferThumb: false,
|
||||||
|
showTitle: true,
|
||||||
|
overlayText: false,
|
||||||
|
showParentTitle: false,
|
||||||
|
centerText: true,
|
||||||
|
overlayPlayButton: true,
|
||||||
|
coverImage: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteArtists",
|
name: "HeaderFavoriteArtists",
|
||||||
types: "MusicArtist",
|
types: "MusicArtist",
|
||||||
shape: getSquareShape(),
|
shape: getSquareShape(),
|
||||||
preferThumb: !1,
|
preferThumb: false,
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
showParentTitle: !1,
|
showParentTitle: false,
|
||||||
centerText: !0,
|
centerText: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
coverImage: !0
|
coverImage: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteAlbums",
|
name: "HeaderFavoriteAlbums",
|
||||||
types: "MusicAlbum",
|
types: "MusicAlbum",
|
||||||
shape: getSquareShape(),
|
shape: getSquareShape(),
|
||||||
preferThumb: !1,
|
preferThumb: false,
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
showParentTitle: !0,
|
showParentTitle: true,
|
||||||
centerText: !0,
|
centerText: true,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: true,
|
||||||
coverImage: !0
|
coverImage: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteSongs",
|
name: "HeaderFavoriteSongs",
|
||||||
types: "Audio",
|
types: "Audio",
|
||||||
shape: getSquareShape(),
|
shape: getSquareShape(),
|
||||||
preferThumb: !1,
|
preferThumb: false,
|
||||||
showTitle: !0,
|
showTitle: true,
|
||||||
overlayText: !1,
|
overlayText: false,
|
||||||
showParentTitle: !0,
|
showParentTitle: true,
|
||||||
centerText: !0,
|
centerText: true,
|
||||||
overlayMoreButton: !0,
|
overlayMoreButton: true,
|
||||||
action: "instantmix",
|
action: "instantmix",
|
||||||
coverImage: !0
|
coverImage: true
|
||||||
}, {
|
}, {
|
||||||
name: "HeaderFavoriteBooks",
|
name: "HeaderFavoriteBooks",
|
||||||
types: "Book",
|
types: "Book",
|
||||||
|
|
@ -117,59 +128,82 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap
|
||||||
overlayPlayButton: true,
|
overlayPlayButton: true,
|
||||||
overlayText: false,
|
overlayText: false,
|
||||||
centerText: true
|
centerText: true
|
||||||
}]
|
}];
|
||||||
}
|
}
|
||||||
|
|
||||||
function getFetchDataFn(section) {
|
function getFetchDataFn(section) {
|
||||||
return function() {
|
return function () {
|
||||||
var apiClient = this.apiClient,
|
var apiClient = this.apiClient;
|
||||||
options = {
|
var options = {
|
||||||
SortBy: (section.types, "SeriesName,SortName"),
|
SortBy: (section.types, "SeriesName,SortName"),
|
||||||
SortOrder: "Ascending",
|
SortOrder: "Ascending",
|
||||||
Filters: "IsFavorite",
|
Filters: "IsFavorite",
|
||||||
Recursive: !0,
|
Recursive: true,
|
||||||
Fields: "PrimaryImageAspectRatio,BasicSyncInfo",
|
Fields: "PrimaryImageAspectRatio,BasicSyncInfo",
|
||||||
CollapseBoxSetItems: !1,
|
CollapseBoxSetItems: false,
|
||||||
ExcludeLocationTypes: "Virtual",
|
ExcludeLocationTypes: "Virtual",
|
||||||
EnableTotalRecordCount: !1
|
EnableTotalRecordCount: false
|
||||||
};
|
};
|
||||||
options.Limit = 20;
|
options.Limit = 20;
|
||||||
var userId = apiClient.getCurrentUserId();
|
var userId = apiClient.getCurrentUserId();
|
||||||
return "MusicArtist" === section.types ? apiClient.getArtists(userId, options) : (options.IncludeItemTypes = section.types, apiClient.getItems(userId, options))
|
|
||||||
}
|
if ("MusicArtist" === section.types) {
|
||||||
|
return apiClient.getArtists(userId, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("Person" === section.types) {
|
||||||
|
return apiClient.getPeople(userId, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
options.IncludeItemTypes = section.types;
|
||||||
|
return apiClient.getItems(userId, options);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function getRouteUrl(section, serverId) {
|
function getRouteUrl(section, serverId) {
|
||||||
return appRouter.getRouteUrl("list", {
|
return appRouter.getRouteUrl("list", {
|
||||||
serverId: serverId,
|
serverId: serverId,
|
||||||
itemTypes: section.types,
|
itemTypes: section.types,
|
||||||
isFavorite: !0
|
isFavorite: true
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function getItemsHtmlFn(section) {
|
function getItemsHtmlFn(section) {
|
||||||
return function(items) {
|
return function (items) {
|
||||||
var supportsImageAnalysis = appHost.supports("imageanalysis"),
|
var supportsImageAnalysis = appHost.supports("imageanalysis");
|
||||||
cardLayout = (appHost.preferVisualCards || supportsImageAnalysis) && section.autoCardLayout && section.showTitle;
|
var cardLayout = (appHost.preferVisualCards || supportsImageAnalysis) && section.autoCardLayout && section.showTitle;
|
||||||
cardLayout = !1;
|
cardLayout = false;
|
||||||
var serverId = this.apiClient.serverId(),
|
var serverId = this.apiClient.serverId();
|
||||||
leadingButtons = layoutManager.tv ? [{
|
var leadingButtons = layoutManager.tv ? [{
|
||||||
name: globalize.translate("All"),
|
name: globalize.translate("All"),
|
||||||
id: "more",
|
id: "more",
|
||||||
icon: "favorite",
|
icon: "favorite",
|
||||||
routeUrl: getRouteUrl(section, serverId)
|
routeUrl: getRouteUrl(section, serverId)
|
||||||
}] : null,
|
}] : null;
|
||||||
lines = 0;
|
var lines = 0;
|
||||||
return section.showTitle && lines++, section.showYear && lines++, section.showParentTitle && lines++, cardBuilder.getCardsHtml({
|
|
||||||
|
if (section.showTitle) {
|
||||||
|
lines++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (section.showYear) {
|
||||||
|
lines++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (section.showParentTitle) {
|
||||||
|
lines++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return cardBuilder.getCardsHtml({
|
||||||
items: items,
|
items: items,
|
||||||
preferThumb: section.preferThumb,
|
preferThumb: section.preferThumb,
|
||||||
shape: section.shape,
|
shape: section.shape,
|
||||||
centerText: section.centerText && !cardLayout,
|
centerText: section.centerText && !cardLayout,
|
||||||
overlayText: !1 !== section.overlayText,
|
overlayText: false !== section.overlayText,
|
||||||
showTitle: section.showTitle,
|
showTitle: section.showTitle,
|
||||||
showYear: section.showYear,
|
showYear: section.showYear,
|
||||||
showParentTitle: section.showParentTitle,
|
showParentTitle: section.showParentTitle,
|
||||||
scalable: !0,
|
scalable: true,
|
||||||
coverImage: section.coverImage,
|
coverImage: section.coverImage,
|
||||||
overlayPlayButton: section.overlayPlayButton,
|
overlayPlayButton: section.overlayPlayButton,
|
||||||
overlayMoreButton: section.overlayMoreButton && !cardLayout,
|
overlayMoreButton: section.overlayMoreButton && !cardLayout,
|
||||||
|
|
@ -178,39 +212,100 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap
|
||||||
cardLayout: cardLayout,
|
cardLayout: cardLayout,
|
||||||
leadingButtons: leadingButtons,
|
leadingButtons: leadingButtons,
|
||||||
lines: lines
|
lines: lines
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function FavoritesTab(view, params) {
|
function FavoritesTab(view, params) {
|
||||||
this.view = view, this.params = params, this.apiClient = connectionManager.currentApiClient(), this.sectionsContainer = view.querySelector(".sections"), createSections(this, this.sectionsContainer, this.apiClient)
|
this.view = view;
|
||||||
|
this.params = params;
|
||||||
|
this.apiClient = connectionManager.currentApiClient();
|
||||||
|
this.sectionsContainer = view.querySelector(".sections");
|
||||||
|
createSections(this, this.sectionsContainer, this.apiClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
function createSections(instance, elem, apiClient) {
|
function createSections(instance, elem, apiClient) {
|
||||||
var i, length, sections = getSections(),
|
var i;
|
||||||
html = "";
|
var length;
|
||||||
|
var sections = getSections();
|
||||||
|
var html = "";
|
||||||
|
|
||||||
for (i = 0, length = sections.length; i < length; i++) {
|
for (i = 0, length = sections.length; i < length; i++) {
|
||||||
var section = sections[i],
|
var section = sections[i];
|
||||||
sectionClass = "verticalSection";
|
var sectionClass = "verticalSection";
|
||||||
section.showTitle || (sectionClass += " verticalSection-extrabottompadding"), html += '<div class="' + sectionClass + ' hide">', html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">', layoutManager.tv ? html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>" : (html += '<a is="emby-linkbutton" href="' + getRouteUrl(section, apiClient.serverId()) + '" class="more button-flat button-flat-mini sectionTitleTextButton">', html += '<h2 class="sectionTitle sectionTitle-cards">', html += globalize.translate(section.name), html += "</h2>", html += '<i class="md-icon">chevron_right</i>', html += "</a>"), html += "</div>", html += '<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-mousewheel="false" data-centerfocus="true"><div is="emby-itemscontainer" class="itemsContainer scrollSlider focuscontainer-x padded-left padded-right" data-monitor="markfavorite"></div></div>', html += "</div>"
|
|
||||||
|
if (!section.showTitle) {
|
||||||
|
sectionClass += " verticalSection-extrabottompadding";
|
||||||
|
}
|
||||||
|
|
||||||
|
html += '<div class="' + sectionClass + ' hide">';
|
||||||
|
html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
|
||||||
|
|
||||||
|
if (layoutManager.tv) {
|
||||||
|
html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>";
|
||||||
|
} else {
|
||||||
|
html += '<a is="emby-linkbutton" href="' + getRouteUrl(section, apiClient.serverId()) + '" class="more button-flat button-flat-mini sectionTitleTextButton">';
|
||||||
|
html += '<h2 class="sectionTitle sectionTitle-cards">';
|
||||||
|
html += globalize.translate(section.name);
|
||||||
|
html += "</h2>";
|
||||||
|
html += '<i class="md-icon">chevron_right</i>';
|
||||||
|
html += "</a>";
|
||||||
|
}
|
||||||
|
|
||||||
|
html += "</div>";
|
||||||
|
html += '<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-mousewheel="false" data-centerfocus="true"><div is="emby-itemscontainer" class="itemsContainer scrollSlider focuscontainer-x" data-monitor="markfavorite"></div></div>';
|
||||||
|
html += "</div>";
|
||||||
}
|
}
|
||||||
|
|
||||||
elem.innerHTML = html;
|
elem.innerHTML = html;
|
||||||
var elems = elem.querySelectorAll(".itemsContainer");
|
var elems = elem.querySelectorAll(".itemsContainer");
|
||||||
|
|
||||||
for (i = 0, length = elems.length; i < length; i++) {
|
for (i = 0, length = elems.length; i < length; i++) {
|
||||||
var itemsContainer = elems[i];
|
var itemsContainer = elems[i];
|
||||||
itemsContainer.fetchData = getFetchDataFn(sections[i]).bind(instance), itemsContainer.getItemsHtml = getItemsHtmlFn(sections[i]).bind(instance), itemsContainer.parentContainer = dom.parentWithClass(itemsContainer, "verticalSection")
|
itemsContainer.fetchData = getFetchDataFn(sections[i]).bind(instance);
|
||||||
|
itemsContainer.getItemsHtml = getItemsHtmlFn(sections[i]).bind(instance);
|
||||||
|
itemsContainer.parentContainer = dom.parentWithClass(itemsContainer, "verticalSection");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return FavoritesTab.prototype.onResume = function(options) {
|
|
||||||
for (var promises = (this.apiClient, []), view = this.view, elems = this.sectionsContainer.querySelectorAll(".itemsContainer"), i = 0, length = elems.length; i < length; i++) promises.push(elems[i].resume(options));
|
FavoritesTab.prototype.onResume = function (options) {
|
||||||
Promise.all(promises).then(function() {
|
var promises = (this.apiClient, []);
|
||||||
options.autoFocus && focusManager.autoFocus(view)
|
var view = this.view;
|
||||||
})
|
var elems = this.sectionsContainer.querySelectorAll(".itemsContainer");
|
||||||
}, FavoritesTab.prototype.onPause = function() {
|
|
||||||
for (var elems = this.sectionsContainer.querySelectorAll(".itemsContainer"), i = 0, length = elems.length; i < length; i++) elems[i].pause()
|
for (var i = 0, length = elems.length; i < length; i++) {
|
||||||
}, FavoritesTab.prototype.destroy = function() {
|
promises.push(elems[i].resume(options));
|
||||||
this.view = null, this.params = null, this.apiClient = null;
|
}
|
||||||
for (var elems = this.sectionsContainer.querySelectorAll(".itemsContainer"), i = 0, length = elems.length; i < length; i++) elems[i].fetchData = null, elems[i].getItemsHtml = null, elems[i].parentContainer = null;
|
|
||||||
this.sectionsContainer = null
|
Promise.all(promises).then(function () {
|
||||||
}, FavoritesTab
|
if (options.autoFocus) {
|
||||||
|
focusManager.autoFocus(view);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
FavoritesTab.prototype.onPause = function () {
|
||||||
|
var elems = this.sectionsContainer.querySelectorAll(".itemsContainer");
|
||||||
|
|
||||||
|
for (var i = 0, length = elems.length; i < length; i++) {
|
||||||
|
elems[i].pause();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
FavoritesTab.prototype.destroy = function () {
|
||||||
|
this.view = null;
|
||||||
|
this.params = null;
|
||||||
|
this.apiClient = null;
|
||||||
|
var elems = this.sectionsContainer.querySelectorAll(".itemsContainer");
|
||||||
|
|
||||||
|
for (var i = 0, length = elems.length; i < length; i++) {
|
||||||
|
elems[i].fetchData = null;
|
||||||
|
elems[i].getItemsHtml = null;
|
||||||
|
elems[i].parentContainer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.sectionsContainer = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
return FavoritesTab;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue