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

merge remote-tracking branch 'upstream/master' into firefox

Browse source
This commit is contained in:
dkanada 2019-12-03 23:14:20 +09:00
commit 69b90fa9cb
212 changed files with 4277 additions and 1769 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.eslintignore Normal file
View file

@ -0,0 +1 @@
libraries/

23
.eslintrc.yml
View file

@ -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"]

63
README.md
View file

@ -1,16 +1,65 @@
<h1 align="center">Jellyfin Web</h1> <h1 align="center">Jellyfin Web</h1>
<h3 align="center">The Free Software Media System</h3> <h3 align="center">Part of the <a href="https://jellyfin.org">Jellyfin Project</a></h3>
--- ---
<p align="center"> <p align="center">
<img alt="Logo Banner" src="https://raw.githubusercontent.com/jellyfin/jellyfin-ux/master/branding/SVG/banner-logo-solid.svg?sanitize=true"/> <img alt="Logo Banner" src="https://raw.githubusercontent.com/jellyfin/jellyfin-ux/master/branding/SVG/banner-logo-solid.svg?sanitize=true"/>
<br/><br/> <br/>
<a href="https://github.com/jellyfin/jellyfin-web"><img alt="GPL 2.0 License" src="https://img.shields.io/github/license/jellyfin/jellyfin-web.svg"/></a> <br/>
<a href="https://github.com/jellyfin/jellyfin-web/releases"><img alt="Current Release" src="https://img.shields.io/github/release/jellyfin/jellyfin-web.svg"/></a> <a href="https://github.com/jellyfin/jellyfin-web">
<a href="https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/?utm_source=widget"><img src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-web/svg-badge.svg" alt="Translation status" /></a> <img alt="GPL 2.0 License" src="https://img.shields.io/github/license/jellyfin/jellyfin-web.svg"/>
</a>
<a href="https://github.com/jellyfin/jellyfin-web/releases">
<img alt="Current Release" src="https://img.shields.io/github/release/jellyfin/jellyfin-web.svg"/>
</a>
<a href="https://translate.jellyfin.org/projects/jellyfin/jellyfin-web/?utm_source=widget">
<img src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-web/svg-badge.svg" alt="Translation Status"/>
</a>
</br>
<a href="https://opencollective.com/jellyfin">
<img alt="Donate" src="https://img.shields.io/opencollective/all/jellyfin.svg?label=backers"/>
</a>
<a href="https://features.jellyfin.org">
<img alt="Feature Requests" src="https://img.shields.io/badge/fider-vote%20on%20features-success.svg"/>
</a>
<a href="https://forum.jellyfin.org">
<img alt="Discuss on our Forum" src="https://img.shields.io/discourse/https/forum.jellyfin.org/users.svg"/>
</a>
<a href="https://matrix.to/#/+jellyfin:matrix.org">
<img alt="Chat on Matrix" src="https://img.shields.io/matrix/jellyfin:matrix.org.svg?logo=matrix"/>
</a>
<a href="https://www.reddit.com/r/jellyfin">
<img alt="Join our Subreddit" src="https://img.shields.io/badge/reddit-r%2Fjellyfin-%23FF5700.svg"/>
</a>
</p> </p>
--- Jellyfin Web is the frontend used for most of the clients available for end users, such as desktop browsers, Android, and iOS. We welcome all contributions and pull requests! If you have a larger feature in mind please open an issue so we can discuss the implementation before you start. Translations can be improved very easily from our <a href="https://translate.jellyfin.org/projects/jellyfin/jellyfin-web">Weblate</a> instance. Look through the following graphic to see if your native language could use some work!
<a href="https://translate.jellyfin.org/engage/jellyfin/?utm_source=widget">
<img src="https://translate.jellyfin.org/widgets/jellyfin/-/jellyfin-web/multi-auto.svg" alt="Detailed Translation Status"/>
</a>
## Build Process
### Dependencies
- Yarn
### Getting Started
1. Clone or download this repository.
```sh
git clone https://github.com/jellyfin/jellyfin-web.git
cd jellyfin-web
```
2. Install build dependencies in the project directory via npm.
```sh
yarn install
```
3. Run webpack dev server
```sh
yarn serve
```
Jellyfin is a free software media system that puts you in control of managing and streaming your media.

2
package.json
View file

@ -10,9 +10,11 @@
"css-loader": "^2.1.0", "css-loader": "^2.1.0",
"eslint": "^5.16.0", "eslint": "^5.16.0",
"file-loader": "^3.0.1", "file-loader": "^3.0.1",
"html-webpack-plugin": "^3.2.0",
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"webpack": "^4.41.0", "webpack": "^4.41.0",
"webpack-cli": "^3.3.9", "webpack-cli": "^3.3.9",
"webpack-concat-plugin": "^3.0.0",
"webpack-dev-server": "^3.8.1", "webpack-dev-server": "^3.8.1",
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2"
}, },

56
src/bundle.js
View file

@ -6,59 +6,87 @@ var _define = window.define;
// document-register-element // document-register-element
var docRegister = require("document-register-element"); var docRegister = require("document-register-element");
_define("document-register-element", function() { return docRegister; }); _define("document-register-element", function() {
return docRegister;
});
// fetch // fetch
var fetch = require("whatwg-fetch"); var fetch = require("whatwg-fetch");
_define("fetch", function() { return 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 // native-promise-only
var nativePromise = require("native-promise-only"); var nativePromise = require("native-promise-only");
_define("native-promise-only", function() { return nativePromise; }); _define("native-promise-only", function() {
return nativePromise;
});
// resize-observer-polyfill // resize-observer-polyfill
var resize = require("resize-observer-polyfill"); var resize = require("resize-observer-polyfill");
_define("resize-observer-polyfill", function() { return resize; }); _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 // webcomponents
var webcomponents = require("webcomponents.js-2"); var webcomponents = require("webcomponents.js-2");
_define("webcomponents", function() { return webcomponents }); _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;
});

6
src/components/accessschedule/accessschedule.template.html
View file

@ -1,5 +1,7 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
<i class="md-icon">arrow_back</i>
</button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${HeaderAccessSchedule} ${HeaderAccessSchedule}
</h3> </h3>
@ -36,4 +38,4 @@
</div> </div>
</form> </form>
</div> </div>
</div> </div>

11
src/components/actionsheet/actionsheet.js
View file

@ -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;
@ -156,7 +158,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
} }
if (layoutManager.tv) { if (layoutManager.tv) {
html += '<button is="paper-icon-button-light" class="btnCloseActionSheet hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCloseActionSheet hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
} }
// If any items have an icon, give them all an icon just to make sure they're all lined up evenly // If any items have an icon, give them all an icon just to make sure they're all lined up evenly
@ -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>';
} }
@ -356,4 +357,4 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
return { return {
show: show show: show
}; };
}); });

2
src/components/alert.js
View file

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

15
src/components/alphapicker/alphapicker.js
View file

@ -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');
} }
@ -69,8 +67,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
html += '<div class="' + rowClassName + '">'; html += '<div class="' + rowClassName + '">';
if (options.mode === 'keyboard') { if (options.mode === 'keyboard') {
// space_bar icon html += '<button data-value=" " is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">space_bar</i></button>';
html += '<button data-value=" " is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">&#xE256;</i></button>';
} else { } else {
letters = ['#']; letters = ['#'];
html += mapLetters(letters, vertical).join(''); html += mapLetters(letters, vertical).join('');
@ -80,8 +77,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
html += mapLetters(letters, vertical).join(''); html += mapLetters(letters, vertical).join('');
if (options.mode === 'keyboard') { if (options.mode === 'keyboard') {
// backspace icon html += '<button data-value="backspace" is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">backspace</i></button>';
html += '<button data-value="backspace" is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">&#xE14A;</i></button>';
html += '</div>'; html += '</div>';
letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']; letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
@ -230,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) {
@ -321,4 +318,4 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
}; };
return AlphaPicker; return AlphaPicker;
}); });

2
src/components/apphost.js
View file

@ -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;

101
src/components/autoFocuser.js Normal file
View file

@ -0,0 +1,101 @@
define(["focusManager", "layoutManager"], function (focusManager, layoutManager) {
"use strict";
/**
* Previously selected element.
*/
var activeElement;
/**
* Returns true if AutoFocuser is enabled.
*/
function isEnabled() {
return layoutManager.tv;
}
/**
* Start AutoFocuser
*/
function enable() {
if (!isEnabled()) {
return;
}
window.addEventListener("focusin", function (e) {
activeElement = e.target;
});
console.log("AutoFocuser enabled");
}
/**
* Create an array from some source.
*/
var arrayFrom = Array.prototype.from || function (src) {
return Array.prototype.slice.call(src);
}
/**
* Set focus on a suitable element, taking into account the previously selected.
*/
function autoFocus(container) {
if (!isEnabled()) {
return;
}
container = container || document.body;
var candidates = [];
if (activeElement) {
// These elements are recreated
if (activeElement.classList.contains("btnPreviousPage")) {
candidates.push(container.querySelector(".btnPreviousPage"));
candidates.push(container.querySelector(".btnNextPage"));
} else if (activeElement.classList.contains("btnNextPage")) {
candidates.push(container.querySelector(".btnNextPage"));
candidates.push(container.querySelector(".btnPreviousPage"));
} else if (activeElement.classList.contains("btnSelectView")) {
candidates.push(container.querySelector(".btnSelectView"));
}
candidates.push(activeElement);
}
candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnResume")));
candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnPlay")));
var focusedElement;
candidates.every(function (element) {
if (focusManager.isCurrentlyFocusable(element)) {
focusManager.focus(element);
focusedElement = element;
return false;
}
return true;
});
if (!focusedElement) {
// FIXME: Multiple itemsContainers
var itemsContainer = container.querySelector(".itemsContainer");
if (itemsContainer) {
focusedElement = focusManager.autoFocus(itemsContainer);
}
}
if (!focusedElement) {
focusedElement = focusManager.autoFocus(container);
}
return focusedElement;
}
return {
isEnabled: isEnabled,
enable: enable,
autoFocus: autoFocus
};
});

