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

removed folder sync

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-06 22:53:31 -05:00
parent 7f32bcec1c
commit bfc38bae5a
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dashboard-ui/scripts/mediaplayer.js
View file

@ -590,7 +590,7 @@
callback();
}
} else {
showNoCompatibleStreamError();
showPlaybackInfoErrorMessage('NoCompatibleStream');
}
}
});
@ -612,7 +612,7 @@
callback();
}
} else {
showNoCompatibleStreamError();
showPlaybackInfoErrorMessage('NoCompatibleStream');
}
} else {
@ -622,10 +622,26 @@
function validatePlaybackInfoResult(result) {
if (result.ErrorCode) {
showPlaybackInfoErrorMessage(result.ErrorCode);
return false;
}
return true;
}
function showNoCompatibleStreamError() {
function showPlaybackInfoErrorMessage(errorCode) {
// This timeout is messy, but if jqm is in the act of hiding a popup, it will not show a new one
// If we're coming from the popup play menu, this will be a problem
setTimeout(function () {
Dashboard.alert({
message: Globalize.translate('MessagePlaybackError' + errorCode),
title: Globalize.translate('HeaderPlaybackError')
});
}, 300);
}

8
dashboard-ui/scripts/nowplayingpage.js
View file

@ -30,10 +30,10 @@
}
var dataSrc = ' data-src="' + imgUrl + '"';
// TODO: This markup needs to be converted to the newer card layout pattern
html += '<div class="posterItemImage lazy"' + dataSrc + '>';
html += '<div class="posterItemTextOverlay">';
html += '<div class="posterItemTextOverlay" style="position:absolute;bottom:0;left:0;right:0;">';
if (chapter.Name) {
html += "<div class='posterItemText'>";
@ -43,7 +43,7 @@
html += "<div class='posterItemProgress posterItemText'>";
var pct = 100 * (chapter.StartPositionTicks / runtimeTicks);
html += '<progress class="itemProgressBar" min="0" max="100" value="' + pct + '" style="opacity:.8;"></progress>';
html += '<progress class="itemProgressBar" min="0" max="100" value="' + pct + '" style="opacity:.8;width:100%;"></progress>';
html += "</div>";
html += "</div>";
@ -53,7 +53,7 @@
html += "</div>";
}
elem.html(html).trigger('create');
elem.html(html).trigger('create').lazyChildren();
}
function selectCurrentChapter(elem, positionTicks) {