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 fullscreen button with IE

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-17 21:27:48 -04:00
parent c5802fc5ab
commit 3114742ab7
18 changed files with 125 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/log.html
View file

@ -4,7 +4,7 @@
<title>${TitleSupport}</title> <title>${TitleSupport}</title>
</head> </head>
<body> <body>
<div id="logPage" data-role="page" class="page type-interior"> <div id="logPage" data-role="page" class="page type-interior" data-require="scripts/logpage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -15,10 +15,10 @@
<a href="supporterkey.html" data-role="button">${TabSupporterKey}</a> <a href="supporterkey.html" data-role="button">${TabSupporterKey}</a>
<a href="about.html" data-role="button">${TabAbout}</a> <a href="about.html" data-role="button">${TabAbout}</a>
</div> </div>
<p>${HeaderServerLogFiles}</p> <p>${HeaderServerLogFiles}</p>
<div class="serverLogs readOnlyContent"> <div class="serverLogs readOnlyContent">
</div> </div>
</div> </div>
</div> </div>

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

@ -39,9 +39,8 @@
{ {
var apiClient = result.ApiClient; var apiClient = result.ApiClient;
Dashboard.serverAddress(apiClient.serverAddress()); Dashboard.onLoggedIn(apiClient.serverAddress(), apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient);
Dashboard.setCurrentUser(apiClient.getCurrentUserId(), apiClient.accessToken()); Dashboard.navigate('index.html');
window.location.href = 'index.html';
} }
break; break;
case MediaBrowser.ConnectionState.ServerSignIn: case MediaBrowser.ConnectionState.ServerSignIn:

2
dashboard-ui/scripts/librarylist.js
View file

@ -532,7 +532,7 @@
html += '<div style="padding:1em 1em;background:rgba(20,20,20,1);margin:0;text-align:center;" class="detailsMenuHeader">'; html += '<div style="padding:1em 1em;background:rgba(20,20,20,1);margin:0;text-align:center;" class="detailsMenuHeader">';
html += '<button type="button" class="imageButton detailsMenuLeftButton" data-role="none"><i class="fa fa-arrow-left"></i></button>'; html += '<button type="button" class="imageButton detailsMenuLeftButton" data-role="none"><i class="fa fa-arrow-left"></i></button>';
html += '<h3 style="font-weight:400;margin:.5em 0;line-height:0;"></h3>'; html += '<h3 style="font-weight:400;margin:.5em 0;line-height:.5;"></h3>';
html += '<button type="button" class="imageButton detailsMenuRightButton" data-role="none"><i class="fa fa-arrow-right"></i></button>'; html += '<button type="button" class="imageButton detailsMenuRightButton" data-role="none"><i class="fa fa-arrow-right"></i></button>';
html += '</div>'; html += '</div>';

14
dashboard-ui/scripts/loginpage.js
View file

@ -102,19 +102,17 @@
var serverId = getParameterByName('serverid'); var serverId = getParameterByName('serverid');
// In a multi-server supported app, set the server address var newUrl;
if (serverId) {
Dashboard.serverAddress(apiClient.serverAddress());
}
Dashboard.setCurrentUser(user.Id, result.AccessToken);
if (user.Policy.IsAdministrator && !serverId) { if (user.Policy.IsAdministrator && !serverId) {
window.location.href = "dashboard.html?u=" + user.Id + '&t=' + result.AccessToken; newUrl = "dashboard.html?u=" + user.Id + '&t=' + result.AccessToken;
} else { } else {
window.location.href = "index.html?u=" + user.Id + '&t=' + result.AccessToken; newUrl = "index.html?u=" + user.Id + '&t=' + result.AccessToken;
} }
Dashboard.onLoggedIn(apiClient.serverAddress(), user.Id, result.AccessToken, apiClient);
Dashboard.navigate(newUrl);
}).fail(function () { }).fail(function () {
$('#pw', '#loginPage').val(''); $('#pw', '#loginPage').val('');

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

@ -1,6 +1,6 @@
(function () { (function () {
$(document).on('pagebeforeshow', "#logPage", function () { $(document).on('pageshown', "#logPage", function () {
var page = this; var page = this;
@ -46,8 +46,6 @@
$('.serverLogs', page).html(html).trigger('create'); $('.serverLogs', page).html(html).trigger('create');
}); });
}); });
})(); })();

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