2
src/components/cardbuilder/card.css
View file

@ -145,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;

89
src/components/cardbuilder/cardBuilder.js
View file

@ -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);
} }
} }
@ -767,7 +758,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (isOuterFooter && options.cardLayout && layoutManager.mobile) { if (isOuterFooter && options.cardLayout && layoutManager.mobile) {
if (options.cardFooterAside !== 'none') { if (options.cardFooterAside !== 'none') {
html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu"><i class="md-icon">&#xE5D3;</i></button>'; html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu"><i class="md-icon">more_horiz</i></button>';
} }
} }
@ -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>';
@ -1332,15 +1315,15 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
var btnCssClass = 'cardOverlayButton cardOverlayButton-br itemAction'; var btnCssClass = 'cardOverlayButton cardOverlayButton-br itemAction';
if (options.centerPlayButton) { if (options.centerPlayButton) {
overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayButton-centered" data-action="play"><i class="md-icon cardOverlayButtonIcon">&#xE037;</i></button>'; overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayButton-centered" data-action="play"><i class="md-icon cardOverlayButtonIcon">play_arrow</i></button>';
} }
if (overlayPlayButton && !item.IsPlaceHolder && (item.LocationType !== 'Virtual' || !item.MediaType || item.Type === 'Program') && item.Type !== 'Person') { if (overlayPlayButton && !item.IsPlaceHolder && (item.LocationType !== 'Virtual' || !item.MediaType || item.Type === 'Program') && item.Type !== 'Person') {
overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="play"><i class="md-icon cardOverlayButtonIcon">&#xE037;</i></button>'; overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="play"><i class="md-icon cardOverlayButtonIcon">play_arrow</i></button>';
} }
if (options.overlayMoreButton) { if (options.overlayMoreButton) {
overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon">&#xE5D3;</i></button>'; overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon">more_horiz</i></button>';
} }
} }
@ -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);
} }
@ -1474,7 +1456,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
var btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction paper-icon-button-light'; var btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction paper-icon-button-light';
if (playbackManager.canPlay(item)) { if (playbackManager.canPlay(item)) {
html += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayFab-primary" data-action="resume"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE037;</i></button>'; html += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayFab-primary" data-action="resume"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">play_arrow</i></button>';
} }
html += '<div class="cardOverlayButton-br">'; html += '<div class="cardOverlayButton-br">';
@ -1483,7 +1465,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (itemHelper.canMarkPlayed(item)) { if (itemHelper.canMarkPlayed(item)) {
require(['emby-playstatebutton']); require(['emby-playstatebutton']);
html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE5CA;</i></button>'; html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">check</i></button>';
} }
if (itemHelper.canRate(item)) { if (itemHelper.canRate(item)) {
@ -1491,10 +1473,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
var likes = userData.Likes == null ? '' : userData.Likes; var likes = userData.Likes == null ? '' : userData.Likes;
require(['emby-ratingbutton']); require(['emby-ratingbutton']);
html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE87D;</i></button>'; html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">favorite</i></button>';
} }
html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE5D3;</i></button>'; html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">more_horiz</i></button>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
@ -1507,10 +1489,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
return '<i class="cardImageIcon md-icon">' + imageHelper.getLibraryIcon(item.CollectionType) + '</i>' return '<i class="cardImageIcon md-icon">' + imageHelper.getLibraryIcon(item.CollectionType) + '</i>'
} }
if (item.Type === 'MusicAlbum') { if (item.Type === 'MusicAlbum') {
return '<i class="cardImageIcon md-icon">&#xE019;</i>'; return '<i class="cardImageIcon md-icon">album</i>';
} }
if (item.Type === 'MusicArtist' || item.Type === 'Person') { if (item.Type === 'MusicArtist' || item.Type === 'Person') {
return '<i class="cardImageIcon md-icon">&#xE7FD;</i>'; return '<i class="cardImageIcon md-icon">person</i>';
} }
if (options.defaultCardImageIcon) { if (options.defaultCardImageIcon) {
return '<i class="cardImageIcon md-icon">' + options.defaultCardImageIcon + '</i>'; return '<i class="cardImageIcon md-icon">' + options.defaultCardImageIcon + '</i>';
@ -1602,7 +1584,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
indicatorsElem = ensureIndicators(card, indicatorsElem); indicatorsElem = ensureIndicators(card, indicatorsElem);
indicatorsElem.appendChild(playedIndicator); indicatorsElem.appendChild(playedIndicator);
} }
playedIndicator.innerHTML = '<i class="md-icon indicatorIcon">&#xE5CA;</i>'; playedIndicator.innerHTML = '<i class="md-icon indicatorIcon">check</i>';
} else { } else {
playedIndicator = card.querySelector('.playedIndicator'); playedIndicator = card.querySelector('.playedIndicator');
@ -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) {
@ -1684,7 +1665,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
var icon = cell.querySelector('.timerIndicator'); var icon = cell.querySelector('.timerIndicator');
if (!icon) { if (!icon) {
var indicatorsElem = ensureIndicators(cell); var indicatorsElem = ensureIndicators(cell);
indicatorsElem.insertAdjacentHTML('beforeend', '<i class="md-icon timerIndicator indicatorIcon">&#xE061;</i>'); indicatorsElem.insertAdjacentHTML('beforeend', '<i class="md-icon timerIndicator indicatorIcon">fiber_manual_record</i>');
} }
cell.setAttribute('data-timerid', newTimerId); cell.setAttribute('data-timerid', newTimerId);
} }

4
src/components/cardbuilder/peoplecardbuilder.js
View file

@ -10,7 +10,7 @@ define(['cardBuilder'], function (cardBuilder) {
cardFooterAside: 'none', cardFooterAside: 'none',
showPersonRoleOrType: true, showPersonRoleOrType: true,
cardCssClass: 'personCard', cardCssClass: 'personCard',
defaultCardImageIcon: '&#xE7FD;' defaultCardImageIcon: 'person'
}); });
cardBuilder.buildCards(items, options); cardBuilder.buildCards(items, options);
} }
@ -19,4 +19,4 @@ define(['cardBuilder'], function (cardBuilder) {
buildPeopleCards: buildPeopleCards buildPeopleCards: buildPeopleCards
}; };
}); });

2
src/components/channelmapper/channelmapper.js
View file

@ -127,7 +127,7 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
var html = ""; var html = "";
var title = globalize.translate("MapChannels"); var title = globalize.translate("MapChannels");
html += '<div class="formDialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '<h3 class="formDialogHeaderTitle">'; html += '<h3 class="formDialogHeaderTitle">';
html += title; html += title;
html += "</h3>"; html += "</h3>";

22
src/components/chromecast/chromecasthelpers.js
View file

@ -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

9
src/components/chromecast/chromecastplayer.js
View file

@ -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;

6
src/components/collectioneditor/collectioneditor.js
View file

@ -243,13 +243,13 @@ define(['dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManage
var title = items.length ? globalize.translate('HeaderAddToCollection') : globalize.translate('NewCollection'); var title = items.length ? globalize.translate('HeaderAddToCollection') : globalize.translate('NewCollection');
html += '<div class="formDialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '<h3 class="formDialogHeaderTitle">'; html += '<h3 class="formDialogHeaderTitle">';
html += title; html += title;
html += '</h3>'; html += '</h3>';
if (appHost.supports('externallinks')) { if (appHost.supports('externallinks')) {
html += '<a is="emby-linkbutton" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="' + globalize.translate('Help') + '"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">' + globalize.translate('Help') + '</span></a>'; html += '<a is="emby-linkbutton" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="' + globalize.translate('Help') + '"><i class="md-icon">info</i><span style="margin-left:.25em;">' + globalize.translate('Help') + '</span></a>';
} }
html += '</div>'; html += '</div>';
@ -284,4 +284,4 @@ define(['dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManage
}; };
return CollectionEditor; return CollectionEditor;
}); });

3
src/components/dialog/dialog.js
View file

@ -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;

10
src/components/dialogHelper/dialogHelper.js
View file

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

16
src/components/directorybrowser/directorybrowser.js
View file

@ -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");
@ -265,7 +265,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
var html = ""; var html = "";
html += '<div class="formDialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '<h3 class="formDialogHeaderTitle">'; html += '<h3 class="formDialogHeaderTitle">';
html += options.header || Globalize.translate("HeaderSelectPath"); html += options.header || Globalize.translate("HeaderSelectPath");
html += "</h3>"; html += "</h3>";

12
src/components/dom.js
View file

@ -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",

2
src/components/emby-checkbox/emby-checkbox.js
View file

