", deviceHtml += '
"
- }).join(""), page.querySelector(".devicesList").innerHTML = html
+ deviceHtml += "', deviceHtml += '", deviceHtml += '", deviceHtml += "
", deviceHtml += "";
+ deviceHtml += '
";
+ return deviceHtml;
+ }).join("");
+ page.querySelector(".devicesList").innerHTML = html;
}
function loadData(page) {
diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js
index 488ff94f4c..405d38bfa7 100644
--- a/src/controllers/medialibrarypage.js
+++ b/src/controllers/medialibrarypage.js
@@ -1,4 +1,4 @@
-define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "globalize", "dom", "indicators", "cardStyle", "emby-itemrefreshindicator"], function($, appHost, taskButton, loading, libraryMenu, globalize, dom, indicators) {
+define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "globalize", "dom", "indicators", "scripts/imagehelper", "cardStyle", "emby-itemrefreshindicator"], function($, appHost, taskButton, loading, libraryMenu, globalize, dom, indicators, imageHelper) {
"use strict";
function addVirtualFolder(page) {
@@ -217,35 +217,6 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
}]
}
- function getIcon(type) {
- switch (type) {
- case "movies":
- return "video_library";
- case "music":
- return "library_music";
- case "photos":
- return "photo_library";
- case "livetv":
- return "live_tv";
- case "tvshows":
- return "tv";
- case "trailers":
- return "local_movies";
- case "homevideos":
- return "photo_library";
- case "musicvideos":
- return "video_library";
- case "books":
- return "library_books";
- case "channels":
- return "videocam";
- case "playlists":
- return "view_list";
- default:
- return "folder";
- }
- }
-
function getVirtualFolderHtml(page, virtualFolder, index) {
var html = "";
var style = "";
@@ -267,7 +238,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
hasCardImageContainer = true;
} else if (!virtualFolder.showNameWithIcon) {
html += '';
+ deviceHtml += '
";
+ deviceHtml += "';
+ deviceHtml += '';
+ deviceHtml += '';
+ var iconUrl = imageHelper.getDeviceIcon(device.Name);
+ if (iconUrl) {
+ deviceHtml += '
";
+ deviceHtml += '";
+ deviceHtml += "";
+ deviceHtml += "
";
+ } else {
+ deviceHtml += 'tablet_android';
+ }
+ deviceHtml += "";
+ deviceHtml += "';
- html += '' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + "";
+ html += '' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + "";
hasCardImageContainer = true;
}
if (hasCardImageContainer) {
@@ -278,7 +249,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
}
if (!imgUrl && virtualFolder.showNameWithIcon) {
html += '';
- html += '' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + "";
+ html += '' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + "";
virtualFolder.showNameWithIcon && (html += '
";
}
diff --git a/src/img/devices/chrome.svg b/src/img/devices/chrome.svg
new file mode 100644
index 0000000000..fab308dc20
--- /dev/null
+++ b/src/img/devices/chrome.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/edge.svg b/src/img/devices/edge.svg
new file mode 100644
index 0000000000..8a552924d7
--- /dev/null
+++ b/src/img/devices/edge.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/firefox.svg b/src/img/devices/firefox.svg
new file mode 100644
index 0000000000..f6087e5e8c
--- /dev/null
+++ b/src/img/devices/firefox.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/html5.svg b/src/img/devices/html5.svg
new file mode 100644
index 0000000000..63704799cb
--- /dev/null
+++ b/src/img/devices/html5.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/msie.svg b/src/img/devices/msie.svg
new file mode 100644
index 0000000000..f5b362d7c1
--- /dev/null
+++ b/src/img/devices/msie.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/opera.svg b/src/img/devices/opera.svg
new file mode 100644
index 0000000000..dd57f924a9
--- /dev/null
+++ b/src/img/devices/opera.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/other.svg b/src/img/devices/other.svg
new file mode 100644
index 0000000000..b588696794
--- /dev/null
+++ b/src/img/devices/other.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/playstation.svg b/src/img/devices/playstation.svg
new file mode 100644
index 0000000000..c6595340eb
--- /dev/null
+++ b/src/img/devices/playstation.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/safari.svg b/src/img/devices/safari.svg
new file mode 100644
index 0000000000..12abbb95fd
--- /dev/null
+++ b/src/img/devices/safari.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/samsungtv.svg b/src/img/devices/samsungtv.svg
new file mode 100644
index 0000000000..afdd19e24e
--- /dev/null
+++ b/src/img/devices/samsungtv.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/windows.svg b/src/img/devices/windows.svg
new file mode 100644
index 0000000000..531e72e1d1
--- /dev/null
+++ b/src/img/devices/windows.svg
@@ -0,0 +1 @@
+
diff --git a/src/img/devices/xbox.svg b/src/img/devices/xbox.svg
new file mode 100644
index 0000000000..640dd34a5b
--- /dev/null
+++ b/src/img/devices/xbox.svg
@@ -0,0 +1 @@
+
diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js
new file mode 100644
index 0000000000..486a030a54
--- /dev/null
+++ b/src/scripts/imagehelper.js
@@ -0,0 +1,64 @@
+define(["browser"], function (browser) {
+ "use strict";
+
+ function getDeviceIcon(device) {
+ var baseUrl = "img/devices/";
+ switch (device) {
+ case "Opera":
+ case "Opera TV":
+ return baseUrl + "opera.svg";
+ case "Samsung Smart TV":
+ return baseUrl + "samsung.svg";
+ case "Xbox One":
+ return baseUrl + "xbox.svg";
+ case "Sony PS4":
+ return baseUrl + "playstation.svg";
+ case "Chrome":
+ return baseUrl + "chrome.svg";
+ case "Firefox":
+ return baseUrl + "firefox.svg";
+ case "Edge":
+ return baseUrl + "edge.svg";
+ case "Internet Explorer":
+ return baseUrl + "msie.svg";
+ case "Web Browser":
+ return baseUrl + "html5.svg";
+ default:
+ return baseUrl + "other.svg";
+ }
+ }
+
+ function getLibraryIcon(library) {
+ switch (library) {
+ case "movies":
+ return "video_library";
+ case "music":
+ return "library_music";
+ case "photos":
+ return "photo_library";
+ case "livetv":
+ return "live_tv";
+ case "tvshows":
+ return "tv";
+ case "trailers":
+ return "local_movies";
+ case "homevideos":
+ return "photo_library";
+ case "musicvideos":
+ return "music_video";
+ case "books":
+ return "library_books";
+ case "channels":
+ return "videocam";
+ case "playlists":
+ return "view_list";
+ default:
+ return "folder";
+ }
+ }
+
+ return {
+ getDeviceIcon: getDeviceIcon,
+ getLibraryIcon: getLibraryIcon
+ };
+});
\ No newline at end of file
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index 59275c218c..89f672ca02 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -1,4 +1,4 @@
-define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "viewManager", "libraryBrowser", "appRouter", "apphost", "playbackManager", "browser", "globalize", "paper-icon-button-light", "material-icons", "scrollStyles", "flexStyles"], function (dom, layoutManager, inputManager, connectionManager, events, viewManager, libraryBrowser, appRouter, appHost, playbackManager, browser, globalize) {
+define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "viewManager", "libraryBrowser", "appRouter", "apphost", "playbackManager", "browser", "globalize", "scripts/imagehelper", "paper-icon-button-light", "material-icons", "scrollStyles", "flexStyles"], function (dom, layoutManager, inputManager, connectionManager, events, viewManager, libraryBrowser, appRouter, appHost, playbackManager, browser, globalize, imageHelper) {
"use strict";
function getCurrentApiClient() {
@@ -532,48 +532,11 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += globalize.translate("HeaderMedia");
html += "";
html += items.map(function (i) {
- var icon = "folder";
+ var icon = i.icon || imageHelper.getLibraryIcon(i.CollectionType);
var itemId = i.Id;
-
- if ("channels" === i.CollectionType) {
- itemId = "channels";
- }
- else if ("livetv" === i.CollectionType) {
- itemId = "livetv";
- }
- else if ("music" === i.CollectionType) {
- icon = "library_music";
- }
- else if ("musicvideos" === i.CollectionType) {
- icon = "music_video";
- }
- else if ("books" === i.CollectionType) {
- icon = "library_books";
- }
- else if ("playlists" === i.CollectionType) {
- icon = "view_list";
- }
- else if ("movies" === i.CollectionType) {
- icon = "video_library";
- }
- else if ("homevideos" === i.CollectionType || "photos" === i.CollectionType) {
- icon = "photo_library";
- }
- else if ("channels" === i.CollectionType || "Channel" === i.Type) {
- icon = "videocam";
- }
- else if ("tvshows" === i.CollectionType) {
- icon = "tv";
- }
- else if ("livetv" === i.CollectionType) {
- icon = "live_tv";
- }
- icon = i.icon || icon;
-
if (i.onclick) {
i.onclick;
}
-
return '' + icon + '' + i.Name + "";
}).join("");
libraryMenuOptions.innerHTML = html;
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 2bcd8615e8..d41f14122b 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -213,17 +213,14 @@ var Dashboard = {
}
},
capabilities: function (appHost) {
- var caps = {
+ var capabilities = {
PlayableMediaTypes: ["Audio", "Video"],
SupportedCommands: ["MoveUp", "MoveDown", "MoveLeft", "MoveRight", "PageUp", "PageDown", "PreviousLetter", "NextLetter", "ToggleOsd", "ToggleContextMenu", "Select", "Back", "SendKey", "SendString", "GoHome", "GoToSettings", "VolumeUp", "VolumeDown", "Mute", "Unmute", "ToggleMute", "SetVolume", "SetAudioStreamIndex", "SetSubtitleStreamIndex", "DisplayContent", "GoToSearch", "DisplayMessage", "SetRepeatMode", "ChannelUp", "ChannelDown", "PlayMediaSource", "PlayTrailers"],
SupportsPersistentIdentifier: "cordova" === self.appMode || "android" === self.appMode,
SupportsMediaControl: true
};
- caps.IconUrl = appHost.deviceIconUrl();
- caps.SupportsSync = appHost.supports("sync");
- caps.SupportsContentUploading = appHost.supports("cameraupload");
appHost.getPushTokenInfo();
- return caps = Object.assign(caps, appHost.getPushTokenInfo());
+ return capabilities = Object.assign(capabilities, appHost.getPushTokenInfo());
}
};
var AppInfo = {};
@@ -1155,7 +1152,7 @@ var AppInfo = {};
})();
require(["css!css/site"]);
-
+
return require(["browser"], onWebComponentsReady);
}();
pageClassOn("viewshow", "standalonePage", function () {