cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse Source
This commit is contained in:
Tavares André 2015-04-21 18:43:33 +02:00
commit 5f5124b80c
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard-ui/css/card.css
View File

@ -176,7 +176,7 @@
padding: 5px 4px 2px;
text-shadow: none;
font-weight: 400;
line-height: initial;
line-height: 1.4;
}
.cardOverlayInner {

7
dashboard-ui/scripts/indexpage.js
View File

@ -524,7 +524,7 @@
return $.when(promises);
}
var homePageDismissValue = '12';
var homePageDismissValue = '14';
var homePageTourKey = 'homePageTour';
function dismissWelcome(page, userId) {
@ -588,6 +588,9 @@
function loadConfigureViewsWelcomeMessage(page, userId) {
Dashboard.getCurrentUser().done(function (user) {
if (user.Policy.EnableUserPreferenceAccess) {
$('.btnMyPreferences', page).attr('href', 'mypreferencesdisplay.html?userId=' + userId);
// Need the timeout because previous methods in the chain have popups that will be in the act of closing
@ -597,6 +600,8 @@
}, 500);
}
});
}
$(document).on('pageinit', "#indexPage", function () {

7
dashboard-ui/scripts/mediaplayer-video.js
View File

@ -1039,13 +1039,16 @@
volumeSlider.val(initialVolume).slider('refresh');
updateVolumeButtons(initialVolume);
video.one("loadedmetadata.mediaplayerevent", function (e) {
video.one("playing.mediaplayerevent", function (e) {
// TODO: This is not working in chrome. Is it too early?
// Appending #t=xxx to the query string doesn't seem to work with HLS
if (startPositionInSeekParam && this.currentSrc && this.currentSrc.toLowerCase().indexOf('.m3u8') != -1) {
this.currentTime = startPositionInSeekParam;
var element = this;
setTimeout(function () {
element.currentTime = startPositionInSeekParam;
}, 3000);
}
}).on("volumechange.mediaplayerevent", function (e) {