@ -54,7 +54,7 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
outlineClass += ' ' + customClass; outlineClass += ' ' + customClass;
} }
var checkedIcon = this.getAttribute('data-checkedicon') || '&#xE5CA;'; var checkedIcon = this.getAttribute('data-checkedicon') || 'check';
var uncheckedIcon = this.getAttribute('data-uncheckedicon') || ''; var uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
var checkHtml = '<i class="md-icon checkboxIcon checkboxIcon-checked">' + checkedIcon + '</i>'; var checkHtml = '<i class="md-icon checkboxIcon checkboxIcon-checked">' + checkedIcon + '</i>';
var uncheckedHtml = '<i class="md-icon checkboxIcon checkboxIcon-unchecked">' + uncheckedIcon + '</i>'; var uncheckedHtml = '<i class="md-icon checkboxIcon checkboxIcon-unchecked">' + uncheckedIcon + '</i>';

5
src/components/emby-input/emby-input.js
View file

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

10
src/components/emby-progressring/emby-progressring.js
View file

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

4
src/components/emby-scrollbuttons/emby-scrollbuttons.js
View file

@ -7,7 +7,7 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
function getScrollButtonHtml(direction) { function getScrollButtonHtml(direction) {
var html = ''; var html = '';
var icon = direction === 'left' ? '&#xE5CB;' : '&#xE5CC;'; var icon = direction === 'left' ? 'chevron_left' : 'chevron_right';
html += '<button type="button" is="paper-icon-button-light" data-ripple="false" data-direction="' + direction + '" class="emby-scrollbuttons-button">'; html += '<button type="button" is="paper-icon-button-light" data-ripple="false" data-direction="' + direction + '" class="emby-scrollbuttons-button">';
html += '<i class="md-icon">' + icon + '</i>'; html += '<i class="md-icon">' + icon + '</i>';
@ -175,4 +175,4 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
prototype: EmbyScrollButtonsPrototype, prototype: EmbyScrollButtonsPrototype,
extends: 'div' extends: 'div'
}); });
}); });

2
src/components/emby-select/emby-select.js
View file

@ -144,7 +144,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
this.parentNode.insertBefore(label, this); this.parentNode.insertBefore(label, this);
if (this.classList.contains('emby-select-withcolor')) { if (this.classList.contains('emby-select-withcolor')) {
this.parentNode.insertAdjacentHTML('beforeend', '<div class="selectArrowContainer"><div style="visibility:hidden;">0</div><i class="selectArrow md-icon">&#xE313;</i></div>'); this.parentNode.insertAdjacentHTML('beforeend', '<div class="selectArrowContainer"><div style="visibility:hidden;">0</div><i class="selectArrow md-icon">keyboard_arrow_down</i></div>');
} }
}; };

2
src/components/emby-tabs/emby-tabs.js
View file

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

12
src/components/emby-textarea/emby-textarea.js
View file

@ -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*/;

2
src/components/favoriteitems.js
View file

@ -136,7 +136,7 @@ define(["loading", "libraryBrowser", "cardBuilder", "dom", "apphost", "imageLoad
html += '<h2 class="sectionTitle sectionTitle-cards">'; html += '<h2 class="sectionTitle sectionTitle-cards">';
html += globalize.translate(section.name); html += globalize.translate(section.name);
html += "</h2>"; html += "</h2>";
html += '<i class="md-icon">&#xE5CC;</i>'; html += '<i class="md-icon">chevron_right</i>';
html += "</a>"; html += "</a>";
} else { } else {
html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>"; html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>";

10
src/components/filtermenu/filtermenu.js
View file

@ -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') {
@ -277,7 +279,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
var html = ''; var html = '';
html += '<div class="formDialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '<h3 class="formDialogHeaderTitle">${Filters}</h3>'; html += '<h3 class="formDialogHeaderTitle">${Filters}</h3>';
html += '</div>'; html += '</div>';
@ -345,4 +347,4 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
}; };
return FilterMenu; return FilterMenu;
}); });

53
src/components/focusManager.js
View file

@ -1,4 +1,4 @@
define(['dom'], function (dom) { define(['dom', 'scrollManager'], function (dom, scrollManager) {
'use strict'; 'use strict';
var scopes = []; var scopes = [];
@ -40,7 +40,7 @@ define(['dom'], function (dom) {
try { try {
element.focus({ element.focus({
preventScroll: false preventScroll: scrollManager.isEnabled()
}); });
} catch (err) { } catch (err) {
console.log('Error in focusManager.autoFocus: ' + err); console.log('Error in focusManager.autoFocus: ' + err);
@ -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,

2
src/components/fullscreenManager.js
View file

@ -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 */

6
src/components/guide/guide-settings.js
View file

@ -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++) {

4
src/components/guide/guide-settings.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${Settings} ${Settings}
</h3> </h3>
@ -65,4 +65,4 @@
</div> </div>
</form> </form>
</div> </div>

68
src/components/guide/guide.js
View file

@ -277,7 +277,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
var nextDay = new Date(date.getTime() + msPerDay - 2000); var nextDay = new Date(date.getTime() + msPerDay - 2000);
// Normally we'd want to just let responsive css handle this, // Normally we'd want to just let responsive css handle this,
// but since mobile browsers are often underpowered, // but since mobile browsers are often underpowered,
// it can help performance to get them out of the markup // it can help performance to get them out of the markup
var allowIndicators = dom.getWindowSize().innerWidth >= 600; var allowIndicators = dom.getWindowSize().innerWidth >= 600;
@ -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;
@ -423,30 +416,27 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
var status; var status;
if (item.Type === 'SeriesTimer') { if (item.Type === 'SeriesTimer') {
return '<i class="md-icon programIcon seriesTimerIcon">&#xE062;</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 '';
} }
if (item.SeriesTimerId) { if (item.SeriesTimerId) {
if (status !== 'Cancelled') { if (status !== 'Cancelled') {
return '<i class="md-icon programIcon seriesTimerIcon">&#xE062;</i>'; return '<i class="md-icon programIcon seriesTimerIcon">fiber_smart_record</i>';
} }
return '<i class="md-icon programIcon seriesTimerIcon seriesTimerIcon-inactive">&#xE062;</i>'; return '<i class="md-icon programIcon seriesTimerIcon seriesTimerIcon-inactive">fiber_smart_record</i>';
} }
return '<i class="md-icon programIcon timerIcon">&#xE061;</i>'; return '<i class="md-icon programIcon timerIcon">fiber_manual_record</i>';
} }
function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) { function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) {
@ -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;
} }
@ -562,21 +550,18 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
html += '<div class="' + guideProgramNameClass + '">'; html += '<div class="' + guideProgramNameClass + '">';
html += '<div class="guide-programNameCaret hide"><i class="guideProgramNameCaretIcon md-icon">&#xE314;</i></div>'; html += '<div class="guide-programNameCaret hide"><i class="guideProgramNameCaretIcon md-icon">keyboard_arrow_left</i></div>';
html += '<div class="guideProgramNameText">' + program.Name; html += '<div class="guideProgramNameText">' + program.Name;
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) {
@ -1126,7 +1106,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
var icon = cell.querySelector('.timerIcon'); var icon = cell.querySelector('.timerIcon');
if (!icon) { if (!icon) {
cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', '<i class="timerIcon md-icon programIcon">&#xE061;</i>'); cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', '<i class="timerIcon md-icon programIcon">fiber_manual_record</i>');
} }
if (newTimerId) { if (newTimerId) {
@ -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);
@ -1287,4 +1267,4 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
}); });
return Guide; return Guide;
}); });

8
src/components/guide/tvguide.template.html
View file

@ -10,7 +10,7 @@
<div class="guide-headerTimeslots"> <div class="guide-headerTimeslots">
<div class="guide-channelTimeslotHeader"> <div class="guide-channelTimeslotHeader">
<button is="paper-icon-button-light" type="button" class="btnGuideViewSettings"> <button is="paper-icon-button-light" type="button" class="btnGuideViewSettings">
<i class="md-icon btnGuideViewSettingsIcon">&#xE5D3;</i> <i class="md-icon btnGuideViewSettingsIcon">more_horiz</i>
</button> </button>
</div> </div>
<div class="timeslotHeaders scrollX guideScroller"></div> <div class="timeslotHeaders scrollX guideScroller"></div>
@ -30,9 +30,9 @@
<div class="guideOptions hide"> <div class="guideOptions hide">
<button is="paper-icon-button-light" type="button" class="btnPreviousPage"> <button is="paper-icon-button-light" type="button" class="btnPreviousPage">
<i class="md-icon">&#xE5C4;</i> <i class="md-icon">arrow_back</i>
</button> </button>
<button is="paper-icon-button-light" type="button" class="btnNextPage"> <button is="paper-icon-button-light" type="button" class="btnNextPage">
<i class="md-icon">&#xE5C8;</i> <i class="md-icon">arrow_forward</i>
</button> </button>
</div> </div>

15
src/components/headroom/headroom.js
View file

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

21
src/components/homescreensettings/homescreensettings.js
View file

@ -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'),
@ -152,7 +149,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
currentHtml += '<div class="listItem viewItem" data-viewid="' + view.Id + '">'; currentHtml += '<div class="listItem viewItem" data-viewid="' + view.Id + '">';
currentHtml += '<i class="md-icon listItemIcon">&#xE2C8;</i>'; currentHtml += '<i class="md-icon listItemIcon">folder_open</i>';
currentHtml += '<div class="listItemBody">'; currentHtml += '<div class="listItemBody">';
@ -162,8 +159,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
currentHtml += '</div>'; currentHtml += '</div>';
currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="' + globalize.translate('Up') + '"><i class="md-icon">&#xE316;</i></button>'; currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="' + globalize.translate('Up') + '"><i class="md-icon">keyboard_arrow_up</i></button>';
currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="' + globalize.translate('Down') + '"><i class="md-icon">&#xE313;</i></button>'; currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="' + globalize.translate('Down') + '"><i class="md-icon">keyboard_arrow_down</i></button>';
currentHtml += '</div>'; currentHtml += '</div>';
@ -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'));
} }
@ -542,4 +539,4 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
}; };
return HomeScreenSettings; return HomeScreenSettings;
}); });