@ -4,9 +4,7 @@
var timeout; var timeout;
var initialVolume; var initialVolume;
var fullscreenExited = false;
var idleState = true; var idleState = true;
var remoteFullscreen = false;
var muteButton = null; var muteButton = null;
var unmuteButton = null; var unmuteButton = null;
@ -27,32 +25,10 @@
})[0]; })[0];
}; };
self.remoteFullscreen = function () {
if (remoteFullscreen) {
exitFullScreenToWindow();
} else {
enterFullScreen();
}
remoteFullscreen = !remoteFullscreen;
};
self.toggleFullscreen = function () { self.toggleFullscreen = function () {
if (self.isFullScreen()) { if (self.isFullScreen()) {
if (document.cancelFullScreen) {
document.cancelFullScreen(); self.exitFullScreen();
}
else if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
}
else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen();
}
else if (document.webkitCancelFullScreen) {
document.webkitCancelFullScreen();
}
$('#videoPlayer').removeClass('fullscreenVideo');
} else { } else {
requestFullScreen(document.body); requestFullScreen(document.body);
} }
@ -66,17 +42,18 @@
}; };
self.exitFullScreen = function () { self.exitFullScreen = function () {
if (document.exitFullscreen) { if (document.exitFullscreen) {
document.exitFullscreen(); document.exitFullscreen();
} else if (document.mozExitFullScreen) { } else if (document.mozExitFullScreen) {
document.mozExitFullScreen(); document.mozExitFullScreen();
} else if (document.webkitExitFullscreen) { } else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen(); document.webkitExitFullscreen();
} else if (document.msExitFullscreen) {
document.msExitFullscreen();
} }
$('#videoPlayer').removeClass('fullscreenVideo'); $('#videoPlayer').removeClass('fullscreenVideo');
fullscreenExited = true;
}; };
self.isFullScreen = function () { self.isFullScreen = function () {
@ -676,7 +653,7 @@
function requestFullScreen(element) { function requestFullScreen(element) {
// Supports most browsers and their versions. // Supports most browsers and their versions.
var requestMethod = element.requestFullscreen || element.webkitRequestFullscreen || element.webkitRequestFullScreen || element.mozRequestFullScreen; var requestMethod = element.requestFullscreen || element.webkitRequestFullscreen || element.mozRequestFullScreen || element.msRequestFullscreen;
if (requestMethod) { // Native full screen. if (requestMethod) { // Native full screen.
requestMethod.call(element); requestMethod.call(element);
@ -691,9 +668,6 @@
var player = $("#videoPlayer"); var player = $("#videoPlayer");
player.addClass("fullscreenVideo"); player.addClass("fullscreenVideo");
remoteFullscreen = true;
} }
function exitFullScreenToWindow() { function exitFullScreenToWindow() {
@ -701,9 +675,6 @@
var player = $("#videoPlayer"); var player = $("#videoPlayer");
player.removeClass("fullscreenVideo"); player.removeClass("fullscreenVideo");
remoteFullscreen = false;
} }
function getChaptersFlyoutHtml() { function getChaptersFlyoutHtml() {
@ -1008,7 +979,7 @@
$('.itemVideo').on('mousemove.videoplayer keydown.videoplayer scroll.videoplayer', idleHandler).trigger('mousemove'); $('.itemVideo').on('mousemove.videoplayer keydown.videoplayer scroll.videoplayer', idleHandler).trigger('mousemove');
} }
$(document).on('webkitfullscreenchange.videoplayer mozfullscreenchange.videoplayer fullscreenchange.videoplayer', function (e) { $(document).on('webkitfullscreenchange.videoplayer mozfullscreenchange.videoplayer msfullscreenchange.videoplayer fullscreenchange.videoplayer', function (e) {
if (self.isFullScreen()) { if (self.isFullScreen()) {
enterFullScreen(); enterFullScreen();
@ -1017,24 +988,6 @@
} else { } else {
exitFullScreenToWindow(); exitFullScreenToWindow();
} }
fullscreenExited = self.isFullScreen() == false;
}).on("msfullscreenchange.videoplayer", function (e) {
fullscreenExited = self.isFullScreen() == false;
}).on("keyup.videoplayer", function (e) {
if (fullscreenExited) {
$("#videoPlayer", $("#mediaPlayer")).removeClass("fullscreenVideo");
fullscreenExited = false;
return;
}
if (e.keyCode == 27) {
self.stop();
}
}); });
// Stop playback on browser back button nav // Stop playback on browser back button nav
@ -1053,7 +1006,7 @@
function unbindEventsForPlayback() { function unbindEventsForPlayback() {
$(document).off('webkitfullscreenchange.videoplayer mozfullscreenchange.videoplayer fullscreenchange.videoplayer').off("msfullscreenchange.videoplayer").off("keyup.videoplayer"); $(document).off('webkitfullscreenchange.videoplayer mozfullscreenchange.videoplayer msfullscreenchange.videoplayer fullscreenchange.videoplayer');
// Stop playback on browser back button nav // Stop playback on browser back button nav
$(window).off("popstate.videoplayer"); $(window).off("popstate.videoplayer");
@ -1335,8 +1288,6 @@
mediaPlayerContainer.trigger("create"); mediaPlayerContainer.trigger("create");
fullscreenExited = false;
self.currentSubtitleStreamIndex = mediaSource.DefaultSubtitleStreamIndex; self.currentSubtitleStreamIndex = mediaSource.DefaultSubtitleStreamIndex;
$('body').addClass('bodyWithPopupOpen'); $('body').addClass('bodyWithPopupOpen');

14
dashboard-ui/scripts/registrationservices.js
View file

@ -1,7 +1,7 @@
window.RegistrationServices = { window.RegistrationServices = {
renderPluginInfo: function (page, pkg, pluginSecurityInfo) { renderPluginInfo: function (page, pkg, pluginSecurityInfo) {
if (pkg.isPremium) { if (pkg.isPremium) {
$('.premiumPackage', page).show(); $('.premiumPackage', page).show();
@ -82,8 +82,8 @@
} }
}, },
addRecurringFields: function(page, period) { addRecurringFields: function (page, period) {
var formSelector = '.supporterForm'; var formSelector = '.supporterForm';
// Add recurring fields to form // Add recurring fields to form
@ -107,6 +107,12 @@
$('#ppCmd', page).val('_xclick-subscriptions'); $('#ppCmd', page).val('_xclick-subscriptions');
$(formSelector, page).trigger('create'); $(formSelector, page).trigger('create');
}
},
initSupporterForm: function (page) {
$('.supporterForm', page).attr('action', 'https://www.paypal.com/cgi-bin/webscr');
$('.recurringSubscriptionCancellationHelp', page).html(Globalize.translate('LabelRecurringDonationCanBeCancelledHelp'));
}
}; };

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

@ -14,9 +14,8 @@
{ {
var apiClient = result.ApiClient; var apiClient = result.ApiClient;
Dashboard.serverAddress(apiClient.serverAddress()); Dashboard.onLoggedIn(apiClient.serverAddress(), apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient);
Dashboard.setCurrentUser(apiClient.getCurrentUserId(), apiClient.accessToken()); Dashboard.navigate('index.html');
window.location.href = 'index.html';
} }
break; break;
case MediaBrowser.ConnectionState.ServerSignIn: case MediaBrowser.ConnectionState.ServerSignIn:

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

@ -206,17 +206,19 @@ var Dashboard = {
store.removeItem("token"); store.removeItem("token");
store.removeItem("serverAddress"); store.removeItem("serverAddress");
var loginPage = !Dashboard.isConnectMode() ? function onLogoutDone() {
'login.html' :
'connectlogin.html'; var loginPage = !Dashboard.isConnectMode() ?
'login.html' :
'connectlogin.html';
window.location.href = loginPage;
}
if (logoutWithServer === false) { if (logoutWithServer === false) {
window.location.href = loginPage; onLogoutDone();
} else { } else {
ConnectionManager.logout().done(function () { ConnectionManager.logout().done(onLogoutDone);
window.location.href = loginPage;
});
} }
}, },
@ -354,14 +356,17 @@ var Dashboard = {
reloadPage: function () { reloadPage: function () {
var currentUrl = getWindowUrl().toLowerCase(); var currentUrl = getWindowUrl().toLowerCase();
var newUrl;
// If they're on a plugin config page just go back to the dashboard // If they're on a plugin config page just go back to the dashboard
// The plugin may not have been loaded yet, or could have been uninstalled // The plugin may not have been loaded yet, or could have been uninstalled
if (currentUrl.indexOf('configurationpage') != -1) { if (currentUrl.indexOf('configurationpage') != -1) {
window.location.href = "dashboard.html"; newUrl = "dashboard.html";
} else { } else {
window.location.href = getWindowUrl(); newUrl = getWindowUrl();
} }
window.location.href = newUrl;
}, },
hideDashboardVersionWarning: function () { hideDashboardVersionWarning: function () {
@ -1375,7 +1380,7 @@ var Dashboard = {
// The native app can handle a little bit more than safari // The native app can handle a little bit more than safari
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
quality -= 10; quality -= 15;
if (isBackdrop) { if (isBackdrop) {
quality -= 20; quality -= 20;
@ -1481,6 +1486,16 @@ var Dashboard = {
deferred.resolve(); deferred.resolve();
}); });
return deferred.promise(); return deferred.promise();
},
onLoggedIn: function(serverAddress, userId, accessToken, apiClient) {
if (Dashboard.isConnectMode()) {
Dashboard.serverAddress(serverAddress);
}
Dashboard.setCurrentUser(userId, accessToken);
window.ApiClient = apiClient;
} }
}; };

42
dashboard-ui/scripts/streamingsettings.js
View file

@ -7,7 +7,23 @@
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
$(document).on('pageinit', "#streamingSettingsPage", function () { function onSubmit() {
Dashboard.showLoadingMsg();
var form = this;
ApiClient.getServerConfiguration().done(function (config) {
config.RemoteClientBitrateLimit = parseInt(parseFloat(($('#txtRemoteClientBitrateLimit', form).val() || '0')) * 1000000);
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
});
// Disable default form submission
return false;
}
$(document).on('pageinitdepends', "#streamingSettingsPage", function () {
var page = this; var page = this;
@ -31,7 +47,9 @@
}); });
}); });
}).on('pageshow', "#streamingSettingsPage", function () { $('.streamingSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
}).on('pageshown', "#streamingSettingsPage", function () {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -44,24 +62,4 @@
}); });
}); });
window.StreamingSettingsPage = {
onSubmit: function () {
Dashboard.showLoadingMsg();
var form = this;
ApiClient.getServerConfiguration().done(function (config) {
config.RemoteClientBitrateLimit = parseInt(parseFloat(($('#txtRemoteClientBitrateLimit', form).val() || '0')) * 1000000);
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
});
// Disable default form submission
return false;
}
};
})(jQuery, document, window); })(jQuery, document, window);

