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

try to fix missing data in guide issue

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-19 01:56:55 -04:00
parent 8cb04d45ec
commit 8bf5fc899c
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/css/livetv.css
View file

@ -217,7 +217,7 @@
} }
.timeslotCell, .timeslotHeader { .timeslotCell, .timeslotHeader {
width: 190px; width: 60px;
} }
.timeslotCellInner { .timeslotCellInner {

5
dashboard-ui/scripts/edititemmetadata.js
View file

@ -1436,8 +1436,13 @@
$(LibraryBrowser).on('itemdeleting.editor', function (e, itemId) { $(LibraryBrowser).on('itemdeleting.editor', function (e, itemId) {
if (currentItem && currentItem.Id == itemId) { if (currentItem && currentItem.Id == itemId) {
if (currentItem.ParentId) {
Dashboard.navigate('edititemmetadata.html?id=' + currentItem.ParentId);
} else {
Dashboard.navigate('edititemmetadata.html'); Dashboard.navigate('edititemmetadata.html');
} }
}
}); });
}).on('pagehide', "#editItemMetadataPage", function () { }).on('pagehide', "#editItemMetadataPage", function () {

15
dashboard-ui/scripts/livetvguide.js
View file

@ -1,7 +1,7 @@
(function ($, document) { (function ($, document) {
// 30 mins // 30 mins
var cellCurationMinutes = 30; var cellCurationMinutes = 10;
var cellDurationMs = cellCurationMinutes * 60 * 1000; var cellDurationMs = cellCurationMinutes * 60 * 1000;
var gridLocalStartDateMs; var gridLocalStartDateMs;
@ -109,7 +109,13 @@
html += '<div class="timeslotHeader">'; html += '<div class="timeslotHeader">';
html += '<div class="timeslotHeaderInner">'; html += '<div class="timeslotHeaderInner">';
var minutes = date.getMinutes();
if (minutes == 0 || minutes == 30) {
html += LiveTvHelpers.getDisplayTime(date); html += LiveTvHelpers.getDisplayTime(date);
} else {
html += '&nbsp;';
}
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
@ -176,7 +182,7 @@
} }
if (width > 300) { if (width > 300) {
width += (width / 100) - 3; width += (width / 100) + 3;
} }
return width; return width;
@ -203,7 +209,12 @@
var program = findProgramStartingInCell(programs, 0, date, cellEndDate, cellIndex); var program = findProgramStartingInCell(programs, 0, date, cellEndDate, cellIndex);
var minutes = date.getMinutes();
if (minutes == 0 || minutes == 30) {
html += '<div class="timeslotCell">'; html += '<div class="timeslotCell">';
} else {
html += '<div class="timeslotCell" style="border-left-color:transparent;">';
}
var cellTagName; var cellTagName;
var href; var href;