13
src/components/homesections/homesections.js
View file

@ -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++) {
@ -259,7 +260,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '<h2 class="sectionTitle sectionTitle-cards">'; html += '<h2 class="sectionTitle sectionTitle-cards">';
html += globalize.translate('LatestFromLibrary', parent.Name); html += globalize.translate('LatestFromLibrary', parent.Name);
html += '</h2>'; html += '</h2>';
html += '<i class="md-icon">&#xE5CC;</i>'; html += '<i class="md-icon">chevron_right</i>';
html += '</a>'; html += '</a>';
} else { } else {
html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('LatestFromLibrary', parent.Name) + '</h2>'; html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('LatestFromLibrary', parent.Name) + '</h2>';
@ -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', {
@ -607,7 +608,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '<h2 class="sectionTitle sectionTitle-cards">'; html += '<h2 class="sectionTitle sectionTitle-cards">';
html += globalize.translate('HeaderOnNow'); html += globalize.translate('HeaderOnNow');
html += '</h2>'; html += '</h2>';
html += '<i class="md-icon">&#xE5CC;</i>'; html += '<i class="md-icon">chevron_right</i>';
html += '</a>'; html += '</a>';
} else { } else {
@ -682,7 +683,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '<h2 class="sectionTitle sectionTitle-cards">'; html += '<h2 class="sectionTitle sectionTitle-cards">';
html += globalize.translate('HeaderNextUp'); html += globalize.translate('HeaderNextUp');
html += '</h2>'; html += '</h2>';
html += '<i class="md-icon">&#xE5CC;</i>'; html += '<i class="md-icon">chevron_right</i>';
html += '</a>'; html += '</a>';
} else { } else {
html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderNextUp') + '</h2>'; html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderNextUp') + '</h2>';

12
src/components/htmlMediaHelper.js
View file

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

3
src/components/htmlaudioplayer/plugin.js
View file

@ -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;

91
src/components/htmlvideoplayer/plugin.js
View file

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

22
src/components/imagedownloader/imagedownloader.js
View file

@ -116,7 +116,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
if (showControls) { if (showControls) {
html += '<div data-role="controlgroup" data-type="horizontal" style="display:inline-block;">'; html += '<div data-role="controlgroup" data-type="horizontal" style="display:inline-block;">';
html += '<button is="paper-icon-button-light" title="' + globalize.translate('Previous') + '" class="btnPreviousPage autoSize" ' + (startIndex ? '' : 'disabled') + '><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" title="' + globalize.translate('Previous') + '" class="btnPreviousPage autoSize" ' + (startIndex ? '' : 'disabled') + '><i class="md-icon">arrow_back</i></button>';
html += '<button is="paper-icon-button-light" title="' + globalize.translate('Next') + '" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><i class="md-icon">arrow_forward</i></button>'; html += '<button is="paper-icon-button-light" title="' + globalize.translate('Next') + '" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><i class="md-icon">arrow_forward</i></button>';
html += '</div>'; html += '</div>';
} }
@ -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>';
} }
@ -283,7 +277,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
if (enableFooterButtons) { if (enableFooterButtons) {
html += '<div class="cardText cardTextCentered">'; html += '<div class="cardText cardTextCentered">';
html += '<button is="paper-icon-button-light" class="btnDownloadRemoteImage autoSize" raised" title="' + globalize.translate('Download') + '"><i class="md-icon">&#xE2C0;</i></button>'; html += '<button is="paper-icon-button-light" class="btnDownloadRemoteImage autoSize" raised" title="' + globalize.translate('Download') + '"><i class="md-icon">cloud_download</i></button>';
html += '</div>'; html += '</div>';
} }

2
src/components/imagedownloader/imagedownloader.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${Search} ${Search}
</h3> </h3>

7
src/components/imageeditor/imageeditor.js
View file

@ -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>';
} }

14
src/components/imageeditor/imageeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${HeaderEditImages} ${HeaderEditImages}
</h3> </h3>
@ -12,10 +12,10 @@
<div class="imageEditor-buttons first-imageEditor-buttons"> <div class="imageEditor-buttons first-imageEditor-buttons">
<h2 style="margin:0;">${Images}</h2> <h2 style="margin:0;">${Images}</h2>
<button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;"> <button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;">
<i class="md-icon">&#xE8B6;</i> <i class="md-icon">search</i>
</button> </button>
<button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;"> <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;">
<i class="md-icon">&#xE145;</i> <i class="md-icon">add</i>
</button> </button>
</div> </div>
<div id="images" class="itemsContainer vertical-wrap"> <div id="images" class="itemsContainer vertical-wrap">
@ -27,10 +27,10 @@
<div class="imageEditor-buttons"> <div class="imageEditor-buttons">
<h2 style="margin:0;">${Backdrops}</h2> <h2 style="margin:0;">${Backdrops}</h2>
<button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;" data-imagetype="Backdrop"> <button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;" data-imagetype="Backdrop">
<i class="md-icon">&#xE8B6;</i> <i class="md-icon">search</i>
</button> </button>
<button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Backdrop"> <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Backdrop">
<i class="md-icon">&#xE145;</i> <i class="md-icon">add</i>
</button> </button>
</div> </div>
<div id="backdrops" class="itemsContainer vertical-wrap"> <div id="backdrops" class="itemsContainer vertical-wrap">
@ -42,10 +42,10 @@
<div class="imageEditor-buttons"> <div class="imageEditor-buttons">
<h2 style="margin: 0;">${Screenshots}</h2> <h2 style="margin: 0;">${Screenshots}</h2>
<button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;" data-imagetype="Screenshot"> <button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;" data-imagetype="Screenshot">
<i class="md-icon">&#xE8B6;</i> <i class="md-icon">search</i>
</button> </button>
<button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Screenshot"> <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Screenshot">
<i class="md-icon">&#xE145;</i> <i class="md-icon">add</i>
</button> </button>
</div> </div>
<div id="screenshots" class="itemsContainer vertical-wrap"> <div id="screenshots" class="itemsContainer vertical-wrap">

4
src/components/imageoptionseditor/imageoptionseditor.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${HeaderImageOptions} ${HeaderImageOptions}
</h3> </h3>
@ -75,4 +75,4 @@
</form> </form>
</div> </div>
</div> </div>

7
src/components/images/imageLoader.js
View file

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

2
src/components/imageuploader/imageuploader.js
View file

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

4
src/components/imageuploader/imageuploader.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${HeaderUploadImage} ${HeaderUploadImage}
</h3> </h3>
@ -14,7 +14,7 @@
<h2 style="margin:0;">${HeaderAddUpdateImage}</h2> <h2 style="margin:0;">${HeaderAddUpdateImage}</h2>
<button is="emby-button" type="button" class="raised raised-mini btnBrowse" style="margin-left:1.5em;"> <button is="emby-button" type="button" class="raised raised-mini btnBrowse" style="margin-left:1.5em;">
<i class="md-icon">&#xE2C7;</i> <i class="md-icon">folder</i>
<span>${Browse}</span> <span>${Browse}</span>
</button> </button>
</div> </div>

22
src/components/indicators/indicators.js
View file

@ -90,7 +90,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
} }
if (userData.PlayedPercentage && userData.PlayedPercentage >= 100 || (userData.Played)) { if (userData.PlayedPercentage && userData.PlayedPercentage >= 100 || (userData.Played)) {
return '<div class="playedIndicator indicator"><i class="md-icon indicatorIcon">&#xE5CA;</i></div>'; return '<div class="playedIndicator indicator"><i class="md-icon indicatorIcon">check</i></div>';
} }
} }
@ -119,7 +119,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
var status; var status;
if (item.Type === 'SeriesTimer') { if (item.Type === 'SeriesTimer') {
return '<i class="md-icon timerIndicator indicatorIcon">&#xE062;</i>'; return '<i class="md-icon timerIndicator indicatorIcon">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') {
@ -130,20 +130,20 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
if (item.SeriesTimerId) { if (item.SeriesTimerId) {
if (status !== 'Cancelled') { if (status !== 'Cancelled') {
return '<i class="md-icon timerIndicator indicatorIcon">&#xE062;</i>'; return '<i class="md-icon timerIndicator indicatorIcon">fiber_smart_record</i>';
} }
return '<i class="md-icon timerIndicator timerIndicator-inactive indicatorIcon">&#xE062;</i>'; return '<i class="md-icon timerIndicator timerIndicator-inactive indicatorIcon">fiber_smart_record</i>';
} }
return '<i class="md-icon timerIndicator indicatorIcon">&#xE061;</i>'; return '<i class="md-icon timerIndicator indicatorIcon">fiber_manual_record</i>';
} }
function getSyncIndicator(item) { function getSyncIndicator(item) {
if (item.SyncPercent === 100) { if (item.SyncPercent === 100) {
return '<div class="syncIndicator indicator fullSyncIndicator"><i class="md-icon indicatorIcon">&#xE2C4;</i></div>'; return '<div class="syncIndicator indicator fullSyncIndicator"><i class="md-icon indicatorIcon">file_download</i></div>';
} else if (item.SyncPercent != null) { } else if (item.SyncPercent != null) {
return '<div class="syncIndicator indicator emptySyncIndicator"><i class="md-icon indicatorIcon">&#xE2C4;</i></div>'; return '<div class="syncIndicator indicator emptySyncIndicator"><i class="md-icon indicatorIcon">file_download</i></div>';
} }
return ''; return '';
@ -151,13 +151,13 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
function getTypeIndicator(item) { function getTypeIndicator(item) {
if (item.Type === 'Video') { if (item.Type === 'Video') {
return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">&#xE04B;</i></div>'; return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">videocam</i></div>';
} }
if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') { if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') {
return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">&#xE2C7;</i></div>'; return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">folder</i></div>';
} }
if (item.Type === 'Photo') { if (item.Type === 'Photo') {
return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">&#xE410;</i></div>'; return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">photo</i></div>';
} }
return ''; return '';
@ -232,4 +232,4 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
getTypeIndicator: getTypeIndicator, getTypeIndicator: getTypeIndicator,
getMissingIndicator: getMissingIndicator getMissingIndicator: getMissingIndicator
}; };
}); });