46
dashboard-ui/scripts/supporterpage.js
View file

@ -105,7 +105,23 @@
}); });
} }
$(document).on('pageinit', "#supporterPage", function () { function onSubmit() {
var form = this;
var page = $(form).parents('.page');
if ($('.hfIsActive', page).val() == 'true') {
var currentPlanType = $('.hfPlanType', page).val();
if (currentPlanType != 'Lifetime') {
// Use a regular alert to block the submission process until they hit ok
alert(Globalize.translate('MessageChangeRecurringPlanConfirm'));
}
}
}
$(document).on('pageinitdepends', "#supporterPage", function () {
var page = this; var page = this;
@ -156,7 +172,11 @@
updateSavedDonationAmount(page); updateSavedDonationAmount(page);
}); });
}).on('pageshow', "#supporterPage", function () { RegistrationServices.initSupporterForm(page);
$('.supporterForm').off('submit', onSubmit).on('submit', onSubmit);
}).on('pageshown', "#supporterPage", function () {
var page = this; var page = this;
@ -174,26 +194,4 @@
loadUserInfo(page); loadUserInfo(page);
}); });
window.SupporterPage = {
onSubmit: function () {
var form = this;
var page = $(form).parents('.page');
if ($('.hfIsActive', page).val() == 'true') {
var currentPlanType = $('.hfPlanType', page).val();
if (currentPlanType != 'Lifetime') {
// Use a regular alert to block the submission process until they hit ok
alert(Globalize.translate('MessageChangeRecurringPlanConfirm'));
}
}
}
};
})(); })();

