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

Video player fixes

Browse source 
Mobile playback fixed - video no longer hidden by default and unhidden
on playing
Footer notifications fixed
This commit is contained in:
Tim Hobbs 2014-03-17 15:37:05 -07:00
parent 941824a5fb
commit 96e64c4f1f
5 changed files with 79 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

45
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -41,13 +41,26 @@
};
self.resetEnhancements = function () {
var footer = $("#footer");
var videoBackdrop = $("#videoBackdrop", footer);
var mediaElement = $("#mediaElement", videoBackdrop);
var nowPlayingBar = $("#nowPlayingBar", videoBackdrop);
var mediaPlayer = $("#mediaPlayer", footer);
var mediaElement = $("#mediaElement", mediaPlayer);
var nowPlayingBar = $("#nowPlayingBar", mediaPlayer);
mediaElement.html(""); // remove play/pause
footer.hide().append(mediaElement).append(nowPlayingBar);
videoBackdrop.remove();
mediaPlayer.hide().append(nowPlayingBar); // put elements back where they belong
$("#videoBackdrop", footer).hide();
if ($("#footerNotifications", footer).html() == "") { // only hide footer if no notifications
footer.hide();
}
};
self.exitFullScreen = function () {
@ -216,16 +229,14 @@
var play = $("<div id='play' class='status'></div>");
var pause = $("<div id='pause' class='status'></div>");
mediaElement.append(play).append(pause);
var videoBackdrop = $("<div id='videoBackdrop'></div>");
var videoPlayer = $("<div id='videoPlayer'></div>")
.append(mediaElement)
.append(nowPlayingBar);
$("#videoBackdrop", footer).show();
videoPlayer.hide();
videoBackdrop.append(videoPlayer);
footer.append(videoBackdrop);
var videoPlayer = $("#videoPlayer", footer)
//.hide()
.append(nowPlayingBar);
// Stop playback on browser back button nav
$(window).on("popstate", function () {
@ -270,13 +281,13 @@
$("html").css("cursor", "progress");
})
.on("playing", function (e) {
.on("canplay", function () {
$(".ui-loader").hide();
$("html").css("cursor", "default");
videoPlayer.fadeIn();
//videoPlayer.fadeIn();
checkAspectRatio();
@ -319,8 +330,6 @@
}
});
video.play();
fullscreenExited = false;
};
@ -885,9 +894,9 @@
// Can't autoplay in these browsers so we need to use the full controls
if (requiresControls) {
html += '<video class="itemVideo" autoplay controls preload="none">';
html += '<video class="itemVideo" id="itemVideo" autoplay controls preload="none">';
} else {
html += '<video class="itemVideo" autoplay preload="none">';
html += '<video class="itemVideo" id="itemVideo" autoplay preload="none">';
}
if (!isStatic) {