2
src/components/itemMediaInfo/itemMediaInfo.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${HeaderMediaInfo} ${HeaderMediaInfo}
</h3> </h3>

2
src/components/itemcontextmenu.js
View file

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

12
src/components/itemhelper.js
View file

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

17
src/components/itemidentifier/itemidentifier.js
View file

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

2
src/components/itemidentifier/itemidentifier.template.html
View file

@ -1,6 +1,6 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
<i class="md-icon">&#xE5C4;</i> <i class="md-icon">arrow_back</i>
</button> </button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${Identify} ${Identify}

7
src/components/itemsrefresher.js
View file

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

30
src/components/keyboardnavigation.js
View file

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

2
src/components/lazyloader/lazyloader-intersectionobserver.js
View file

@ -45,7 +45,7 @@ define(['require', 'browser'], function (require, browser) {
} }
} }
}, },
observerOptions observerOptions
); );
this.observer = observer; this.observer = observer;

39
src/components/listview/listview.js
View file

@ -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;
@ -265,9 +262,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
} }
if (!clickEntireItem && options.dragHandle) { if (!clickEntireItem && options.dragHandle) {
//html += '<button is="paper-icon-button-light" class="listViewDragHandle listItemButton"><i class="md-icon">&#xE25D;</i></button>'; //html += '<button is="paper-icon-button-light" class="listViewDragHandle listItemButton"><i class="md-icon">drag_handle</i></button>';
// Firefox and Edge are not allowing the button to be draggable // Firefox and Edge are not allowing the button to be draggable
html += '<i class="listViewDragHandle md-icon listItemIcon listItemIcon-transparent">&#xE25D;</i>'; html += '<i class="listViewDragHandle md-icon listItemIcon listItemIcon-transparent">drag_handle</i>';
} }
if (options.image !== false) { if (options.image !== false) {
@ -301,7 +298,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
} }
if (playOnImageClick) { if (playOnImageClick) {
html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="md-icon listItemImageButton-icon">&#xE037;</i></button>'; html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="md-icon listItemImageButton-icon">play_arrow</i></button>';
} }
var progressHtml = indicators.getProgressBarHtml(item, { var progressHtml = indicators.getProgressBarHtml(item, {
@ -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;
} }
} }
@ -434,7 +427,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '<div class="' + cssClass + '">'; html += '<div class="' + cssClass + '">';
var moreIcon = '&#xE5D3;'; var moreIcon = 'more_horiz';
html += getTextLinesHtml(textlines, isLargeStyle); html += getTextLinesHtml(textlines, isLargeStyle);
@ -481,7 +474,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (!clickEntireItem) { if (!clickEntireItem) {
if (options.addToListButton) { if (options.addToListButton) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="md-icon">&#xE03B;</i></button>'; html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="md-icon">playlist_add</i></button>';
} }
if (options.moreButton !== false) { if (options.moreButton !== false) {
@ -489,7 +482,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
} }
if (options.infoButton) { if (options.infoButton) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="md-icon">&#xE88F;</i></button>'; html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="md-icon">info_outline</i></button>';
} }
if (options.rightButtons) { if (options.rightButtons) {
@ -504,11 +497,11 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var likes = userData.Likes == null ? '' : userData.Likes; var likes = userData.Likes == null ? '' : userData.Likes;
if (itemHelper.canMarkPlayed(item)) { if (itemHelper.canMarkPlayed(item)) {
html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon">&#xE5CA;</i></button>'; html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon">check</i></button>';
} }
if (itemHelper.canRate(item)) { if (itemHelper.canRate(item)) {
html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">&#xE87D;</i></button>'; html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">favorite</i></button>';
} }
html += '</span>'; html += '</span>';

6
src/components/loading/loading.js
View file

@ -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');

76
src/components/mediainfo/mediainfo.js
View file

@ -6,37 +6,35 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
var status; var status;
if (item.Type === 'SeriesTimer') { if (item.Type === 'SeriesTimer') {
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">&#xE062;</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 '';
} }
if (item.SeriesTimerId) { if (item.SeriesTimerId) {
if (status !== 'Cancelled') { if (status !== 'Cancelled') {
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">&#xE062;</i>'; return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">fiber_smart_record</i>';
} }
return '<i class="md-icon mediaInfoItem mediaInfoIconItem">&#xE062;</i>'; return '<i class="md-icon mediaInfoItem mediaInfoIconItem">fiber_smart_record</i>';
} }
return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">&#xE061;</i>'; return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">fiber_manual_record</i>';
} }
function getProgramInfoHtml(item, options) { function getProgramInfoHtml(item, options) {
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);
} }
} }
@ -411,7 +393,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
if (rating) { if (rating) {
html += '<div class="starRatingContainer mediaInfoItem">'; html += '<div class="starRatingContainer mediaInfoItem">';
html += '<i class="md-icon starIcon">&#xE838;</i>'; html += '<i class="md-icon starIcon">star</i>';
html += rating; html += rating;
html += '</div>'; html += '</div>';
} }
@ -665,4 +647,4 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
getMediaInfoStats: getMediaInfoStats, getMediaInfoStats: getMediaInfoStats,
getResolutionText: getResolutionText getResolutionText: getResolutionText
}; };
}); });

14
src/components/medialibrarycreator/medialibrarycreator.js
View file

@ -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");

4
src/components/medialibrarycreator/medialibrarycreator.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle">${ButtonAddMediaLibrary}</h3> <h3 class="formDialogHeaderTitle">${ButtonAddMediaLibrary}</h3>
</div> </div>
@ -40,4 +40,4 @@
<button is="emby-button" type="button" class="raised btnSubmit button-submit block formDialogFooterItem"> <button is="emby-button" type="button" class="raised btnSubmit button-submit block formDialogFooterItem">
<span>${ButtonOk}</span> <span>${ButtonOk}</span>
</button> </button>
</div> </div>

4
src/components/medialibraryeditor/medialibraryeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"></h3> <h3 class="formDialogHeaderTitle"></h3>
</div> </div>
@ -34,4 +34,4 @@
<button is="emby-button" type="button" class="raised btnSubmit button-submit block formDialogFooterItem"> <button is="emby-button" type="button" class="raised btnSubmit button-submit block formDialogFooterItem">
<span>${ButtonOk}</span> <span>${ButtonOk}</span>
</button> </button>
</div> </div>

24
src/components/metadataeditor/metadataeditor.js
View file

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

10
src/components/metadataeditor/metadataeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${Edit} ${Edit}
</h3> </h3>
@ -184,7 +184,7 @@
${Genres} ${Genres}
</h2> </h2>
<button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}"> <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
<i class="md-icon">&#xE145;</i> <i class="md-icon">add</i>
</button> </button>
<div class="paperList" id="listGenres"></div> <div class="paperList" id="listGenres"></div>
</div> </div>
@ -193,7 +193,7 @@
${People} ${People}
</h2> </h2>
<button is="emby-button" type="button" id="btnAddPerson" class="fab btnAddPerson" style="margin-left:1em;" title="${Add}"> <button is="emby-button" type="button" id="btnAddPerson" class="fab btnAddPerson" style="margin-left:1em;" title="${Add}">
<i class="md-icon">&#xE145;</i> <i class="md-icon">add</i>
</button> </button>
<div id="peopleList" class="paperList"> <div id="peopleList" class="paperList">
</div> </div>
@ -203,7 +203,7 @@
${Studios} ${Studios}
</h2> </h2>
<button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}"> <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
<i class="md-icon">&#xE145;</i> <i class="md-icon">add</i>
</button> </button>
<div class="paperList" id="listStudios"></div> <div class="paperList" id="listStudios"></div>
</div> </div>
@ -212,7 +212,7 @@
${Tags} ${Tags}
</h2> </h2>
<button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}"> <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
<i class="md-icon">&#xE145;</i> <i class="md-icon">add</i>
</button> </button>
<div class="paperList" id="listTags"></div> <div class="paperList" id="listTags"></div>
</div> </div>

4
src/components/metadataeditor/personeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${Edit} ${Edit}
</h3> </h3>
@ -35,4 +35,4 @@
</div> </div>
</form> </form>
</div> </div>

197
src/components/multiselect/multiselect.js
View file

@ -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 = '&#xE5D3;'; 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
}); });
}; };

75
src/components/navdrawer/navdrawer.js
View file

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

12
src/components/notifications/notifications.js
View file