2
dashboard-ui/scripts/tvlatest.js
View file

@ -9,7 +9,7 @@
return 'Thumb'; return 'Thumb';
} }
$(document).on('pagebeforeshow', "#tvNextUpPage", function () { $(document).on('pageshown', "#tvNextUpPage", function () {
var userId = Dashboard.getCurrentUserId(); var userId = Dashboard.getCurrentUserId();

26
dashboard-ui/scripts/usernew.js
View file

@ -109,21 +109,15 @@
}); });
} }
function newUserPage() { function onSubmit() {
var page = $(this).parents('.page');
var self = this; Dashboard.showLoadingMsg();
self.onSubmit = function () { saveUser(page);
var page = $(this).parents('.page'); // Disable default form submission
return false;
Dashboard.showLoadingMsg();
saveUser(page);
// Disable default form submission
return false;
};
} }
function loadData(page) { function loadData(page) {
@ -131,9 +125,7 @@
loadUser(page); loadUser(page);
} }
window.NewUserPage = new newUserPage(); $(document).on('pageinitdepends', "#newUserPage", function () {
$(document).on('pageinit', "#newUserPage", function () {
var page = this; var page = this;
@ -157,7 +149,9 @@
}); });
}).on('pageshow', "#newUserPage", function () { $('.newUserProfileForm').off('submit', onSubmit).on('submit', onSubmit);
}).on('pageshown', "#newUserPage", function () {
var page = this; var page = this;

6
dashboard-ui/streamingsettings.html
View file

@ -4,7 +4,7 @@
<title>${TitlePlayback}</title> <title>${TitlePlayback}</title>
</head> </head>
<body> <body>
<div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming"> <div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -39,10 +39,6 @@
</form> </form>
</div> </div>
</div> </div>
<script type="text/javascript">
$('.streamingSettingsForm').off('submit', StreamingSettingsPage.onSubmit).on('submit', StreamingSettingsPage.onSubmit);
</script>
</div> </div>
</body> </body>
</html> </html>

10
dashboard-ui/supporter.html
View file

@ -4,7 +4,7 @@
<title>${TitleSupport}</title> <title>${TitleSupport}</title>
</head> </head>
<body> <body>
<div id="supporterPage" data-role="page" class="page type-interior"> <div id="supporterPage" data-role="page" class="page type-interior" data-require="scripts/supporterpage,scripts/registrationservices">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -27,7 +27,7 @@
<p class="planSummary"></p> <p class="planSummary"></p>
</div> </div>
<form style="margin-top:1.5em;" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" class="supporterForm" method="post"> <form style="margin-top:1.5em;" name="_xclick" class="supporterForm" method="post">
<fieldset data-role="controlgroup"> <fieldset data-role="controlgroup">
<legend>${HeaderDonationType}</legend> <legend>${HeaderDonationType}</legend>
@ -53,7 +53,7 @@
</label> </label>
</div> </div>
</fieldset> </fieldset>
<div class="fieldDescription">${LabelRecurringDonationCanBeCancelledHelp}</div> <div class="fieldDescription recurringSubscriptionCancellationHelp"></div>
<fieldset data-role="controlgroup" style="margin-top:1.5em;"> <fieldset data-role="controlgroup" style="margin-top:1.5em;">
<input type="radio" class="radioDonationType" name="radioDonationType" id="radioOneTimeDonation" value="once"> <input type="radio" class="radioDonationType" name="radioDonationType" id="radioOneTimeDonation" value="once">
@ -113,10 +113,6 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$('.supporterForm').off('submit', SupporterPage.onSubmit).on('submit', SupporterPage.onSubmit);
</script>
</div> </div>
</body> </body>
</html> </html>

8
dashboard-ui/thirdparty/cordova/registrationservices.js vendored
View file

@ -1,12 +1,16 @@
window.RegistrationServices = { window.RegistrationServices = {
renderPluginInfo: function (page, pkg, pluginSecurityInfo) { renderPluginInfo: function (page, pkg, pluginSecurityInfo) {
}, },
addRecurringFields: function (page, period) { addRecurringFields: function (page, period) {
} },
initSupporterForm: function (page) {
$('.recurringSubscriptionCancellationHelp', page).html('');
}
}; };

2
dashboard-ui/tvlatest.html
View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series"> <div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvlatest">
<div class="libraryViewNav scopedLibraryViewNav"> <div class="libraryViewNav scopedLibraryViewNav">
<a href="tvrecommended.html">${TabSuggestions}</a> <a href="tvrecommended.html">${TabSuggestions}</a>
<a href="#" class="ui-btn-active">${TabLatest}</a> <a href="#" class="ui-btn-active">${TabLatest}</a>

7
dashboard-ui/usernew.html
View file

@ -4,12 +4,12 @@
<title>${TitleNewUser}</title> <title>${TitleNewUser}</title>
</head> </head>
<body> <body>
<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users"> <div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
<form id="newUserProfileForm"> <form class="newUserProfileForm">
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li id="fldUserName"> <li id="fldUserName">
<label for="txtUserName">${LabelName}</label> <label for="txtUserName">${LabelName}</label>
@ -62,9 +62,6 @@
</form> </form>
</div> </div>
</div> </div>
<script type="text/javascript">
$('#newUserProfileForm').on('submit', NewUserPage.onSubmit);
</script>
</div> </div>
</body> </body>
</html> </html>