';
- //if (itemHelper.canEdit({ Policy: { IsAdministrator: true } }, item)) {
-
- // //require(['emby-playstatebutton']);
- // html += '
';
- //}
-
var userData = item.UserData || {};
if (itemHelper.canMarkPlayed(item)) {
diff --git a/src/components/itemhelper.js b/src/components/itemhelper.js
index 19845ca4a0..f8bdb28ac5 100644
--- a/src/components/itemhelper.js
+++ b/src/components/itemhelper.js
@@ -16,16 +16,13 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
var name = ((item.Type === 'Program' || item.Type === 'Recording') && (item.IsSeries || item.EpisodeTitle) ? item.EpisodeTitle : item.Name) || '';
if (item.Type === "TvChannel") {
-
if (item.ChannelNumber) {
return item.ChannelNumber + ' ' + name;
}
return name;
}
- if (/*options.isInlineSpecial &&*/ item.Type === "Episode" && item.ParentIndexNumber === 0) {
-
+ if (item.Type === "Episode" && item.ParentIndexNumber === 0) {
name = globalize.translate('ValueSpecialEpisodeName', name);
-
} else if ((item.Type === "Episode" || item.Type === 'Program') && item.IndexNumber != null && item.ParentIndexNumber != null && options.includeIndexNumber !== false) {
var displayIndexNumber = item.IndexNumber;
@@ -104,7 +101,7 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
var itemType = item.Type;
- if (itemType === "UserRootFolder" || /*itemType == "CollectionFolder" ||*/ itemType === "UserView") {
+ if (itemType === "UserRootFolder" || itemType === "UserView") {
return false;
}
diff --git a/src/components/userdatabuttons/emby-playstatebutton.js b/src/components/userdatabuttons/emby-playstatebutton.js
index 7480cd0d7e..eaed128933 100644
--- a/src/components/userdatabuttons/emby-playstatebutton.js
+++ b/src/components/userdatabuttons/emby-playstatebutton.js
@@ -2,14 +2,12 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
'use strict';
function addNotificationEvent(instance, name, handler) {
-
var localHandler = handler.bind(instance);
events.on(serverNotifications, name, localHandler);
instance[name] = localHandler;
}
function removeNotificationEvent(instance, name) {
-
var handler = instance[name];
if (handler) {
events.off(serverNotifications, name, handler);
@@ -25,31 +23,22 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
var apiClient = connectionManager.getApiClient(serverId);
if (!button.classList.contains('playstatebutton-played')) {
-
apiClient.markPlayed(apiClient.getCurrentUserId(), id, new Date());
-
setState(button, true);
-
} else {
-
apiClient.markUnplayed(apiClient.getCurrentUserId(), id, new Date());
-
setState(button, false);
}
}
function onUserDataChanged(e, apiClient, userData) {
-
var button = this;
-
if (userData.ItemId === button.getAttribute('data-id')) {
-
setState(button, userData.Played);
}
}
function setState(button, played, updateAttribute) {
-
var icon = button.iconElement;
if (!icon) {
button.iconElement = button.querySelector('i');
@@ -57,18 +46,13 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
}
if (played) {
-
button.classList.add('playstatebutton-played');
-
if (icon) {
icon.classList.add('playstatebutton-icon-played');
icon.classList.remove('playstatebutton-icon-unplayed');
}
-
} else {
-
button.classList.remove('playstatebutton-played');
-
if (icon) {
icon.classList.remove('playstatebutton-icon-played');
icon.classList.add('playstatebutton-icon-unplayed');
diff --git a/src/controllers/devices.js b/src/controllers/devices.js
index e4c2f6b44b..d85b6e9017 100644
--- a/src/controllers/devices.js
+++ b/src/controllers/devices.js
@@ -43,7 +43,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "humanedate", "emby-button
callback: function(id) {
switch (id) {
case "open":
- Dashboard.navigate("devices/device.html?id=" + deviceId);
+ Dashboard.navigate("device.html?id=" + deviceId);
break;
case "delete":
deleteDevice(view, deviceId)
@@ -57,7 +57,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "humanedate", "emby-button
var html = "";
html += devices.map(function(device) {
var deviceHtml = "";
- deviceHtml += "
", deviceHtml += '
', deviceHtml += '
', deviceHtml += '
', deviceHtml += '
';
+ deviceHtml += "", deviceHtml += '
', deviceHtml += '
", deviceHtml += '", deviceHtml += "
", deviceHtml += "
-
+
${HeaderActiveDevices}
diff --git a/src/devices/device.html b/src/device.html
similarity index 100%
rename from src/devices/device.html
rename to src/device.html
diff --git a/src/devices/devices.html b/src/devices.html
similarity index 100%
rename from src/devices/devices.html
rename to src/devices.html
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index a687d3a7a8..ba8b2d306a 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -307,7 +307,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
});
links.push({
name: globalize.translate("TabDevices"),
- href: "devices/devices.html",
+ href: "devices.html",
pageIds: ["devicesPage", "devicePage"],
icon: "devices"
});
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index bd735877f3..f2f66ad264 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -62,13 +62,13 @@ define([
controller: "dashboardhosting"
});
defineRoute({
- path: "/devices/devices.html",
+ path: "/devices.html",
autoFocus: false,
roles: "admin",
controller: "devices"
});
defineRoute({
- path: "/devices/device.html",
+ path: "/device.html",
autoFocus: false,
roles: "admin",
controller: "device"