@ -19,8 +19,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
setTimeout(function () { setTimeout(function () {
if (notification.close) { if (notification.close) {
notification.close(); notification.close();
} } else if (notification.cancel) {
else if (notification.cancel) {
notification.cancel(); notification.cancel();
} }
}, timeoutMs); }, timeoutMs);
@ -176,15 +175,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 =

31
src/components/nowplayingbar/nowplayingbar.js
View file

@ -42,31 +42,31 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
// The onclicks are needed due to the return false above // The onclicks are needed due to the return false above
html += '<div class="nowPlayingBarCenter">'; html += '<div class="nowPlayingBarCenter">';
html += '<button is="paper-icon-button-light" class="previousTrackButton mediaButton"><i class="md-icon">&#xE045;</i></button>'; html += '<button is="paper-icon-button-light" class="previousTrackButton mediaButton"><i class="md-icon">skip_previous</i></button>';
html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">&#xE034;</i></button>'; html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">pause</i></button>';
html += '<button is="paper-icon-button-light" class="stopButton mediaButton"><i class="md-icon">stop</i></button>'; html += '<button is="paper-icon-button-light" class="stopButton mediaButton"><i class="md-icon">stop</i></button>';
html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><i class="md-icon">&#xE044;</i></button>'; html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><i class="md-icon">skip_next</i></button>';
html += '<div class="nowPlayingBarCurrentTime"></div>'; html += '<div class="nowPlayingBarCurrentTime"></div>';
html += '</div>'; html += '</div>';
html += '<div class="nowPlayingBarRight">'; html += '<div class="nowPlayingBarRight">';
html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><i class="md-icon">&#xE050;</i></button>'; html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><i class="md-icon">volume_up</i></button>';
html += '<div class="sliderContainer nowPlayingBarVolumeSliderContainer hide" style="width:9em;vertical-align:middle;display:inline-flex;">'; html += '<div class="sliderContainer nowPlayingBarVolumeSliderContainer hide" style="width:9em;vertical-align:middle;display:inline-flex;">';
html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="slider-medium-thumb nowPlayingBarVolumeSlider"/>'; html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="slider-medium-thumb nowPlayingBarVolumeSlider"/>';
html += '</div>'; html += '</div>';
html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><i class="md-icon">&#xE040;</i></button>'; html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><i class="md-icon">repeat</i></button>';
html += '<div class="nowPlayingBarUserDataButtons">'; html += '<div class="nowPlayingBarUserDataButtons">';
html += '</div>'; html += '</div>';
html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">&#xE034;</i></button>'; html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">pause</i></button>';
html += '<button is="paper-icon-button-light" class="remoteControlButton mediaButton"><i class="md-icon">&#xE05F;</i></button>'; html += '<button is="paper-icon-button-light" class="remoteControlButton mediaButton"><i class="md-icon">playlist_play</i></button>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
@ -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 {
@ -401,9 +400,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
} }
if (isMuted) { if (isMuted) {
muteButton.querySelector('i').innerHTML = '&#xE04F;'; muteButton.querySelector('i').innerHTML = 'volume_off';
} else { } else {
muteButton.querySelector('i').innerHTML = '&#xE050;'; muteButton.querySelector('i').innerHTML = 'volume_up';
} }
if (progressElement) { if (progressElement) {
@ -572,7 +571,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
var userData = item.UserData || {}; var userData = item.UserData || {};
var likes = userData.Likes == null ? '' : userData.Likes; var likes = userData.Likes == null ? '' : userData.Likes;
nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">&#xE87D;</i></button>'; nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">favorite</i></button>';
}); });
} }

4
src/components/playback/autoplaydetect.js
View file

@ -48,9 +48,7 @@ define([], function () {
} }
timeout = setTimeout(testAutoplay, 500); timeout = setTimeout(testAutoplay, 500);
} } catch (e) {
catch (e) {
reject(); reject();
return; return;
} }

13
src/components/playback/brightnessosd.js
View file

@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
function getOsdElementHtml() { function getOsdElementHtml() {
var html = ''; var html = '';
html += '<i class="md-icon iconOsdIcon">&#xE1AC;</i>'; html += '<i class="md-icon iconOsdIcon">brightness_high</i>';
html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner brightnessOsdProgressInner"></div></div>'; html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner brightnessOsdProgressInner"></div></div>';
@ -102,12 +102,11 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
if (iconElement) { if (iconElement) {
if (brightness >= 80) { if (brightness >= 80) {
iconElement.innerHTML = '&#xE1AC;'; iconElement.innerHTML = 'brightness_high';
} } else if (brightness >= 20) {
else if (brightness >= 20) { iconElement.innerHTML = 'brightness_medium';
iconElement.innerHTML = '&#xE1AE;';
} else { } else {
iconElement.innerHTML = '&#xE1AD;'; iconElement.innerHTML = 'brightness_low';
} }
} }
if (progressElement) { if (progressElement) {
@ -162,4 +161,4 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
bindToPlayer(playbackManager.getCurrentPlayer()); bindToPlayer(playbackManager.getCurrentPlayer());
}); });

3
src/components/playback/mediasession.js
View file

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

6
src/components/playback/nowplayinghelper.js
View file

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

76
src/components/playback/playbackmanager.js
View file

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

6
src/components/playback/playbackorientation.js
View file

@ -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;

19
src/components/playback/playerSelectionMenu.js
View file

@ -63,17 +63,17 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
switch (deviceType) { switch (deviceType) {
case 'smartphone': case 'smartphone':
return '&#xE32C;'; return 'smartphone';
case 'tablet': case 'tablet':
return '&#xE32F;'; return 'tablet';
case 'tv': case 'tv':
return '&#xE333;'; return 'tv';
case 'cast': case 'cast':
return '&#xE307;'; return 'cast';
case 'desktop': case 'desktop':
return '&#xE30A;'; return 'computer';
default: default:
return '&#xE333;'; return 'tv';
} }
} }
@ -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);
@ -320,4 +317,4 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
return { return {
show: showPlayerSelection show: showPlayerSelection
}; };
}); });

9
src/components/playback/playmethodhelper.js
View file

@ -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';
} }
} }

12
src/components/playback/playqueuemanager.js
View file

@ -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++) {

6
src/components/playback/volumeosd.js
View file

@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
function getOsdElementHtml() { function getOsdElementHtml() {
var html = ''; var html = '';
html += '<i class="md-icon iconOsdIcon">&#xE050;</i>'; html += '<i class="md-icon iconOsdIcon">volume_up</i>';
html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner"></div></div>'; html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner"></div></div>';
@ -101,7 +101,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
function updatePlayerVolumeState(isMuted, volume) { function updatePlayerVolumeState(isMuted, volume) {
if (iconElement) { if (iconElement) {
iconElement.innerHTML = isMuted ? '&#xE04F;' : '&#xE050;'; iconElement.innerHTML = isMuted ? 'volume_off' : 'volume_up';
} }
if (progressElement) { if (progressElement) {
progressElement.style.width = (volume || 0) + '%'; progressElement.style.width = (volume || 0) + '%';
@ -155,4 +155,4 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
bindToPlayer(playbackManager.getCurrentPlayer()); bindToPlayer(playbackManager.getCurrentPlayer());
}); });

3
src/components/playerstats/playerstats.js
View file

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

4
src/components/playlisteditor/playlisteditor.js
View file

@ -258,7 +258,7 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackManager',
var title = globalize.translate('HeaderAddToPlaylist'); var title = globalize.translate('HeaderAddToPlaylist');
html += '<div class="formDialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '<h3 class="formDialogHeaderTitle">'; html += '<h3 class="formDialogHeaderTitle">';
html += title; html += title;
html += '</h3>'; html += '</h3>';
@ -295,4 +295,4 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackManager',
}; };
return PlaylistEditor; return PlaylistEditor;
}); });

41
src/components/polyfills/focusPreventScroll.js Normal file
View file

@ -0,0 +1,41 @@
// Polyfill to add support for preventScroll by focus function
if (HTMLElement.prototype.nativeFocus === undefined) {
(function () {
var supportsPreventScrollOption = false;
try {
var focusElem = document.createElement("div");
focusElem.addEventListener("focus", function(event) {
event.preventDefault();
event.stopPropagation();
}, true);
var opts = Object.defineProperty({}, "preventScroll", {
get: function () {
supportsPreventScrollOption = true;
}
});
focusElem.focus(opts);
} catch (e) {
console.log("error checking preventScroll support");
}
if (!supportsPreventScrollOption) {
HTMLElement.prototype.nativeFocus = HTMLElement.prototype.focus;
HTMLElement.prototype.focus = function(options) {
var scrollX = window.scrollX;
var scrollY = window.scrollY;
this.nativeFocus();
// Restore window scroll if preventScroll
if (options && options.preventScroll) {
window.scroll(scrollX, scrollY);
}
};
}
})();
}

4
src/components/prompt/prompt.template.html
View file

@ -1,6 +1,6 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
<i class="md-icon">&#xE5C4;</i> <i class="md-icon">arrow_back</i>
</button> </button>
<h3 class="formDialogHeaderTitle"></h3> <h3 class="formDialogHeaderTitle"></h3>
</div> </div>
@ -22,4 +22,4 @@
</form> </form>
</div> </div>
</div> </div>

21
src/components/recordingcreator/recordingbutton.js
View file

