';
var shape = type.type == 'MusicAlbum' ? 'detailPageSquare' : 'detailPagePortrait';
@@ -1166,26 +1166,6 @@
});
}
- function removeFromCollection(page, parentItem, itemIds) {
-
- Dashboard.showLoadingMsg();
-
- var url = ApiClient.getUrl("Collections/" + parentItem.Id + "/Items", {
-
- Ids: itemIds.join(',')
- });
-
- ApiClient.ajax({
- type: "DELETE",
- url: url
-
- }).then(function () {
-
- renderChildren(page, parentItem);
- Dashboard.hideLoadingMsg();
- });
- }
-
function renderUserDataIcons(page, item) {
var userDataIcons = page.querySelectorAll('.userDataIcons');
@@ -2195,10 +2175,9 @@
}
});
- view.querySelector('.collectionItems').addEventListener('removefromcollection', function (e) {
+ view.querySelector('.collectionItems').addEventListener('needsrefresh', function (e) {
- var itemId = e.detail.itemId;
- removeFromCollection(view, currentItem, [itemId]);
+ renderChildren(view, currentItem);
});
view.querySelector('.detailImageContainer').addEventListener('click', function (e) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 42e0439af5..ba382daa97 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1,4 +1,4 @@
-define(['scrollHelper', 'viewManager', 'appSettings', 'appStorage', 'apphost', 'datetime', 'itemHelper', 'mediaInfo', 'scroller', 'scrollStyles'], function (scrollHelper, viewManager, appSettings, appStorage, appHost, datetime, itemHelper, mediaInfo, scroller) {
+define(['scrollHelper', 'viewManager', 'appSettings', 'appStorage', 'apphost', 'datetime', 'itemHelper', 'mediaInfo', 'scroller', 'indicators', 'scrollStyles'], function (scrollHelper, viewManager, appSettings, appStorage, appHost, datetime, itemHelper, mediaInfo, scroller, indicators) {
function parentWithClass(elem, className) {
@@ -15,7 +15,7 @@
function fadeInRight(elem) {
- var pct = browserInfo.mobile ? '2.5%' : '0.5%';
+ var pct = browserInfo.mobile ? '3%' : '0.5%';
var keyframes = [
{ opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
@@ -901,6 +901,16 @@
value: item.Id
});
+ atts.push({
+ name: 'serverid',
+ value: item.ServerId
+ });
+
+ atts.push({
+ name: 'id',
+ value: item.Id
+ });
+
if (options.context) {
atts.push({
name: 'context',
@@ -1553,7 +1563,7 @@
html += LibraryBrowser.getOfflineIndicatorHtml(item);
}
} else if (options.showUnplayedIndicator !== false) {
- html += LibraryBrowser.getPlayedIndicatorHtml(item);
+ html += indicators.getPlayedIndicatorHtml(item);
} else if (options.showChildCountIndicator) {
html += LibraryBrowser.getGroupCountIndicator(item);
}
@@ -1597,7 +1607,7 @@
html += '
';
}
if (options.overlayMoreButton) {
- html += '
';
+ html += '
';
}
// cardScalable
@@ -1622,7 +1632,7 @@
if (options.cardLayout) {
html += '
';
- html += '';
+ html += '';
html += "
";
}
@@ -1912,23 +1922,6 @@
return '';
},
- getPlayedIndicatorHtml: function (item) {
-
- if (item.Type == "Series" || item.Type == "Season" || item.Type == "BoxSet" || item.MediaType == "Video" || item.MediaType == "Game" || item.MediaType == "Book") {
- if (item.UserData.UnplayedItemCount) {
- return '
' + item.UserData.UnplayedItemCount + '
';
- }
-
- if (item.Type != 'TvChannel') {
- if (item.UserData.PlayedPercentage && item.UserData.PlayedPercentage >= 100 || (item.UserData && item.UserData.Played)) {
- return '
check
';
- }
- }
- }
-
- return '';
- },
-
getGroupCountIndicator: function (item) {
if (item.ChildCount) {
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 397e962415..5d3a78a32a 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -336,22 +336,6 @@
return onListViewPlayButtonClick(e, playButton);
}
- var listviewMenuButton = parentWithClass(e.target, 'listviewMenuButton') || parentWithClass(e.target, 'cardOverlayMoreButton');
-
- if (listviewMenuButton) {
- showContextMenu(listviewMenuButton, {});
- e.stopPropagation();
- e.preventDefault();
- return false;
- }
-
- var button = parentWithClass(e.target, 'btnUserItemRating');
- if (button) {
- e.stopPropagation();
- e.preventDefault();
- return false;
- }
-
var card = parentWithClass(e.target, 'card');
if (card) {
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index e85683bdd2..547cdc7771 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -1,6 +1,8 @@
define(['appStorage'], function (appStorage) {
var currentDisplayInfo;
+ var datetime;
+
function mirrorItem(info) {
var item = info.item;
@@ -614,6 +616,13 @@
self.canPlay = function (item) {
+ if (item.Type == "Program") {
+ if (new Date().getTime() > datetime.parseISO8601Date(item.EndDate).getTime() || new Date().getTime() < datetime.parseISO8601Date(item.StartDate).getTime()) {
+ return false;
+ }
+ return true;
+ }
+
return self.canPlayByAttributes(item.Type, item.MediaType, item.PlayAccess, item.LocationType);
};
@@ -1052,6 +1061,10 @@
MediaController.init = function () {
console.log('Beginning MediaController.init');
+ require(['datetime'], function (datetimeInstance) {
+ datetime = datetimeInstance;
+ });
+
if (window.ApiClient) {
initializeApiClient(window.ApiClient);
}
diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js
index 0d568f9c62..f49376190d 100644
--- a/dashboard-ui/scripts/playlistedit.js
+++ b/dashboard-ui/scripts/playlistedit.js
@@ -73,6 +73,7 @@
}
var elem = page.querySelector('#childrenContent .itemsContainer');
+ elem.setAttribute('data-playlistid', item.Id);
elem.innerHTML = html;
var listParent = elem;
@@ -135,23 +136,6 @@
});
}
- function removeFromPlaylist(page, item, ids) {
-
- ApiClient.ajax({
-
- url: ApiClient.getUrl('Playlists/' + item.Id + '/Items', {
- EntryIds: ids.join(',')
- }),
-
- type: 'DELETE'
-
- }).then(function () {
-
- reloadItems(page, item);
- });
-
- }
-
function showDragAndDropHelp() {
if (AppInfo.isTouchPreferred) {
@@ -176,12 +160,6 @@
var elem = page.querySelector('#childrenContent .itemsContainer');
- elem.addEventListener('removefromplaylist', function (e) {
-
- var playlistItemId = e.detail.playlistItemId;
- removeFromPlaylist(page, item, [playlistItemId]);
- });
-
elem.addEventListener('needsrefresh', function () {
reloadItems(page, item);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index c95ee0eb49..1646238cad 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2032,6 +2032,9 @@ var AppInfo = {};
},
canQueueMediaType: function(mediaType) {
return MediaController.canQueueMediaType(mediaType);
+ },
+ canPlay: function (item) {
+ return MediaController.canPlay(item);
}
};
});