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

fix build

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-10 23:01:41 -04:00
parent f470541e59
commit b8f54a3174
5 changed files with 62 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -159,6 +159,12 @@
return null;
};
self.stop = function () {
if (mediaElement) {
mediaElement.pause();
}
};
self.pause = function () {
if (mediaElement) {
mediaElement.pause();

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

@ -1338,7 +1338,7 @@
if (mediaRenderer) {
mediaRenderer.pause();
mediaRenderer.stop();
$(mediaRenderer).off("ended.playnext").one("ended", function () {
@ -1654,9 +1654,10 @@
var mediaRenderer = getAudioRenderer();
mediaRenderer.setCurrentSrc(audioUrl);
// Set volume first to avoid an audible change
mediaRenderer.volume(initialVolume);
mediaRenderer.setPoster(self.getPosterUrl(item));
mediaRenderer.setCurrentSrc(audioUrl);
$(mediaRenderer).on("volumechange.mediaplayerevent", function () {

4
dashboard-ui/scripts/site.js
View file

@ -1958,8 +1958,8 @@ var AppInfo = {};
}
if (Dashboard.isRunningInCordova() && $.browser.android) {
//define("audiorenderer", ["thirdparty/cordova/android/vlcplayer"]);
define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("audiorenderer", ["thirdparty/cordova/android/vlcplayer"]);
//define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("videorenderer", ["scripts/htmlmediarenderer"]);
}
else {