@ -30,7 +30,7 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
this.refresh(options.itemId, options.serverId); this.refresh(options.itemId, options.serverId);
} }
var button = options.button; var button = options.button;
button.querySelector('i').innerHTML = '&#xE061;'; button.querySelector('i').innerHTML = 'fiber_manual_record';
var clickFn = onRecordingButtonClick.bind(this); var clickFn = onRecordingButtonClick.bind(this);
this.clickFn = clickFn; this.clickFn = clickFn;
@ -45,28 +45,25 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
var status; var status;
if (item.Type === 'SeriesTimer') { if (item.Type === 'SeriesTimer') {
return '&#xE062;'; 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 '&#xE061;';
} }
if (item.SeriesTimerId) { if (item.SeriesTimerId) {
if (status !== 'Cancelled') { if (status !== 'Cancelled') {
return '&#xE062;'; return 'fiber_smart_record';
} }
} }
return '&#xE061;'; return 'fiber_manual_record';
} }
RecordingButton.prototype.refresh = function (serverId, itemId) { RecordingButton.prototype.refresh = function (serverId, itemId) {
@ -113,4 +110,4 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
}; };
return RecordingButton; return RecordingButton;
}); });

3
src/components/recordingcreator/recordingcreator.js
View file

@ -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",

4
src/components/recordingcreator/recordingcreator.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"></h3> <h3 class="formDialogHeaderTitle"></h3>
</div> </div>
<div class="formDialogContent smoothScrollY"> <div class="formDialogContent smoothScrollY">
@ -28,4 +28,4 @@
</button> </button>
</div> </div>
</form> </form>
</div> </div>

2
src/components/recordingcreator/recordingeditor.js
View file

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

4
src/components/recordingcreator/recordingeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${HeaderRecordingOptions} ${HeaderRecordingOptions}
</h3> </h3>
@ -43,4 +43,4 @@
</form> </form>
</div> </div>
</div> </div>

6
src/components/recordingcreator/recordingfields.template.html
View file

@ -2,7 +2,7 @@
<div class="recordSeriesContainer recordingFields-buttons flex align-items-center hide"> <div class="recordSeriesContainer recordingFields-buttons flex align-items-center hide">
<div> <div>
<button is="emby-button" type="button" class="raised recordingButton seriesRecordingButton"> <button is="emby-button" type="button" class="raised recordingButton seriesRecordingButton">
<i class="md-icon recordingIcon">&#xE062;</i> <i class="md-icon recordingIcon">fiber_smart_record</i>
<span class="buttonText">${RecordSeries}</span> <span class="buttonText">${RecordSeries}</span>
</button> </button>
</div> </div>
@ -14,7 +14,7 @@
<div class="recordingFields-buttons flex align-items-center"> <div class="recordingFields-buttons flex align-items-center">
<div> <div>
<button is="emby-button" type="button" class="raised recordingButton singleRecordingButton"> <button is="emby-button" type="button" class="raised recordingButton singleRecordingButton">
<i class="md-icon recordingIcon">&#xE061;</i> <i class="md-icon recordingIcon">fiber_manual_record</i>
<span class="buttonText">${Record}</span> <span class="buttonText">${Record}</span>
</button> </button>
</div> </div>
@ -22,4 +22,4 @@
<span class="manageButtonText">${Settings}</span> <span class="manageButtonText">${Settings}</span>
</button> </button>
</div> </div>
</div> </div>

3
src/components/recordingcreator/recordinghelper.js
View file

@ -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();

2
src/components/recordingcreator/seriesrecordingeditor.js
View file

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

4
src/components/recordingcreator/seriesrecordingeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="formDialogHeader"> <div class="formDialogHeader">
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
<h3 class="formDialogHeaderTitle"> <h3 class="formDialogHeaderTitle">
${HeaderSeriesOptions} ${HeaderSeriesOptions}
</h3> </h3>
@ -75,4 +75,4 @@
</form> </form>
</div> </div>
</div> </div>

4
src/components/refreshdialog/refreshdialog.js
View file

@ -123,7 +123,7 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager'
var title = globalize.translate('RefreshMetadata'); var title = globalize.translate('RefreshMetadata');
html += '<div class="formDialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '<h3 class="formDialogHeaderTitle">'; html += '<h3 class="formDialogHeaderTitle">';
html += title; html += title;
html += '</h3>'; html += '</h3>';
@ -172,4 +172,4 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager'
}; };
return RefreshDialog; return RefreshDialog;
}); });

18
src/components/remotecontrol/remotecontrol.js
View file

