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

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,12 +4,12 @@
Dashboard.showModalLoadingMsg();
ConnectionManager.loginToConnect(username, password).done(function () {
ConnectionManager.loginToConnect(username, password).then(function () {
Dashboard.hideModalLoadingMsg();
Dashboard.navigate('selectserver.html');
}).fail(function () {
}, function () {
Dashboard.hideModalLoadingMsg();
@ -70,7 +70,7 @@
Dashboard.showModalLoadingMsg();
ConnectionManager.connect().done(function (result) {
ConnectionManager.connect().then(function (result) {
handleConnectionResult(page, result);
@ -150,7 +150,7 @@
var page = $(this).parents('.page');
ConnectionManager.signupForConnect($('#txtSignupEmail', page).val(), $('#txtSignupUsername', page).val(), $('#txtSignupPassword', page).val(), $('#txtSignupPasswordConfirm', page).val()).done(function () {
ConnectionManager.signupForConnect($('#txtSignupEmail', page).val(), $('#txtSignupUsername', page).val(), $('#txtSignupPassword', page).val(), $('#txtSignupPasswordConfirm', page).val()).then(function () {
Dashboard.alert({
message: Globalize.translate('MessageThankYouForConnectSignUp'),
@ -159,7 +159,7 @@
}
});
}).fail(function (result) {
}, function (result) {
if (result.errorCode == 'passwordmatch') {
Dashboard.alert({
@ -187,12 +187,12 @@
}
function requireCaptcha() {
return !AppInfo.isNativeApp && getWindowUrl().toLowerCase().indexOf('https') == 0;
return !AppInfo.isNativeApp && window.location.href.toLowerCase().indexOf('https') == 0;
}
function supportInAppSignup() {
return AppInfo.isNativeApp;
return AppInfo.isNativeApp || getWindowUrl().toLowerCase().indexOf('https') == 0;
return true;
return AppInfo.isNativeApp || window.location.href.toLowerCase().indexOf('https') == 0;
}
function initSignup(page) {
@ -282,11 +282,11 @@
Dashboard.showModalLoadingMsg();
ConnectionManager.connectToAddress(host).done(function (result) {
ConnectionManager.connectToAddress(host).then(function (result) {
handleConnectionResult(page, result);
}).fail(function () {
}, function () {
handleConnectionResult(page, {
State: MediaBrowser.ConnectionState.Unavailable
});