${Settings}
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js index 9144886945..a00baaa6f0 100644 --- a/src/components/guide/guide.js +++ b/src/components/guide/guide.js @@ -29,7 +29,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', var offset = newPct - left; var pctOfWidth = (offset / width) * 100; - //console.log(pctOfWidth); var guideProgramName = cell.guideProgramName; if (!guideProgramName) { guideProgramName = cell.querySelector('.guideProgramName'); @@ -396,7 +395,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', try { program.StartDateLocal = datetime.parseISO8601Date(program.StartDate, { toLocal: true }); } catch (err) { - console.log('error parsing timestamp for start date'); + console.error('error parsing timestamp for start date'); } } @@ -404,7 +403,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', try { program.EndDateLocal = datetime.parseISO8601Date(program.EndDate, { toLocal: true }); } catch (err) { - console.log('error parsing timestamp for end date'); + console.error('error parsing timestamp for end date'); } } @@ -416,7 +415,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', var status; if (item.Type === 'SeriesTimer') { - return 'fiber_smart_record'; + return ''; } else if (item.TimerId || item.SeriesTimerId) { status = item.Status || 'Cancelled'; @@ -430,13 +429,13 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', if (item.SeriesTimerId) { if (status !== 'Cancelled') { - return 'fiber_smart_record'; + return ''; } - return 'fiber_smart_record'; + return ''; } - return 'fiber_manual_record'; + return ''; } function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) { @@ -550,7 +549,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', html += '';
- html += '';
+ html += '';
html += '
' + program.Name;
@@ -1106,7 +1105,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
var icon = cell.querySelector('.timerIcon');
if (!icon) {
- cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', 'fiber_manual_record');
+ cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', '');
}
if (newTimerId) {
diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html
index 3f95448523..ef3c4b58ca 100644
--- a/src/components/guide/tvguide.template.html
+++ b/src/components/guide/tvguide.template.html
@@ -10,7 +10,7 @@
@@ -30,9 +30,9 @@
diff --git a/src/components/headroom/headroom.js b/src/components/headroom/headroom.js
index 9c058a8e82..3c0ada3ce9 100644
--- a/src/components/headroom/headroom.js
+++ b/src/components/headroom/headroom.js
@@ -340,4 +340,4 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
};
return Headroom;
-});
\ No newline at end of file
+});
diff --git a/src/components/homescreensettings/homescreensettings.js b/src/components/homescreensettings/homescreensettings.js
index 152fc691f6..ccc6fa75f4 100644
--- a/src/components/homescreensettings/homescreensettings.js
+++ b/src/components/homescreensettings/homescreensettings.js
@@ -149,7 +149,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
currentHtml += '';
if (enableScrollX()) {
- html += '
';
- currentHtml += 'folder_open';
+ currentHtml += '';
currentHtml += '
';
diff --git a/src/components/homescreensettings/homescreensettings.template.html b/src/components/homescreensettings/homescreensettings.template.html
index 1ed2ec1b9c..d5bae685b8 100644
--- a/src/components/homescreensettings/homescreensettings.template.html
+++ b/src/components/homescreensettings/homescreensettings.template.html
@@ -129,4 +129,4 @@
-
\ No newline at end of file
+
diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js
index af574200f3..430c06bc57 100644
--- a/src/components/homesections/homesections.js
+++ b/src/components/homesections/homesections.js
@@ -40,26 +40,48 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
return getUserViews(apiClient, user.Id).then(function (userViews) {
var html = '';
- var sectionCount = 7;
- for (var i = 0; i < sectionCount; i++) {
- html += '';
- }
+ if (userViews.length) {
+ var sectionCount = 7;
+ for (var i = 0; i < sectionCount; i++) {
+ html += '';
+ }
- elem.innerHTML = html;
- elem.classList.add('homeSectionsContainer');
+ elem.innerHTML = html;
+ elem.classList.add('homeSectionsContainer');
- var promises = [];
- var sections = getAllSectionsToShow(userSettings, sectionCount);
- for (var i = 0; i < sections.length; i++) {
- promises.push(loadSection(elem, apiClient, user, userSettings, userViews, sections, i));
- }
+ var promises = [];
+ var sections = getAllSectionsToShow(userSettings, sectionCount);
+ for (var i = 0; i < sections.length; i++) {
+ promises.push(loadSection(elem, apiClient, user, userSettings, userViews, sections, i));
+ }
- return Promise.all(promises).then(function () {
- return resume(elem, {
- refresh: true,
- returnPromise: false
+ return Promise.all(promises).then(function () {
+ return resume(elem, {
+ refresh: true,
+ returnPromise: false
+ });
});
- });
+ } else {
+ var noLibDescription;
+ if (user['Policy'] && user['Policy']['IsAdministrator']) {
+ noLibDescription = Globalize.translate("NoCreatedLibraries", '', '')
+ } else {
+ noLibDescription = Globalize.translate("AskAdminToCreateLibrary");
+ }
+
+ html += '';
@@ -159,8 +159,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
currentHtml += '
';
- currentHtml += '';
- currentHtml += '';
+ currentHtml += '';
+ currentHtml += '';
currentHtml += '';
+ html += '
';
+ elem.innerHTML = html;
+
+ var createNowLink = elem.querySelector("#button-createLibrary")
+ if (createNowLink) {
+ createNowLink.addEventListener("click", function () {
+ Dashboard.navigate("library.html");
+ });
+ }
+ }
});
}
@@ -260,7 +282,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '' + Globalize.translate("MessageNothingHere") + '
'; + html += '' + noLibDescription + '
' + html += ''; html += globalize.translate('LatestFromLibrary', parent.Name); html += '
'; - html += 'chevron_right'; + html += ''; html += ''; } else { html += '' + globalize.translate('LatestFromLibrary', parent.Name) + '
'; @@ -268,7 +290,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '';
+ html += '
';
html += '
';
} else {
html += '
';
@@ -321,7 +343,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
if (userViews.length) {
html += '
' + globalize.translate('HeaderMyMedia') + '
'; if (enableScrollX()) { - html += '';
+ html += '
';
html += '
';
} else {
html += '
';
@@ -401,7 +423,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '
' + globalize.translate('HeaderContinueWatching') + '
'; if (enableScrollX()) { - html += '';
+ html += '
';
html += '
';
} else {
html += '
';
@@ -474,7 +496,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '
' + globalize.translate('HeaderContinueWatching') + '
'; if (enableScrollX()) { - html += '';
+ html += '
';
html += '
';
} else {
html += '
';
@@ -560,7 +582,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '
';
if (enableScrollX()) {
- html += '';
+ html += '
';
html += '
';
} else {
html += '
';
@@ -608,7 +630,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '
';
if (enableScrollX()) {
- html += ''; html += globalize.translate('HeaderOnNow'); html += '
'; - html += 'chevron_right'; + html += ''; html += ''; } else { @@ -617,7 +639,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '';
+ html += '
';
html += '
';
@@ -917,7 +917,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
for (var i = 0; i < items.length; i++) {
html += ''
} else {
html += '
';
+ elem.innerHTML = '
';
}
stopInterval();
diff --git a/src/components/maintabsmanager.js b/src/components/maintabsmanager.js
index 64e25b4870..2571470015 100644
--- a/src/components/maintabsmanager.js
+++ b/src/components/maintabsmanager.js
@@ -264,4 +264,4 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
getTabsElement: getTabsElement,
selectedTabIndex: selectedTabIndex
};
-});
\ No newline at end of file
+});
diff --git a/src/components/mediainfo/fresh.png b/src/components/mediainfo/fresh.png
deleted file mode 100644
index 701ef6a8c0..0000000000
Binary files a/src/components/mediainfo/fresh.png and /dev/null differ
diff --git a/src/components/mediainfo/mediainfo.css b/src/components/mediainfo/mediainfo.css
index b957c3a5b2..1883b78726 100644
--- a/src/components/mediainfo/mediainfo.css
+++ b/src/components/mediainfo/mediainfo.css
@@ -54,11 +54,11 @@
}
.mediaInfoCriticRatingFresh {
- background-image: url(fresh.png);
+ background-image: url(../../assets/img/fresh.svg);
}
.mediaInfoCriticRatingRotten {
- background-image: url(rotten.png);
+ background-image: url(../../assets/img/rotten.svg);
}
.mediaInfoProgramAttribute {
diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js
index 8aaad95056..188ea9a07c 100644
--- a/src/components/mediainfo/mediainfo.js
+++ b/src/components/mediainfo/mediainfo.js
@@ -6,7 +6,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
var status;
if (item.Type === 'SeriesTimer') {
- return 'fiber_smart_record';
+ return '';
} else if (item.TimerId || item.SeriesTimerId) {
status = item.Status || 'Cancelled';
@@ -20,13 +20,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
if (item.SeriesTimerId) {
if (status !== 'Cancelled') {
- return 'fiber_smart_record';
+ return '';
}
- return 'fiber_smart_record';
+ return '';
}
- return 'fiber_manual_record';
+ return '';
}
function getProgramInfoHtml(item, options) {
@@ -57,7 +57,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.StartDate);
+ console.error("error parsing date: " + item.StartDate);
}
}
@@ -143,7 +143,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
text = datetime.toLocaleDateString(date);
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.PremiereDate);
+ console.error("error parsing date: " + item.PremiereDate);
}
}
}
@@ -176,7 +176,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
miscInfo.push(text);
}
} catch (e) {
- console.log("Error parsing date: " + item.StartDate);
+ console.error("error parsing date: " + item.StartDate);
}
}
@@ -200,7 +200,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
}
} catch (e) {
- console.log("Error parsing date: " + item.EndDate);
+ console.error("error parsing date: " + item.EndDate);
}
}
@@ -248,7 +248,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
text = globalize.translate('OriginalAirDateValue', datetime.toLocaleDateString(date));
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.PremiereDate);
+ console.error("error parsing date: " + item.PremiereDate);
}
} else if (item.ProductionYear) {
miscInfo.push(item.ProductionYear);
@@ -267,7 +267,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.PremiereDate);
+ console.error("error parsing date: " + item.PremiereDate);
}
}
}
@@ -385,16 +385,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
}
function getStarIconsHtml(item) {
-
var html = '';
- var rating = item.CommunityRating;
-
- if (rating) {
+ if (item.CommunityRating) {
html += '
';
if (formatString) {
- html += '';
+ html += '';
}
html += '';
@@ -683,7 +705,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '
';
if (enableScrollX()) {
- html += ''; html += globalize.translate('HeaderNextUp'); html += '
'; - html += 'chevron_right'; + html += ''; html += ''; } else { html += '' + globalize.translate('HeaderNextUp') + '
'; @@ -691,7 +713,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la html += '';
+ html += '
diff --git a/src/components/listview/listview.css b/src/components/listview/listview.css
index 1a37e45561..b653502dae 100644
--- a/src/components/listview/listview.css
+++ b/src/components/listview/listview.css
@@ -111,6 +111,10 @@
text-overflow: ellipsis;
}
+.layout-desktop .listItemBodyText {
+ margin: 0.25em 0 0 0;
+}
+
.listItemBodyText-nowrap {
white-space: nowrap;
}
@@ -162,13 +166,14 @@
@media all and (max-width: 64em) {
.listItemImage-large {
- width: 33.75vw;
- height: 22.5vw;
+ width: 22vw;
+ height: 16vw;
margin-right: 0 !important;
}
+ .listItemIndicators,
.listItemImageButton {
- font-size: 1em !important;
+ font-size: 0.6em !important;
}
.listItemBody {
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 8f93b31332..b38d601e3b 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -262,14 +262,13 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
if (!clickEntireItem && options.dragHandle) {
- //html += '';
+ //html += '';
// Firefox and Edge are not allowing the button to be draggable
- html += 'drag_handle';
+ html += '';
}
if (options.image !== false) {
var imgUrl = options.imageSource === 'channel' ? getChannelImageUrl(item, downloadWidth) : getImageUrl(item, downloadWidth);
- console.log(imgUrl);
var imageClass = isLargeStyle ? 'listItemImage listItemImage-large' : 'listItemImage';
if (isLargeStyle && layoutManager.tv) {
@@ -298,7 +297,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
if (playOnImageClick) {
- html += '';
+ html += '';
}
var progressHtml = indicators.getProgressBarHtml(item, {
@@ -427,7 +426,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '';
html += '
\ No newline at end of file
+'
} else {
html += '
-';
@@ -763,7 +785,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
html += '
';
if (enableScrollX()) {
- html += '';
+ html += '
";
}
@@ -463,7 +463,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
if (!typeOptions) {
typeOptions = {
- Type: type
+ Type: originalTypeOption.Type
};
options.TypeOptions.push(typeOptions);
}
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index ebfdacaa19..377488f44f 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -147,4 +147,4 @@
';
html += '
";
if (i > 0) {
- html += '';
+ html += '';
} else if (plugins.length > 1) {
- html += '';
+ html += '';
}
html += "'
} else {
html += '
";
}
@@ -220,9 +220,9 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
html += "";
html += "';
diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js
index 86f05dabfa..338b8e6fef 100644
--- a/src/components/htmlMediaHelper.js
+++ b/src/components/htmlMediaHelper.js
@@ -114,12 +114,12 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
if (!recoverDecodingErrorDate || (now - recoverDecodingErrorDate) > 3000) {
recoverDecodingErrorDate = now;
- console.log('try to recover media Error ...');
+ console.debug('try to recover media Error ...');
hlsPlayer.recoverMediaError();
} else {
if (!recoverSwapAudioCodecDate || (now - recoverSwapAudioCodecDate) > 3000) {
recoverSwapAudioCodecDate = now;
- console.log('try to swap Audio Codec and recover media Error ...');
+ console.debug('try to swap Audio Codec and recover media Error ...');
hlsPlayer.swapAudioCodec();
hlsPlayer.recoverMediaError();
} else {
@@ -233,7 +233,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
return Promise.resolve();
}
} catch (err) {
- console.log('error calling video.play: ' + err);
+ console.error('error calling video.play: ' + err);
return Promise.reject();
}
}
@@ -245,7 +245,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
try {
player.unload();
} catch (err) {
- console.log(err);
+ console.error(err);
}
instance._castPlayer = null;
@@ -258,7 +258,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
try {
player.destroy();
} catch (err) {
- console.log(err);
+ console.error(err);
}
instance._shakaPlayer = null;
@@ -271,7 +271,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
try {
player.destroy();
} catch (err) {
- console.log(err);
+ console.error(err);
}
instance._hlsPlayer = null;
@@ -286,7 +286,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
player.detachMediaElement();
player.destroy();
} catch (err) {
- console.log(err);
+ console.error(err);
}
instance._flvPlayer = null;
@@ -307,14 +307,14 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
hls.on(Hls.Events.ERROR, function (event, data) {
- console.log('HLS Error: Type: ' + data.type + ' Details: ' + (data.details || '') + ' Fatal: ' + (data.fatal || false));
+ console.error('HLS Error: Type: ' + data.type + ' Details: ' + (data.details || '') + ' Fatal: ' + (data.fatal || false));
switch (data.type) {
case Hls.ErrorTypes.NETWORK_ERROR:
// try to recover network error
if (data.response && data.response.code && data.response.code >= 400) {
- console.log('hls.js response error code: ' + data.response.code);
+ console.debug('hls.js response error code: ' + data.response.code);
// Trigger failure differently depending on whether this is prior to start of playback, or after
hls.destroy();
@@ -343,7 +343,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
// This could be a CORS error related to access control response headers
- console.log('hls.js response error code: ' + data.response.code);
+ console.debug('hls.js response error code: ' + data.response.code);
// Trigger failure differently depending on whether this is prior to start of playback, or after
hls.destroy();
@@ -355,20 +355,20 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
onErrorInternal(instance, 'network');
}
} else {
- console.log("fatal network error encountered, try to recover");
+ console.debug("fatal network error encountered, try to recover");
hls.startLoad();
}
break;
case Hls.ErrorTypes.MEDIA_ERROR:
- console.log("fatal media error encountered, try to recover");
+ console.debug("fatal media error encountered, try to recover");
var currentReject = reject;
reject = null;
handleHlsJsMediaError(instance, currentReject);
break;
default:
- console.log('Cannot recover from hls error - destroy and trigger error');
+ console.debug('Cannot recover from hls error - destroy and trigger error');
// cannot recover
// Trigger failure differently depending on whether this is prior to start of playback, or after
hls.destroy();
@@ -463,4 +463,4 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
getCrossOriginValue: getCrossOriginValue,
getBufferedRanges: getBufferedRanges
};
-});
\ No newline at end of file
+});
diff --git a/src/components/htmlaudioplayer/plugin.js b/src/components/htmlaudioplayer/plugin.js
index ef64bad046..8cae76bbee 100644
--- a/src/components/htmlaudioplayer/plugin.js
+++ b/src/components/htmlaudioplayer/plugin.js
@@ -16,7 +16,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
// Need to record the starting volume on each pass rather than querying elem.volume
// This is due to iOS safari not allowing volume changes and always returning the system volume value
var newVolume = Math.max(0, startingVolume - 0.15);
- console.log('fading volume to ' + newVolume);
+ console.debug('fading volume to ' + newVolume);
elem.volume = newVolume;
if (newVolume <= 0) {
@@ -113,7 +113,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
bindEvents(elem);
var val = options.url;
- console.log('playing url: ' + val);
+ console.debug('playing url: ' + val);
// Convert to seconds
var seconds = (options.playerStartPositionTicks || 0) / 10000000;
@@ -298,7 +298,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
var errorCode = this.error ? (this.error.code || 0) : 0;
var errorMessage = this.error ? (this.error.message || '') : '';
- console.log('Media element error: ' + errorCode.toString() + ' ' + errorMessage);
+ console.error('media element error: ' + errorCode.toString() + ' ' + errorMessage);
var type;
diff --git a/src/components/htmlvideoplayer/plugin.js b/src/components/htmlvideoplayer/plugin.js
index d2f9632adb..3ac45aabb9 100644
--- a/src/components/htmlvideoplayer/plugin.js
+++ b/src/components/htmlvideoplayer/plugin.js
@@ -1,5 +1,6 @@
-define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackManager', 'appRouter', 'appSettings', 'connectionManager', 'htmlMediaHelper', 'itemHelper', 'fullscreenManager'], function (browser, require, events, appHost, loading, dom, playbackManager, appRouter, appSettings, connectionManager, htmlMediaHelper, itemHelper, fullscreenManager) {
+define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackManager', 'appRouter', 'appSettings', 'connectionManager', 'htmlMediaHelper', 'itemHelper', 'fullscreenManager', 'globalize'], function (browser, require, events, appHost, loading, dom, playbackManager, appRouter, appSettings, connectionManager, htmlMediaHelper, itemHelper, fullscreenManager, globalize) {
"use strict";
+ /* globals cast */
var mediaManager;
@@ -11,7 +12,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
try {
parentNode.removeChild(elem);
} catch (err) {
- console.log('Error removing dialog element: ' + err);
+ console.error('error removing dialog element: ' + err);
}
}
}
@@ -242,7 +243,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
loading.show();
- console.log('prefetching hls playlist: ' + hlsPlaylistUrl);
+ console.debug('prefetching hls playlist: ' + hlsPlaylistUrl);
return connectionManager.getApiClient(item.ServerId).ajax({
@@ -251,7 +252,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
}).then(function () {
- console.log('completed prefetching hls playlist: ' + hlsPlaylistUrl);
+ console.debug('completed prefetching hls playlist: ' + hlsPlaylistUrl);
loading.hide();
streamInfo.url = hlsPlaylistUrl;
@@ -260,7 +261,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
}, function () {
- console.log('error prefetching hls playlist: ' + hlsPlaylistUrl);
+ console.error('error prefetching hls playlist: ' + hlsPlaylistUrl);
loading.hide();
return Promise.resolve();
@@ -357,6 +358,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return new Promise(function (resolve, reject) {
require(['shaka'], function () {
+ /* globals shaka */
var player = new shaka.Player(elem);
@@ -408,7 +410,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
lrd.media.streamType = cast.receiver.media.StreamType.OTHER;
lrd.media.customData = options;
- console.log('loading media url into mediaManager');
+ console.debug('loading media url into media manager');
try {
mediaManager.load(lrd);
@@ -418,7 +420,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return Promise.resolve();
} catch (err) {
- console.log('mediaManager error: ' + err);
+ console.debug('media manager error: ' + err);
return Promise.reject();
}
}
@@ -460,11 +462,11 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
protocol = cast.player.api.CreateSmoothStreamingProtocol(host);
}
- console.log('loading playback url: ' + url);
- console.log('contentType: ' + contentType);
+ console.debug('loading playback url: ' + url);
+ console.debug('content type: ' + contentType);
host.onError = function (errorCode) {
- console.log("Fatal Error - " + errorCode);
+ console.error("fatal Error - " + errorCode);
};
mediaElement.autoplay = false;
@@ -499,7 +501,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
elem.removeEventListener('error', onError);
var val = options.url;
- console.log('playing url: ' + val);
+ console.debug('playing url: ' + val);
// Convert to seconds
var seconds = (options.playerStartPositionTicks || 0) / 10000000;
@@ -608,7 +610,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
} else if (currentTrackEvents) {
setTrackEventsSubtitleOffset(currentTrackEvents, offsetValue);
} else {
- console.log("No available track, cannot apply offset: ", offsetValue);
+ console.debug("No available track, cannot apply offset: ", offsetValue);
}
}
};
@@ -727,22 +729,18 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
// https://msdn.microsoft.com/en-us/library/hh772507(v=vs.85).aspx
var elemAudioTracks = elem.audioTracks || [];
- console.log('found ' + elemAudioTracks.length + ' audio tracks');
+ console.debug('found ' + elemAudioTracks.length + ' audio tracks');
for (i = 0, length = elemAudioTracks.length; i < length; i++) {
if (audioIndex === i) {
- console.log('setting audio track ' + i + ' to enabled');
+ console.debug('setting audio track ' + i + ' to enabled');
elemAudioTracks[i].enabled = true;
} else {
- console.log('setting audio track ' + i + ' to disabled');
+ console.debug('setting audio track ' + i + ' to disabled');
elemAudioTracks[i].enabled = false;
}
}
-
- setTimeout(function () {
- elem.currentTime = elem.currentTime;
- }, 100);
};
self.stop = function (destroyPlayer) {
@@ -911,7 +909,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
function onError() {
var errorCode = this.error ? (this.error.code || 0) : 0;
var errorMessage = this.error ? (this.error.message || '') : '';
- console.log('Media element error: ' + errorCode.toString() + ' ' + errorMessage);
+ console.error('media element error: ' + errorCode.toString() + ' ' + errorMessage);
var type;
@@ -1115,9 +1113,10 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
function renderSsaAss(videoElement, track, item) {
if (supportsCanvas() && supportsWebWorkers()) {
+ console.debug('rendering subtitles with SubtitlesOctopus');
renderWithSubtitlesOctopus(videoElement, track, item);
} else {
- console.log('rendering subtitles with libjass');
+ console.debug('rendering subtitles with libjass');
renderWithLibjass(videoElement, track, item);
}
}
@@ -1137,7 +1136,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
var videoElement = self._mediaElement;
var width = videoElement.offsetWidth;
var height = videoElement.offsetHeight;
- console.log('videoElement resized: ' + width + 'x' + height);
+ console.debug('videoElement resized: ' + width + 'x' + height);
renderer.resize(width, height, 0, 0);
}
}
@@ -1254,7 +1253,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
trackElement.removeCue(trackElement.cues[0]);
}
} catch (e) {
- console.log('Error removing cue from textTrack');
+ console.error('error removing cue from textTrack');
}
trackElement.mode = 'disabled';
@@ -1268,7 +1267,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
fetchSubtitles(track, item).then(function (data) {
// show in ui
- console.log('downloaded ' + data.TrackEvents.length + ' track events');
+ console.debug('downloaded ' + data.TrackEvents.length + ' track events');
// add some cues to show the text
// in safari, the cues need to be added before setting the track mode to showing
data.TrackEvents.forEach(function (trackEvent) {
@@ -1294,7 +1293,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
try {
clock.seek(timeMs / 1000);
} catch (err) {
- console.log('Error in libjass: ' + err);
+ console.error('error in libjass: ' + err);
}
return;
}
@@ -1327,7 +1326,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
function setCurrentTrackElement(streamIndex) {
- console.log('Setting new text track index to: ' + streamIndex);
+ console.debug('setting new text track index to: ' + streamIndex);
var mediaStreamTextTracks = getMediaStreamTextTracks(self._currentPlayOptions.mediaSource);
@@ -1348,38 +1347,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
}
}
- function updateTextStreamUrls(startPositionTicks) {
-
- if (!supportsTextTracks()) {
- return;
- }
-
- var allTracks = self._mediaElement.textTracks; // get list of tracks
- var i;
- var track;
-
- for (i = 0; i < allTracks.length; i++) {
-
- track = allTracks[i];
-
- // This throws an error in IE, but is fine in chrome
- // In IE it's not necessary anyway because changing the src seems to be enough
- try {
- while (track.cues.length) {
- track.removeCue(track.cues[0]);
- }
- } catch (e) {
- console.log('Error removing cue from textTrack');
- }
- }
-
- var tracks = self._mediaElement.querySelectorAll('track');
- for (i = 0; i < tracks.length; i++) {
- track = tracks[i];
- track.src = replaceQueryString(track.src, 'startPositionTicks', startPositionTicks);
- }
- }
-
function createMediaElement(options) {
if (browser.tv || browser.iOS || browser.mobile) {
@@ -1590,7 +1557,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
};
function onPictureInPictureError(err) {
- console.log('Picture in picture error: ' + err.toString());
+ console.error('Picture in picture error: ' + err.toString());
}
HtmlVideoPlayer.prototype.setPictureInPictureEnabled = function (isEnabled) {
@@ -1651,9 +1618,13 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
if (document.AirPlayEnabled) {
if (video) {
if (isEnabled) {
- video.requestAirPlay().catch(onAirPlayError);
+ video.requestAirPlay().catch(function(err) {
+ console.error("Error requesting AirPlay", err)
+ });
} else {
- document.exitAirPLay().catch(onAirPlayError);
+ document.exitAirPLay().catch(function(err) {
+ console.error("Error exiting AirPlay", err)
+ });
}
}
} else {
@@ -1855,7 +1826,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
if (protocol) {
mediaCategory.stats.push({
- label: 'Protocol:',
+ label: globalize.translate("LabelProtocol"),
value: protocol
});
}
@@ -1865,12 +1836,12 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
if (this._hlsPlayer || this._shakaPlayer) {
mediaCategory.stats.push({
- label: 'Stream type:',
+ label: globalize.translate("LabelStreamType"),
value: 'HLS'
});
} else {
mediaCategory.stats.push({
- label: 'Stream type:',
+ label: globalize.translate("LabelStreamType"),
value: 'Video'
});
}
@@ -1882,13 +1853,13 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
categories.push(videoCategory);
var rect = mediaElement.getBoundingClientRect ? mediaElement.getBoundingClientRect() : {};
- var height = rect.height;
- var width = rect.width;
+ var height = parseInt(rect.height);
+ var width = parseInt(rect.width);
// Don't show player dimensions on smart TVs because the app UI could be lower resolution than the video and this causes users to think there is a problem
if (width && height && !browser.tv) {
videoCategory.stats.push({
- label: 'Player dimensions:',
+ label: globalize.translate("LabelPlayerDimensions"),
value: width + 'x' + height
});
}
@@ -1898,7 +1869,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
if (width && height) {
videoCategory.stats.push({
- label: 'Video resolution:',
+ label: globalize.translate("LabelVideoResolution"),
value: width + 'x' + height
});
}
@@ -1908,13 +1879,13 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
var droppedVideoFrames = playbackQuality.droppedVideoFrames || 0;
videoCategory.stats.push({
- label: 'Dropped frames:',
+ label: globalize.translate("LabelDroppedFrames"),
value: droppedVideoFrames
});
var corruptedVideoFrames = playbackQuality.corruptedVideoFrames || 0;
videoCategory.stats.push({
- label: 'Corrupted frames:',
+ label: globalize.translate("LabelCorruptedFrames"),
value: corruptedVideoFrames
});
}
diff --git a/src/components/humanedate.js b/src/components/humanedate.js
index 85d3a6d3bf..26ce26d942 100644
--- a/src/components/humanedate.js
+++ b/src/components/humanedate.js
@@ -25,6 +25,7 @@ define(["datetime"], function (datetime) {
if (seconds < 0) {
seconds = Math.abs(seconds);
}
+ // eslint-disable-next-line no-cond-assign
for (; format = time_formats[i++];) {
if (seconds < format[0]) {
if (2 == format.length) {
diff --git a/src/components/imagedownloader/imagedownloader.js b/src/components/imagedownloader/imagedownloader.js
index 019875f35c..ce53b5cf0d 100644
--- a/src/components/imagedownloader/imagedownloader.js
+++ b/src/components/imagedownloader/imagedownloader.js
@@ -116,8 +116,8 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
if (showControls) {
html += '
";
if (i > 0) {
- html += '';
+ html += '';
} else if (plugins.length > 1) {
- html += '';
+ html += '';
}
html += "';
- html += '';
- html += '';
+ html += '';
+ html += '';
html += '
';
}
@@ -277,7 +277,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
if (enableFooterButtons) {
html += '';
- html += '';
+ html += '';
html += '
';
}
diff --git a/src/components/imagedownloader/imagedownloader.template.html b/src/components/imagedownloader/imagedownloader.template.html
index 0dc3cc0661..dec796fb05 100644
--- a/src/components/imagedownloader/imagedownloader.template.html
+++ b/src/components/imagedownloader/imagedownloader.template.html
@@ -1,5 +1,5 @@
-
+
";
html += '${Search}
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index da3d673aa7..20aebf4305 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -155,15 +155,15 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', if (image.ImageType === "Backdrop" || image.ImageType === "Screenshot") { if (index > 0) { - html += ''; + html += ''; } else { - html += ''; + html += ''; } if (index < numImages - 1) { - html += ''; + html += ''; } else { - html += ''; + html += ''; } } else { if (imageProviders.length) { diff --git a/src/components/imageeditor/imageeditor.template.html b/src/components/imageeditor/imageeditor.template.html index 57b63550fd..37dce874c0 100644 --- a/src/components/imageeditor/imageeditor.template.html +++ b/src/components/imageeditor/imageeditor.template.html @@ -1,5 +1,5 @@
-
+
"
}
html += "${HeaderEditImages}
diff --git a/src/components/imageoptionseditor/imageoptionseditor.template.html b/src/components/imageoptionseditor/imageoptionseditor.template.html index 3e9a2ae8ce..910d8fdd6e 100644 --- a/src/components/imageoptionseditor/imageoptionseditor.template.html +++ b/src/components/imageoptionseditor/imageoptionseditor.template.html @@ -1,5 +1,5 @@
-
+
"
+ i > 0 ? html += '' : plugins.length > 1 && (html += ''), html += "${HeaderImageOptions}
diff --git a/src/components/images/imageFetcher.js b/src/components/images/imageFetcher.js index 54d3ef7502..1e13cebc77 100644 --- a/src/components/images/imageFetcher.js +++ b/src/components/images/imageFetcher.js @@ -35,4 +35,4 @@ define(['dom'], function (dom) { loadImage: loadImage }; -}); \ No newline at end of file +}); diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js index a2906cca85..764be06fd1 100644 --- a/src/components/images/imageLoader.js +++ b/src/components/images/imageLoader.js @@ -1,4 +1,4 @@ -define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', 'require', 'css!./style'], function (lazyLoader, imageFetcher, layoutManager, browser, appSettings, require) { +define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', 'userSettings', 'require', 'css!./style'], function (lazyLoader, imageFetcher, layoutManager, browser, appSettings, userSettings, require) { 'use strict'; var requestIdleCallback = window.requestIdleCallback || function (fn) { @@ -7,9 +7,6 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', var self = {}; - // seeing slow performance with firefox - var enableFade = false; - function fillImage(elem, source, enableEffects) { if (!elem) { @@ -30,7 +27,7 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', function fillImageElement(elem, source, enableEffects) { imageFetcher.loadImage(elem, source).then(function () { - if (enableFade && enableEffects !== false) { + if (enableEffects !== false) { fadeIn(elem); } @@ -39,10 +36,11 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', } function fadeIn(elem) { - - var cssClass = 'lazy-image-fadein'; - - elem.classList.add(cssClass); + if (userSettings.enableFastFadein()) { + elem.classList.add('lazy-image-fadein-fast'); + } else { + elem.classList.add('lazy-image-fadein'); + } } function lazyChildren(elem) { @@ -124,4 +122,4 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', self.getPrimaryImageAspectRatio = getPrimaryImageAspectRatio; return self; -}); \ No newline at end of file +}); diff --git a/src/components/imageuploader/imageuploader.js b/src/components/imageuploader/imageuploader.js index 198f540802..400646f669 100644 --- a/src/components/imageuploader/imageuploader.js +++ b/src/components/imageuploader/imageuploader.js @@ -47,7 +47,7 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', ' }; reader.onabort = function () { loading.hide(); - console.log('File read cancelled'); + console.debug('File read cancelled'); }; // Closure to capture the file information. diff --git a/src/components/imageuploader/imageuploader.template.html b/src/components/imageuploader/imageuploader.template.html index b27168075a..1b83b50955 100644 --- a/src/components/imageuploader/imageuploader.template.html +++ b/src/components/imageuploader/imageuploader.template.html @@ -1,5 +1,5 @@
-
+
diff --git a/src/components/itemcontextmenu.js b/src/components/itemcontextmenu.js
index 63c7350fd4..62048345ea 100644
--- a/src/components/itemcontextmenu.js
+++ b/src/components/itemcontextmenu.js
@@ -15,7 +15,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter",
commands.push({
name: globalize.translate("Play"),
id: "resume",
- icon: "play_arrow"
+ icon: ""
});
}
@@ -23,7 +23,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter",
commands.push({
name: globalize.translate("PlayAllFromHere"),
id: "playallfromhere",
- icon: "play_arrow"
+ icon: ""
});
}
}
@@ -346,22 +346,25 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter",
break;
case "copy-stream":
var downloadHref = apiClient.getItemDownloadUrl(itemId);
- var textArea = document.createElement("textarea");
- textArea.value = downloadHref;
- document.body.appendChild(textArea);
- textArea.focus();
- textArea.select();
- try {
- document.execCommand("copy");
-
+ navigator.clipboard.writeText(downloadHref).then(function () {
require(["toast"], function (toast) {
toast(globalize.translate("CopyStreamURLSuccess"));
});
- } catch (err) {
- console.error("Failed to copy to clipboard");
- }
-
- document.body.removeChild(textArea);
+ }, function () {
+ var textArea = document.createElement("textarea");
+ textArea.value = downloadHref;
+ document.body.appendChild(textArea);
+ textArea.focus();
+ textArea.select();
+ if (document.execCommand("copy")) {
+ require(["toast"], function (toast) {
+ toast(globalize.translate("CopyStreamURLSuccess"));
+ });
+ } else {
+ prompt(globalize.translate("CopyStreamURL"), downloadHref);
+ }
+ document.body.removeChild(textArea);
+ });
getResolveFunction(resolve, id)();
break;
case "editsubtitles":
diff --git a/src/components/itemidentifier/itemidentifier.template.html b/src/components/itemidentifier/itemidentifier.template.html
index 229c047553..9b3e58a864 100644
--- a/src/components/itemidentifier/itemidentifier.template.html
+++ b/src/components/itemidentifier/itemidentifier.template.html
@@ -1,6 +1,6 @@
diff --git a/src/components/itemsrefresher.js b/src/components/itemsrefresher.js
index 46956d2df5..6da74eef80 100644
--- a/src/components/itemsrefresher.js
+++ b/src/components/itemsrefresher.js
@@ -278,4 +278,4 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
};
return ItemsRefresher;
-});
\ No newline at end of file
+});
diff --git a/src/components/lazyloader/lazyloader-intersectionobserver.js b/src/components/lazyloader/lazyloader-intersectionobserver.js
index 1935f65a30..5f83742601 100644
--- a/src/components/lazyloader/lazyloader-intersectionobserver.js
+++ b/src/components/lazyloader/lazyloader-intersectionobserver.js
@@ -100,4 +100,4 @@ define(['require', 'browser'], function (require, browser) {
};
return LazyLoader;
-});
\ No newline at end of file
+});
diff --git a/src/components/lazyloader/lazyloader-scroll.js b/src/components/lazyloader/lazyloader-scroll.js
index 318f6dbea0..d5120146ce 100644
--- a/src/components/lazyloader/lazyloader-scroll.js
+++ b/src/components/lazyloader/lazyloader-scroll.js
@@ -186,4 +186,4 @@ define(['visibleinviewport', 'dom', 'browser'], function (visibleinviewport, dom
};
return LazyLoader;
-});
\ No newline at end of file
+});
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 261d20745b..193533bfc2 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -58,16 +58,16 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
for (var i = 0; i < plugins.length; i++) {
var plugin = plugins[i];
html += '
";
- i > 0 ? html += '' : plugins.length > 1 && (html += ''), html += "${HeaderUploadImage}
diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js index a8bd4c6200..e41ccb9775 100644 --- a/src/components/indicators/indicators.js +++ b/src/components/indicators/indicators.js @@ -62,7 +62,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun startDate = datetime.parseISO8601Date(item.StartDate).getTime(); endDate = datetime.parseISO8601Date(item.EndDate).getTime(); } catch (err) { - console.log(err); + console.error(err); } var now = new Date().getTime(); @@ -118,7 +118,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun var status; if (item.Type === 'SeriesTimer') { - return 'fiber_smart_record'; + return ''; } else if (item.TimerId || item.SeriesTimerId) { status = item.Status || 'Cancelled'; } else if (item.Type === 'Timer') { @@ -129,20 +129,20 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun if (item.SeriesTimerId) { if (status !== 'Cancelled') { - return 'fiber_smart_record'; + return ''; } - return 'fiber_smart_record'; + return ''; } - return 'fiber_manual_record'; + return ''; } function getSyncIndicator(item) { if (item.SyncPercent === 100) { - return 'file_download
';
+ return '';
} else if (item.SyncPercent != null) {
- return '
file_download
';
+ return '';
}
return '';
@@ -152,9 +152,12 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
if (item.Type === 'Video') {
return '
videocam
';
}
- if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') {
+ if (item.Type === 'Folder') {
return 'folder
';
}
+ if (item.Type === 'PhotoAlbum') {
+ return '';
+ }
if (item.Type === 'Photo') {
return '
photo
';
}
@@ -171,7 +174,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
return 'Unaired
';
}
} catch (err) {
- console.log(err);
+ console.error(err);
}
}
return 'Missing
';
diff --git a/src/components/input/gamepadtokey.js b/src/components/input/gamepadtokey.js
index 2bd5f94f7a..73f587f43b 100644
--- a/src/components/input/gamepadtokey.js
+++ b/src/components/input/gamepadtokey.js
@@ -361,4 +361,4 @@ require(['apphost'], function (appHost) {
window.navigator.gamepadInputEmulation = "gamepad";
}
-});
\ No newline at end of file
+});
diff --git a/src/components/input/keyboardnavigation.js b/src/components/input/keyboardnavigation.js
index 3840c08e8a..956c847a51 100644
--- a/src/components/input/keyboardnavigation.js
+++ b/src/components/input/keyboardnavigation.js
@@ -1,8 +1,6 @@
define(["inputManager", "layoutManager"], function (inputManager, layoutManager) {
"use strict";
- console.log("keyboardnavigation");
-
/**
* Key name mapping.
*/
@@ -36,11 +34,16 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
10252: "MediaPlayPause"
};
+ /**
+ * Keys used for keyboard navigation.
+ */
+ var NavigationKeys = ["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"];
+
var hasFieldKey = false;
try {
hasFieldKey = "key" in new KeyboardEvent("keydown");
} catch (e) {
- console.log("error checking 'key' field");
+ console.error("error checking 'key' field");
}
if (!hasFieldKey) {
@@ -60,11 +63,28 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
return KeyNames[event.keyCode] || event.key;
}
+ /**
+ * Returns _true_ if key is used for navigation.
+ *
+ * @param {string} key name
+ * @return {boolean} _true_ if key is used for navigation
+ */
+ function isNavigationKey(key) {
+ return NavigationKeys.indexOf(key) != -1;
+ }
+
function enable() {
document.addEventListener("keydown", function (e) {
+ var key = getKeyName(e);
+
+ // Ignore navigation keys for non-TV
+ if (!layoutManager.tv && isNavigationKey(key)) {
+ return;
+ }
+
var capture = true;
- switch (getKeyName(e)) {
+ switch (key) {
case "ArrowLeft":
inputManager.handle("left");
break;
@@ -120,7 +140,7 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
}
if (capture) {
- console.log("Disabling default event handling");
+ console.debug("disabling default event handling");
e.preventDefault();
}
});
@@ -159,6 +179,7 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
return {
enable: enable,
- getKeyName: getKeyName
+ getKeyName: getKeyName,
+ isNavigationKey: isNavigationKey
};
});
diff --git a/src/components/input/mouseManager.js b/src/components/input/mouseManager.js
index ffea3b01ff..78057c0bfe 100644
--- a/src/components/input/mouseManager.js
+++ b/src/components/input/mouseManager.js
@@ -166,4 +166,4 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
events.on(layoutManager, 'modechange', initMouse);
return self;
-});
\ No newline at end of file
+});
diff --git a/src/components/itemMediaInfo/itemMediaInfo.template.html b/src/components/itemMediaInfo/itemMediaInfo.template.html
index afe0023cdd..d5f583dcab 100644
--- a/src/components/itemMediaInfo/itemMediaInfo.template.html
+++ b/src/components/itemMediaInfo/itemMediaInfo.template.html
@@ -1,6 +1,6 @@
${HeaderMediaInfo}
${Identify}
';
- html += 'live_tv';
+ html += '';
html += '
";
}
@@ -120,7 +120,7 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
html += plugin.Name;
html += "";
html += "';
html += '
";
if (i > 0) {
- html += '';
+ html += '';
} else if (plugins.length > 1) {
- html += '';
+ html += '';
}
html += "'; html += plugin.Name; html += "
"; html += "' + globalize.translate("LabelMetadataDownloadersHelp") + "
";
@@ -181,9 +181,9 @@ define(["globalize", "dom", "emby-checkbox", "emby-select", "emby-input"], funct
html += "";
html += "${SaveSubtitlesIntoMediaFoldersHelp}
';
- var moreIcon = 'more_horiz';
+ var moreIcon = '';
html += getTextLinesHtml(textlines, isLargeStyle);
@@ -471,10 +470,12 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += indicators.getTimerIndicator(item).replace('indicatorIcon', 'indicatorIcon listItemAside');
}
+ html += '
';
diff --git a/src/components/loading/loading.js b/src/components/loading/loading.js
index 510f311217..d6c00347c7 100644
--- a/src/components/loading/loading.js
+++ b/src/components/loading/loading.js
@@ -81,4 +81,4 @@ define(['components/loading/loadingLegacy', 'browser', 'css!./loading'], functio
}
}
};
-});
\ No newline at end of file
+});
diff --git a/src/components/logoscreensaver/logowhite.png b/src/components/logoscreensaver/logowhite.png
deleted file mode 100644
index 560d910d74..0000000000
Binary files a/src/components/logoscreensaver/logowhite.png and /dev/null differ
diff --git a/src/components/logoscreensaver/plugin.js b/src/components/logoscreensaver/plugin.js
index 0eb5e85d31..7716bbf6e5 100644
--- a/src/components/logoscreensaver/plugin.js
+++ b/src/components/logoscreensaver/plugin.js
@@ -160,7 +160,7 @@ define(["pluginManager"], function (pluginManager) {
elem.classList.add("logoScreenSaver");
document.body.appendChild(elem);
- elem.innerHTML = '';
+
if (!clickEntireItem) {
if (options.addToListButton) {
- html += '';
+ html += '';
}
if (options.moreButton !== false) {
@@ -482,7 +483,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
if (options.infoButton) {
- html += '';
+ html += '';
}
if (options.rightButtons) {
@@ -491,8 +492,6 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (options.enableUserDataButtons !== false) {
- html += '';
-
var userData = item.UserData || {};
var likes = userData.Likes == null ? '' : userData.Likes;
@@ -503,10 +502,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (itemHelper.canRate(item)) {
html += '';
}
-
- html += '';
}
}
+ html += '
';
if (enableContentWrapper) {
html += '';
}
stopInterval();
diff --git a/src/components/maintabsmanager.js b/src/components/maintabsmanager.js
index 64e25b4870..2571470015 100644
--- a/src/components/maintabsmanager.js
+++ b/src/components/maintabsmanager.js
@@ -264,4 +264,4 @@ define(['dom', 'browser', 'events', 'emby-tabs', 'emby-button'], function (dom,
getTabsElement: getTabsElement,
selectedTabIndex: selectedTabIndex
};
-});
\ No newline at end of file
+});
diff --git a/src/components/mediainfo/fresh.png b/src/components/mediainfo/fresh.png
deleted file mode 100644
index 701ef6a8c0..0000000000
Binary files a/src/components/mediainfo/fresh.png and /dev/null differ
diff --git a/src/components/mediainfo/mediainfo.css b/src/components/mediainfo/mediainfo.css
index b957c3a5b2..1883b78726 100644
--- a/src/components/mediainfo/mediainfo.css
+++ b/src/components/mediainfo/mediainfo.css
@@ -54,11 +54,11 @@
}
.mediaInfoCriticRatingFresh {
- background-image: url(fresh.png);
+ background-image: url(../../assets/img/fresh.svg);
}
.mediaInfoCriticRatingRotten {
- background-image: url(rotten.png);
+ background-image: url(../../assets/img/rotten.svg);
}
.mediaInfoProgramAttribute {
diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js
index 8aaad95056..188ea9a07c 100644
--- a/src/components/mediainfo/mediainfo.js
+++ b/src/components/mediainfo/mediainfo.js
@@ -6,7 +6,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
var status;
if (item.Type === 'SeriesTimer') {
- return 'fiber_smart_record';
+ return '';
} else if (item.TimerId || item.SeriesTimerId) {
status = item.Status || 'Cancelled';
@@ -20,13 +20,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
if (item.SeriesTimerId) {
if (status !== 'Cancelled') {
- return 'fiber_smart_record';
+ return '';
}
- return 'fiber_smart_record';
+ return '';
}
- return 'fiber_manual_record';
+ return '';
}
function getProgramInfoHtml(item, options) {
@@ -57,7 +57,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.StartDate);
+ console.error("error parsing date: " + item.StartDate);
}
}
@@ -143,7 +143,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
text = datetime.toLocaleDateString(date);
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.PremiereDate);
+ console.error("error parsing date: " + item.PremiereDate);
}
}
}
@@ -176,7 +176,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
miscInfo.push(text);
}
} catch (e) {
- console.log("Error parsing date: " + item.StartDate);
+ console.error("error parsing date: " + item.StartDate);
}
}
@@ -200,7 +200,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
}
} catch (e) {
- console.log("Error parsing date: " + item.EndDate);
+ console.error("error parsing date: " + item.EndDate);
}
}
@@ -248,7 +248,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
text = globalize.translate('OriginalAirDateValue', datetime.toLocaleDateString(date));
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.PremiereDate);
+ console.error("error parsing date: " + item.PremiereDate);
}
} else if (item.ProductionYear) {
miscInfo.push(item.ProductionYear);
@@ -267,7 +267,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
miscInfo.push(text);
} catch (e) {
- console.log("Error parsing date: " + item.PremiereDate);
+ console.error("error parsing date: " + item.PremiereDate);
}
}
}
@@ -385,16 +385,13 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
}
function getStarIconsHtml(item) {
-
var html = '';
- var rating = item.CommunityRating;
-
- if (rating) {
+ if (item.CommunityRating) {
html += '';
html += 'star';
- html += rating;
+ html += item.CommunityRating.toFixed(1);
html += '
';
}
diff --git a/src/components/mediainfo/rotten.png b/src/components/mediainfo/rotten.png
deleted file mode 100644
index 8f81822a9d..0000000000
Binary files a/src/components/mediainfo/rotten.png and /dev/null differ
diff --git a/src/components/medialibrarycreator/medialibrarycreator.template.html b/src/components/medialibrarycreator/medialibrarycreator.template.html
index 4dcb7812d4..32c6b254b7 100644
--- a/src/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/src/components/medialibrarycreator/medialibrarycreator.template.html
@@ -1,5 +1,5 @@
-
+
diff --git a/src/components/medialibraryeditor/medialibraryeditor.template.html b/src/components/medialibraryeditor/medialibraryeditor.template.html
index 07e26b777b..172c535fa1 100644
--- a/src/components/medialibraryeditor/medialibraryeditor.template.html
+++ b/src/components/medialibraryeditor/medialibraryeditor.template.html
@@ -1,5 +1,5 @@
${ButtonAddMediaLibrary}
-
+
diff --git a/src/components/metadataeditor/metadataeditor.js b/src/components/metadataeditor/metadataeditor.js
index 030fdc80ce..e8736258fa 100644
--- a/src/components/metadataeditor/metadataeditor.js
+++ b/src/components/metadataeditor/metadataeditor.js
@@ -477,7 +477,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
html += '';
- html += 'live_tv';
+ html += '';
html += '
';
diff --git a/src/components/metadataeditor/metadataeditor.template.html b/src/components/metadataeditor/metadataeditor.template.html
index a09c2dd57b..8e36a824b7 100644
--- a/src/components/metadataeditor/metadataeditor.template.html
+++ b/src/components/metadataeditor/metadataeditor.template.html
@@ -1,5 +1,5 @@
diff --git a/src/components/metadataeditor/personeditor.js b/src/components/metadataeditor/personeditor.js
index 7883cfca1b..9fb6fdec6f 100644
--- a/src/components/metadataeditor/personeditor.js
+++ b/src/components/metadataeditor/personeditor.js
@@ -96,4 +96,4 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'require', 'paper-icon-but
return {
show: show
};
-});
\ No newline at end of file
+});
diff --git a/src/components/metadataeditor/personeditor.template.html b/src/components/metadataeditor/personeditor.template.html
index 57a46a0413..ec76f58c70 100644
--- a/src/components/metadataeditor/personeditor.template.html
+++ b/src/components/metadataeditor/personeditor.template.html
@@ -1,5 +1,5 @@
-
+
${Edit}
@@ -9,7 +9,7 @@ ${Save}
-
+
${Edit}
diff --git a/src/components/multidownload.js b/src/components/multidownload.js index a1881b8db9..d11e52de14 100644 --- a/src/components/multidownload.js +++ b/src/components/multidownload.js @@ -63,4 +63,4 @@ define(['browser'], function (browser) { download(url); }); }; -}); \ No newline at end of file +}); diff --git a/src/components/multiselect/multiselect.js b/src/components/multiselect/multiselect.js index b1367ef66b..b4fa87c8a0 100644 --- a/src/components/multiselect/multiselect.js +++ b/src/components/multiselect/multiselect.js @@ -129,7 +129,7 @@ define(["browser", "appStorage", "apphost", "loading", "connectionManager", "glo html += ''; html += ''; - var moreIcon = "more_horiz"; + var moreIcon = ""; html += ''; selectionCommandsPanel.innerHTML = html; diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js index d8191e9ef1..8da9b9c053 100644 --- a/src/components/nowplayingbar/nowplayingbar.js +++ b/src/components/nowplayingbar/nowplayingbar.js @@ -31,7 +31,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', html += '';
html += '';
html += '';
@@ -187,14 +187,29 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
volumeSliderContainer.classList.remove('hide');
}
+ var volumeSliderTimer;
+
function setVolume() {
+ clearTimeout(volumeSliderTimer);
+ volumeSliderTimer = null;
+
if (currentPlayer) {
currentPlayer.setVolume(this.value);
}
}
+
+ function setVolumeDelayed() {
+ if (!volumeSliderTimer) {
+ var that = this;
+ volumeSliderTimer = setTimeout(function () {
+ setVolume.call(that);
+ }, 700);
+ }
+ }
+
volumeSlider.addEventListener('change', setVolume);
- volumeSlider.addEventListener('mousemove', setVolume);
- volumeSlider.addEventListener('touchmove', setVolume);
+ volumeSlider.addEventListener('mousemove', setVolumeDelayed);
+ volumeSlider.addEventListener('touchmove', setVolumeDelayed);
positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
positionSlider.addEventListener('change', function () {
@@ -289,7 +304,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
if (isPaused) {
for (i = 0, length = playPauseButtons.length; i < length; i++) {
- playPauseButtons[i].querySelector('i').innerHTML = 'play_arrow';
+ playPauseButtons[i].querySelector('i').innerHTML = '';
}
} else {
@@ -393,20 +408,15 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
var showMuteButton = true;
var showVolumeSlider = true;
- var progressElement = volumeSliderContainer.querySelector('.mdl-slider-background-lower');
if (supportedCommands.indexOf('ToggleMute') === -1) {
showMuteButton = false;
}
if (isMuted) {
- muteButton.querySelector('i').innerHTML = 'volume_off';
+ muteButton.querySelector('i').innerHTML = '';
} else {
- muteButton.querySelector('i').innerHTML = 'volume_up';
- }
-
- if (progressElement) {
- progressElement.style.width = (volumeLevel || 0) + '%';
+ muteButton.querySelector('i').innerHTML = '';
}
if (supportedCommands.indexOf('SetVolume') === -1) {
@@ -581,8 +591,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
}
function onPlaybackStart(e, state) {
-
- //console.log('nowplaying event: ' + e.type);
+ console.debug('nowplaying event: ' + e.type);
var player = this;
@@ -627,7 +636,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
function onPlaybackStopped(e, state) {
- //console.log('nowplaying event: ' + e.type);
+ console.debug('nowplaying event: ' + e.type);
var player = this;
if (player.isLocalPlayer) {
@@ -653,7 +662,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
function onStateChanged(event, state) {
- //console.log('nowplaying event: ' + e.type);
+ console.debug('nowplaying event: ' + event.type);
var player = this;
if (!state.NowPlayingItem || layoutManager.tv) {
diff --git a/src/components/packagemanager.js b/src/components/packagemanager.js
index 03ed1006c1..46f4704522 100644
--- a/src/components/packagemanager.js
+++ b/src/components/packagemanager.js
@@ -149,4 +149,4 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
};
return new PackageManager();
-});
\ No newline at end of file
+});
diff --git a/src/components/photoplayer/plugin.js b/src/components/photoplayer/plugin.js
index 6629fbfb0f..4ebdbbd6d2 100644
--- a/src/components/photoplayer/plugin.js
+++ b/src/components/photoplayer/plugin.js
@@ -43,4 +43,4 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
};
return PhotoPlayer;
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/brightnessosd.js b/src/components/playback/brightnessosd.js
index 1a064ed39d..47551e8de6 100644
--- a/src/components/playback/brightnessosd.js
+++ b/src/components/playback/brightnessosd.js
@@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
function getOsdElementHtml() {
var html = '';
- html += 'brightness_high';
+ html += '';
html += '
';
@@ -102,11 +102,11 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
if (iconElement) {
if (brightness >= 80) {
- iconElement.innerHTML = 'brightness_high';
+ iconElement.innerHTML = '';
} else if (brightness >= 20) {
- iconElement.innerHTML = 'brightness_medium';
+ iconElement.innerHTML = '';
} else {
- iconElement.innerHTML = 'brightness_low';
+ iconElement.innerHTML = '';
}
}
if (progressElement) {
diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js
index 17b1af0257..2d1ef53c19 100644
--- a/src/components/playback/experimentalwarnings.js
+++ b/src/components/playback/experimentalwarnings.js
@@ -94,4 +94,4 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
};
return ExpirementalPlaybackWarnings;
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/playaccessvalidation.js b/src/components/playback/playaccessvalidation.js
index 35d8314fc1..46a6f7546c 100644
--- a/src/components/playback/playaccessvalidation.js
+++ b/src/components/playback/playaccessvalidation.js
@@ -47,4 +47,4 @@ define(['connectionManager', 'globalize'], function (connectionManager, globaliz
};
return PlayAccessValidation;
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index da04a2e13e..3a3bddd989 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -57,7 +57,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
addPlaylistToPlaybackReport(playbackManagerInstance, info, player, serverId);
}
- //console.log(method + '-' + JSON.stringify(info));
+ console.debug(method + '-' + JSON.stringify(info));
var apiClient = connectionManager.getApiClient(serverId);
apiClient[method](info);
}
@@ -1024,7 +1024,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
currentTargetInfo = targetInfo;
if (targetInfo) {
- console.log('Active player: ' + JSON.stringify(targetInfo));
+ console.debug('Active player: ' + JSON.stringify(targetInfo));
}
if (player && player.isLocalPlayer) {
@@ -2828,7 +2828,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
if (newItemInfo) {
- console.log('playing next track');
+ console.debug('playing next track');
var newItemPlayOptions = newItemInfo.item.playOptions || getDefaultPlayOptions();
@@ -3118,7 +3118,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
// medianotsupported
var errorType = error.type;
- console.log('playbackmanager playback error type: ' + (errorType || ''));
+ console.debug('playbackmanager playback error type: ' + (errorType || ''));
var streamInfo = error.streamInfo || getPlayerData(player).streamInfo;
@@ -3401,7 +3401,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
function getLiveStreamMediaInfo(player, streamInfo, mediaSource, liveStreamId, serverId) {
- console.log('getLiveStreamMediaInfo');
+ console.debug('getLiveStreamMediaInfo');
streamInfo.lastMediaInfoQuery = new Date().getTime();
@@ -3961,7 +3961,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
};
PlaybackManager.prototype.sendCommand = function (cmd, player) {
- console.log('MediaController received command: ' + cmd.Name);
+ console.debug('MediaController received command: ' + cmd.Name);
switch (cmd.Name) {
case 'SetRepeatMode':
this.setRepeatMode(cmd.Arguments.RepeatMode, player);
diff --git a/src/components/playback/playbackorientation.js b/src/components/playback/playbackorientation.js
index 3253d8acdf..5b178dbf08 100644
--- a/src/components/playback/playbackorientation.js
+++ b/src/components/playback/playbackorientation.js
@@ -9,7 +9,7 @@ define(['playbackManager', 'layoutManager', 'events'], function (playbackManager
function onOrientationChangeError(err) {
orientationLocked = false;
- console.log('error locking orientation: ' + err);
+ console.error('error locking orientation: ' + err);
}
events.on(playbackManager, 'playbackstart', function (e, player, state) {
@@ -46,10 +46,10 @@ define(['playbackManager', 'layoutManager', 'events'], function (playbackManager
try {
unlockOrientation();
} catch (err) {
- console.log('error unlocking orientation: ' + err);
+ console.error('error unlocking orientation: ' + err);
}
orientationLocked = false;
}
}
});
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/playmethodhelper.js b/src/components/playback/playmethodhelper.js
index 4e85f87093..75af04035c 100644
--- a/src/components/playback/playmethodhelper.js
+++ b/src/components/playback/playmethodhelper.js
@@ -21,4 +21,4 @@ define([], function () {
return {
getDisplayPlayMethod: getDisplayPlayMethod
};
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/playqueuemanager.js b/src/components/playback/playqueuemanager.js
index ed2076a814..429c4027f1 100644
--- a/src/components/playback/playqueuemanager.js
+++ b/src/components/playback/playqueuemanager.js
@@ -230,4 +230,4 @@ define([], function () {
};
return PlayQueueManager;
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/remotecontrolautoplay.js b/src/components/playback/remotecontrolautoplay.js
index d8316b87ef..90a872cc6e 100644
--- a/src/components/playback/remotecontrolautoplay.js
+++ b/src/components/playback/remotecontrolautoplay.js
@@ -32,16 +32,16 @@ define(['events', 'playbackManager'], function (events, playbackManager) {
}
if (!oldPlayer.isLocalPlayer) {
- console.log('Skipping remote control autoplay because oldPlayer is not a local player');
+ console.debug('Skipping remote control autoplay because oldPlayer is not a local player');
return;
}
if (newPlayer.isLocalPlayer) {
- console.log('Skipping remote control autoplay because newPlayer is a local player');
+ console.debug('Skipping remote control autoplay because newPlayer is a local player');
return;
}
transferPlayback(oldPlayer, newPlayer);
});
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js
index d1cd64c656..5d2c90ddb7 100644
--- a/src/components/playback/volumeosd.js
+++ b/src/components/playback/volumeosd.js
@@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
function getOsdElementHtml() {
var html = '';
- html += 'volume_up';
+ html += '';
html += '
';
@@ -101,7 +101,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
function updatePlayerVolumeState(isMuted, volume) {
if (iconElement) {
- iconElement.innerHTML = isMuted ? 'volume_off' : 'volume_up';
+ iconElement.innerHTML = isMuted ? '' : '';
}
if (progressElement) {
progressElement.style.width = (volume || 0) + '%';
diff --git a/src/components/playbacksettings/playbacksettings.js b/src/components/playbacksettings/playbacksettings.js
index 69915b18bf..d249b5b989 100644
--- a/src/components/playbacksettings/playbacksettings.js
+++ b/src/components/playbacksettings/playbacksettings.js
@@ -342,4 +342,4 @@ define(['require', 'browser', 'appSettings', 'apphost', 'focusManager', 'quality
};
return PlaybackSettings;
-});
\ No newline at end of file
+});
diff --git a/src/components/playbacksettings/playbacksettings.template.html b/src/components/playbacksettings/playbacksettings.template.html
index 06cfe3f3d6..0c8b726a40 100644
--- a/src/components/playbacksettings/playbacksettings.template.html
+++ b/src/components/playbacksettings/playbacksettings.template.html
@@ -86,4 +86,4 @@
-
\ No newline at end of file
+
diff --git a/src/components/playlisteditor/playlisteditor.js b/src/components/playlisteditor/playlisteditor.js
index b70bdc1442..c274b40799 100644
--- a/src/components/playlisteditor/playlisteditor.js
+++ b/src/components/playlisteditor/playlisteditor.js
@@ -258,7 +258,7 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackManager',
var title = globalize.translate('HeaderAddToPlaylist');
html += '
';
- html += '';
+ html += '';
html += '
diff --git a/src/components/qualityoptions.js b/src/components/qualityoptions.js
index e46a690e8a..5ad69cb790 100644
--- a/src/components/qualityoptions.js
+++ b/src/components/qualityoptions.js
@@ -160,4 +160,4 @@ define(['globalize'], function (globalize) {
getVideoQualityOptions: getVideoQualityOptions,
getAudioQualityOptions: getAudioQualityOptions
};
-});
\ No newline at end of file
+});
diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js
index 614d483b21..a51fac4305 100644
--- a/src/components/recordingcreator/recordingcreator.js
+++ b/src/components/recordingcreator/recordingcreator.js
@@ -202,4 +202,4 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
return {
show: showEditor
};
-});
\ No newline at end of file
+});
diff --git a/src/components/recordingcreator/recordingcreator.template.html b/src/components/recordingcreator/recordingcreator.template.html
index e8cb850338..b99ead300a 100644
--- a/src/components/recordingcreator/recordingcreator.template.html
+++ b/src/components/recordingcreator/recordingcreator.template.html
@@ -1,5 +1,5 @@
'; html += title; html += '
'; diff --git a/src/components/playmenu.js b/src/components/playmenu.js index 7225ff94e1..a410da6985 100644 --- a/src/components/playmenu.js +++ b/src/components/playmenu.js @@ -72,4 +72,4 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings' return { show: show }; -}); \ No newline at end of file +}); diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js index ec65e63e65..2126d73b3c 100644 --- a/src/components/pluginManager.js +++ b/src/components/pluginManager.js @@ -27,7 +27,7 @@ define(['events'], function (events) { PluginManager.prototype.loadPlugin = function (url) { - console.log('Loading plugin: ' + url); + console.debug('Loading plugin: ' + url); var instance = this; return new Promise(function (resolve, reject) { @@ -146,4 +146,4 @@ define(['events'], function (events) { }; return new PluginManager(); -}); \ No newline at end of file +}); diff --git a/src/components/polyfills/focusPreventScroll.js b/src/components/polyfills/focusPreventScroll.js index 6511c0426c..6df9e9928c 100644 --- a/src/components/polyfills/focusPreventScroll.js +++ b/src/components/polyfills/focusPreventScroll.js @@ -12,6 +12,7 @@ if (HTMLElement.prototype.nativeFocus === undefined) { }, true); var opts = Object.defineProperty({}, "preventScroll", { + // eslint-disable-next-line getter-return get: function () { supportsPreventScrollOption = true; } @@ -19,7 +20,7 @@ if (HTMLElement.prototype.nativeFocus === undefined) { focusElem.focus(opts); } catch (e) { - console.log("error checking preventScroll support"); + console.error("error checking preventScroll support"); } if (!supportsPreventScrollOption) { diff --git a/src/components/polyfills/objectassign.js b/src/components/polyfills/objectassign.js index bf8d7118a5..85f55aa144 100644 --- a/src/components/polyfills/objectassign.js +++ b/src/components/polyfills/objectassign.js @@ -11,6 +11,7 @@ if (typeof Object.assign != 'function') { var source = arguments[index]; if (source !== undefined && source !== null) { for (var nextKey in source) { + // eslint-disable-next-line no-prototype-builtins if (source.hasOwnProperty(nextKey)) { output[nextKey] = source[nextKey]; } diff --git a/src/components/prompt/nativeprompt.js b/src/components/prompt/nativeprompt.js index b0634bd428..ba7f1a9a49 100644 --- a/src/components/prompt/nativeprompt.js +++ b/src/components/prompt/nativeprompt.js @@ -25,4 +25,4 @@ define([], function () { return Promise.reject(result); } }; -}); \ No newline at end of file +}); diff --git a/src/components/prompt/prompt.js b/src/components/prompt/prompt.js index 6e8e019c83..8f4f839eaa 100644 --- a/src/components/prompt/prompt.js +++ b/src/components/prompt/prompt.js @@ -101,4 +101,4 @@ define(['dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'dom', 're }); }); }; -}); \ No newline at end of file +}); diff --git a/src/components/prompt/prompt.template.html b/src/components/prompt/prompt.template.html index 8e78a64cbc..23b918a1f2 100644 --- a/src/components/prompt/prompt.template.html +++ b/src/components/prompt/prompt.template.html @@ -1,6 +1,6 @@
-
+
diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js
index 3a1d4ba943..86c731ad26 100644
--- a/src/components/recordingcreator/recordingeditor.js
+++ b/src/components/recordingcreator/recordingeditor.js
@@ -159,4 +159,4 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
return {
show: showEditor
};
-});
\ No newline at end of file
+});
diff --git a/src/components/recordingcreator/recordingeditor.template.html b/src/components/recordingcreator/recordingeditor.template.html
index b5f38dbba4..48256da0a2 100644
--- a/src/components/recordingcreator/recordingeditor.template.html
+++ b/src/components/recordingcreator/recordingeditor.template.html
@@ -1,5 +1,5 @@
-
+
";
}
- html += "