@ -135,7 +135,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) { apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
var userData = fullItem.UserData || {}; var userData = fullItem.UserData || {};
var likes = null == userData.Likes ? "" : userData.Likes; var likes = null == userData.Likes ? "" : userData.Likes;
context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><i class="md-icon">&#xE87D;</i></button>'; context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><i class="md-icon">favorite</i></button>';
}); });
} else { } else {
backdrop.clear(); backdrop.clear();
@ -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);
} }
} }
} }
@ -291,10 +291,10 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
if (isMuted) { if (isMuted) {
view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute")); view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute"));
view.querySelector(".buttonMute i").innerHTML = "&#xE04F;"; view.querySelector(".buttonMute i").innerHTML = "volume_off";
} else { } else {
view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute")); view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute"));
view.querySelector(".buttonMute i").innerHTML = "&#xE050;"; view.querySelector(".buttonMute i").innerHTML = "volume_up";
} }
if (progressElement) { if (progressElement) {
@ -361,7 +361,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
action: "setplaylistindex", action: "setplaylistindex",
enableUserDataButtons: false, enableUserDataButtons: false,
rightButtons: [{ rightButtons: [{
icon: "&#xE15D;", icon: "remove_circle_outline",
title: globalize.translate("ButtonRemove"), title: globalize.translate("ButtonRemove"),
id: "remove" id: "remove"
}], }],

25
src/components/sanitizefilename.js
View file

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

499
src/components/scrollManager.js Normal file
View file

@ -0,0 +1,499 @@
define(["dom", "browser", "layoutManager"], function (dom, browser, layoutManager) {
"use strict";
/**
* Scroll time in ms.
*/
var ScrollTime = 270;
/**
* Epsilon for comparing values.
*/
var Epsilon = 1e-6;
// FIXME: Need to scroll to top of page to fully show the top menu. This can be solved by some marker of top most elements or their containers
/**
* Returns minimum vertical scroll.
* Scroll less than that value will be zeroed.
*
* @return {number} minimum vertical scroll
*/
function minimumScrollY() {
var topMenu = document.querySelector(".headerTop");
if (topMenu) {
return topMenu.clientHeight;
}
return 0;
}
var supportsSmoothScroll = "scrollBehavior" in document.documentElement.style;
var supportsScrollToOptions = false;
try {
var elem = document.createElement("div");
var opts = Object.defineProperty({}, "behavior", {
get: function () {
supportsScrollToOptions = true;
}
});
elem.scrollTo(opts);
} catch (e) {
console.log("error checking ScrollToOptions support");
}
/**
* Returns value clamped by range [min, max].
*
* @param {number} value clamped value
* @param {number} min begining of range
* @param {number} max ending of range
* @return {number} clamped value
*/
function clamp(value, min, max) {
return value <= min ? min : value >= max ? max : value;
}
/**
* Returns the required delta to fit range 1 into range 2.
* In case of range 1 is bigger than range 2 returns delta to fit most out of range part.
*
* @param {number} begin1 begining of range 1
* @param {number} end1 ending of range 1
* @param {number} begin2 begining of range 2
* @param {number} end2 ending of range 2
* @return {number} delta: <0 move range1 to the left, >0 - to the right
*/
function fitRange(begin1, end1, begin2, end2) {
var delta1 = begin1 - begin2;
var delta2 = end2 - end1;
if (delta1 < 0 && delta1 < delta2) {
return -delta1;
} else if (delta2 < 0) {
return delta2;
}
return 0;
}
/**
* Ease value.
*
* @param {number} t value in range [0, 1]
* @return {number} eased value in range [0, 1]
*/
function ease(t) {
return t*(2 - t); // easeOutQuad === ease-out
}
/**
* Document scroll wrapper helps to unify scrolling and fix issues of some browsers.
*
* webOS 2 Browser: scrolls documentElement (and window), but body has a scroll size
*
* webOS 3 Browser: scrolls body (and window)
*
* webOS 4 Native: scrolls body (and window); has a document.scrollingElement
*
* Tizen 4 Browser/Native: scrolls body (and window); has a document.scrollingElement
*
* Tizen 5 Browser/Native: scrolls documentElement (and window); has a document.scrollingElement
*/
function DocumentScroller() {
}
DocumentScroller.prototype = {
get scrollLeft() {
return window.pageXOffset;
},
set scrollLeft(val) {
window.scroll(val, window.pageYOffset);
},
get scrollTop() {
return window.pageYOffset;
},
set scrollTop(val) {
window.scroll(window.pageXOffset, val);
},
get scrollWidth() {
return Math.max(document.documentElement.scrollWidth, document.body.scrollWidth);
},
get scrollHeight() {
return Math.max(document.documentElement.scrollHeight, document.body.scrollHeight);
},
get clientWidth() {
return Math.min(document.documentElement.clientWidth, document.body.clientWidth);
},
get clientHeight() {
return Math.min(document.documentElement.clientHeight, document.body.clientHeight);
},
getBoundingClientRect: function() {
// Make valid viewport coordinates: documentElement.getBoundingClientRect returns rect of entire document relative to viewport
return {
left: 0,
top: 0,
width: this.clientWidth,
height: this.clientHeight
};
},
scrollTo: function() {
window.scrollTo.apply(window, arguments);
}
};
var documentScroller = new DocumentScroller();
/**
* Returns parent element that can be scrolled. If no such, returns documentElement.
*
* @param {HTMLElement} element element for which parent is being searched
* @param {boolean} vertical search for vertical scrollable parent
*/
function getScrollableParent(element, vertical) {
if (element) {
var parent = element.parentElement;
while (parent) {
if ((!vertical && parent.scrollWidth > parent.clientWidth && parent.classList.contains("scrollX")) ||
(vertical && parent.scrollHeight > parent.clientHeight && parent.classList.contains("scrollY"))) {
return parent;
}
parent = parent.parentElement;
}
}
return documentScroller;
}
/**
* @typedef {Object} ScrollerData
* @property {number} scrollPos current scroll position
* @property {number} scrollSize scroll size
* @property {number} clientSize client size
*/
/**
* Returns scroll data for specified orientation.
*
* @param {HTMLElement} scroller scroller
* @param {boolean} vertical vertical scroll data
* @return {ScrollerData} scroll data
*/
function getScrollerData(scroller, vertical) {
var data = {};
if (!vertical) {
data.scrollPos = scroller.scrollLeft;
data.scrollSize = scroller.scrollWidth;
data.clientSize = scroller.clientWidth;
} else {
data.scrollPos = scroller.scrollTop;
data.scrollSize = scroller.scrollHeight;
data.clientSize = scroller.clientHeight;
}
return data;
}
/**
* Returns position of child of scroller for specified orientation.
*
* @param {HTMLElement} scroller scroller
* @param {HTMLElement} element child of scroller
* @param {boolean} vertical vertical scroll
* @return {number} child position
*/
function getScrollerChildPos(scroller, element, vertical) {
var elementRect = element.getBoundingClientRect();
var scrollerRect = scroller.getBoundingClientRect();
if (!vertical) {
return scroller.scrollLeft + elementRect.left - scrollerRect.left;
} else {
return scroller.scrollTop + elementRect.top - scrollerRect.top;
}
}
/**
* Returns scroll position for element.
*
* @param {ScrollerData} scrollerData scroller data
* @param {number} elementPos child element position
* @param {number} elementSize child element size
* @param {boolean} centered scroll to center
* @return {number} scroll position
*/
function calcScroll(scrollerData, elementPos, elementSize, centered) {
var maxScroll = scrollerData.scrollSize - scrollerData.clientSize;
var scroll;
if (centered) {
scroll = elementPos + (elementSize - scrollerData.clientSize) / 2;
} else {
var delta = fitRange(elementPos, elementPos + elementSize - 1, scrollerData.scrollPos, scrollerData.scrollPos + scrollerData.clientSize - 1);
scroll = scrollerData.scrollPos - delta;
}
return clamp(Math.round(scroll), 0, maxScroll);
}
/**
* Calls scrollTo function in proper way.
*
* @param {HTMLElement} scroller scroller
* @param {ScrollToOptions} options scroll options
*/
function scrollToHelper(scroller, options) {
if ("scrollTo" in scroller) {
if (!supportsScrollToOptions) {
var scrollX = (options.left !== undefined ? options.left : scroller.scrollLeft);
var scrollY = (options.top !== undefined ? options.top : scroller.scrollTop);
scroller.scrollTo(scrollX, scrollY);
} else {
scroller.scrollTo(options);
}
} else if ("scrollLeft" in scroller) {
if (options.left !== undefined) {
scroller.scrollLeft = options.left;
}
if (options.top !== undefined) {
scroller.scrollTop = options.top;
}
}
}
/**
* Performs built-in scroll.
*
* @param {HTMLElement} xScroller horizontal scroller
* @param {number} scrollX horizontal coordinate
* @param {HTMLElement} yScroller vertical scroller
* @param {number} scrollY vertical coordinate
* @param {boolean} smooth smooth scrolling
*/
function builtinScroll(xScroller, scrollX, yScroller, scrollY, smooth) {
var scrollBehavior = smooth ? "smooth" : "instant";
if (xScroller !== yScroller) {
scrollToHelper(xScroller, {left: scrollX, behavior: scrollBehavior});
scrollToHelper(yScroller, {top: scrollY, behavior: scrollBehavior});
} else {
scrollToHelper(xScroller, {left: scrollX, top: scrollY, behavior: scrollBehavior});
}
}
var scrollTimer;
/**
* Resets scroll timer to stop scrolling.
*/
function resetScrollTimer() {
cancelAnimationFrame(scrollTimer);
scrollTimer = undefined;
}
/**
* Performs animated scroll.
*
* @param {HTMLElement} xScroller horizontal scroller
* @param {number} scrollX horizontal coordinate
* @param {HTMLElement} yScroller vertical scroller
* @param {number} scrollY vertical coordinate
*/
function animateScroll(xScroller, scrollX, yScroller, scrollY) {
var ox = xScroller.scrollLeft;
var oy = yScroller.scrollTop;
var dx = scrollX - ox;
var dy = scrollY - oy;
if (Math.abs(dx) < Epsilon && Math.abs(dy) < Epsilon) {
return;
}
var start;
function scrollAnim(currentTimestamp) {
start = start || currentTimestamp;
var k = Math.min(1, (currentTimestamp - start) / ScrollTime);
if (k === 1) {
resetScrollTimer();
builtinScroll(xScroller, scrollX, yScroller, scrollY, false);
return;
}
k = ease(k);
var x = ox + dx*k;
var y = oy + dy*k;
builtinScroll(xScroller, x, yScroller, y, false);
scrollTimer = requestAnimationFrame(scrollAnim);
}
scrollTimer = requestAnimationFrame(scrollAnim);
}
/**
* Performs scroll.
*
* @param {HTMLElement} xScroller horizontal scroller
* @param {number} scrollX horizontal coordinate
* @param {HTMLElement} yScroller vertical scroller
* @param {number} scrollY vertical coordinate
* @param {boolean} smooth smooth scrolling
*/
function doScroll(xScroller, scrollX, yScroller, scrollY, smooth) {
resetScrollTimer();
if (smooth && useAnimatedScroll()) {
animateScroll(xScroller, scrollX, yScroller, scrollY);
} else {
builtinScroll(xScroller, scrollX, yScroller, scrollY, smooth);
}
}
/**
* Returns true if smooth scroll must be used.
*/
function useSmoothScroll() {
if (browser.tizen) {
return true;
}
return false;
}
/**
* Returns true if animated implementation of smooth scroll must be used.
*/
function useAnimatedScroll() {
// Add block to force using (or not) of animated implementation
return !supportsSmoothScroll;
}
/**
* Returns true if scroll manager is enabled.
*/
var isEnabled = function() {
if (!layoutManager.tv) {
return false;
}
if (browser.tizen) {
return true;
}
if (browser.web0s) {
return true;
}
return false;
};
/**
* Scrolls the document to a given position.
*
* @param {number} scrollX horizontal coordinate
* @param {number} scrollY vertical coordinate
* @param {boolean} [smooth=false] smooth scrolling
*/
var scrollTo = function(scrollX, scrollY, smooth) {
smooth = !!smooth;
// Scroller is document itself by default
var scroller = getScrollableParent(null, false);
var xScrollerData = getScrollerData(scroller, false);
var yScrollerData = getScrollerData(scroller, true);
scrollX = clamp(Math.round(scrollX), 0, xScrollerData.scrollSize - xScrollerData.clientSize);
scrollY = clamp(Math.round(scrollY), 0, yScrollerData.scrollSize - yScrollerData.clientSize);
doScroll(scroller, scrollX, scroller, scrollY, smooth);
}
/**
* Scrolls the document to a given element.
*
* @param {HTMLElement} element target element of scroll task
* @param {boolean} [smooth=false] smooth scrolling
*/
var scrollToElement = function(element, smooth) {
smooth = !!smooth;
var scrollCenterX = true;
var scrollCenterY = true;
var offsetParent = element.offsetParent;
// In Firefox offsetParent.offsetParent is BODY
var isFixed = offsetParent && (!offsetParent.offsetParent || window.getComputedStyle(offsetParent).position === "fixed");
// Scroll fixed elements to nearest edge (or do not scroll at all)
if (isFixed) {
scrollCenterX = scrollCenterY = false;
}
var xScroller = getScrollableParent(element, false);
var yScroller = getScrollableParent(element, true);
var elementRect = element.getBoundingClientRect();
var xScrollerData = getScrollerData(xScroller, false);
var yScrollerData = getScrollerData(yScroller, true);
var xPos = getScrollerChildPos(xScroller, element, false);
var yPos = getScrollerChildPos(yScroller, element, true);
var scrollX = calcScroll(xScrollerData, xPos, elementRect.width, scrollCenterX);
var scrollY = calcScroll(yScrollerData, yPos, elementRect.height, scrollCenterY);
// HACK: Scroll to top for top menu because it is hidden
// FIXME: Need a marker to scroll top/bottom
if (isFixed && elementRect.bottom < 0) {
scrollY = 0;
}
// HACK: Ensure we are at the top
// FIXME: Need a marker to scroll top/bottom
if (scrollY < minimumScrollY() && yScroller === documentScroller) {
scrollY = 0;
}
doScroll(xScroller, scrollX, yScroller, scrollY, smooth);
}
if (isEnabled()) {
dom.addEventListener(window, "focusin", function(e) {
setTimeout(function() {
scrollToElement(e.target, useSmoothScroll());
}, 0);
}, {capture: true});
}
return {
isEnabled: isEnabled,
scrollTo: scrollTo,
scrollToElement: scrollToElement
};
});

Some files were not shown because too many files have changed in this diff Show more