milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update program display titles

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-22 16:09:16 -05:00
parent befa669bc5
commit 2e4314a278
6 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.480",
"_release": "1.4.480",
"version": "1.4.481",
"_release": "1.4.481",
"_resolution": {
"type": "version",
"tag": "1.4.480",
"commit": "20243f526641231c0e6911adc7d01fe1368dcc9e"
"tag": "1.4.481",
"commit": "379634e39edbb1c464e99df15fa1dec0773053f4"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

3
dashboard-ui/bower_components/emby-webcomponents/listview/listview.css vendored
View file

@ -60,6 +60,9 @@
}
.listItem-odd {
}
.listItem-shaded:nth-child(even) {
background: #1c1c1c;
}

9
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View file

@ -206,9 +206,10 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var cssClass = "listItem";
if (options.highlight !== false) {
if (i % 2 === 1) {
cssClass += ' listItem-odd';
}
//if (i % 2 === 1) {
// cssClass += ' listItem-odd';
//}
cssClass += ' listItem-shaded';
}
if (clickEntireItem) {
@ -299,7 +300,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
parentTitle = item.SeriesName;
}
else if (item.IsSeries) {
else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
parentTitle = item.Name;
}
}

16
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -1554,7 +1554,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}
}
function playInternal(item, playOptions, callback) {
function playInternal(item, playOptions, onPlaybackStartedFn) {
if (item.IsPlaceHolder) {
loading.hide();
@ -1578,16 +1578,16 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
appSettings.maxStreamingBitrate(bitrate);
return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions).then(callback);
return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions, onPlaybackStartedFn);
}, function () {
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback);
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
});
} else {
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback);
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
}
}, function () {
@ -1647,7 +1647,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}, reject);
}
function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions) {
function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions, onPlaybackStartedFn) {
var startPosition = playOptions.startPositionTicks;
@ -1671,8 +1671,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
streamInfo.fullscreen = playOptions.fullscreen;
getPlayerData(player).isChangingStream = false;
return player.play(streamInfo).then(function () {
onPlaybackStarted(player, streamInfo);
loading.hide();
onPlaybackStartedFn();
onPlaybackStarted(player, streamInfo);
return Promise.resolve();
});
});
@ -1693,8 +1694,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
getPlayerData(player).maxStreamingBitrate = maxBitrate;
return player.play(streamInfo).then(function () {
onPlaybackStarted(player, streamInfo, mediaSource);
loading.hide();
onPlaybackStartedFn();
onPlaybackStarted(player, streamInfo, mediaSource);
return Promise.resolve();
});
});