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 cinema mode failure

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-26 12:21:00 -04:00
parent b9ad8322dd
commit 6a162d4001
8 changed files with 41 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
View file

@ -31,7 +31,7 @@
}).fail(function () { }).fail(function () {
Dashboard.showError(Globalize.translate('DefaultErrorMessage')); Dashboard.showError(Globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
}); });
return false; return false;

2
dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
View file

@ -17,7 +17,7 @@
}).fail(function () { }).fail(function () {
Dashboard.showError(Globalize.translate('DefaultErrorMessage')); Dashboard.showError(Globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
}); });
} }

2
dashboard-ui/css/card.css
View file

@ -201,7 +201,7 @@
} }
.cardContent .cardFooter:not(.fullCardFooter) { .cardContent .cardFooter:not(.fullCardFooter) {
background: rgba(0, 0, 0, .5) !important; background: rgba(0, 0, 0, .6) !important;
} }
.lightCardFooter { .lightCardFooter {

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

@ -301,7 +301,14 @@
if (isViblastStarted) { if (isViblastStarted) {
_currentTime = mediaElement.currentTime; _currentTime = mediaElement.currentTime;
// Sometimes this fails
try {
viblast('#' + mediaElement.id).stop(); viblast('#' + mediaElement.id).stop();
}
catch (err) {
Logger.log(err);
}
isViblastStarted = false; isViblastStarted = false;
} }
} }

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

@ -77,6 +77,13 @@
callback: actionCallback callback: actionCallback
});
}).fail(function () {
Dashboard.alert({
message: Globalize.translate('ErrorRemovingEmbyConnectAccount')
}); });
}); });
@ -102,6 +109,13 @@
callback: actionCallback callback: actionCallback
}).fail(function () {
Dashboard.alert({
message: Globalize.translate('ErrorAddingEmbyConnectAccount')
});
}); });
}); });
} else { } else {

11
dashboard-ui/scripts/wizarduserpage.js
View file

@ -45,7 +45,16 @@
url: apiClient.getUrl('Startup/User'), url: apiClient.getUrl('Startup/User'),
dataType: 'json' dataType: 'json'
}).done(onUpdateUserComplete); }).done(onUpdateUserComplete).fail(function () {
var msgKey = form.querySelector('#txtConnectUserName').value ? 'ErrorAddingEmbyConnectAccount' : 'DefaultErrorMessage';
Dashboard.alert({
message: Globalize.translate(msgKey)
});
});
} }
function onSubmit() { function onSubmit() {

5
dashboard-ui/strings/javascript/javascript.json
View file

@ -922,5 +922,8 @@
"HeaderTryMicrosoftEdge": "Try Microsoft Edge", "HeaderTryMicrosoftEdge": "Try Microsoft Edge",
"MessageTryMicrosoftEdge": "For a better experience on Windows 10, try the new Microsoft Edge Browser.", "MessageTryMicrosoftEdge": "For a better experience on Windows 10, try the new Microsoft Edge Browser.",
"ErrorAddingListingsToSchedulesDirect": "There was an error adding the lineup to your Schedules Direct account. Schedules Direct only allows a limited number of lineups per account. You may need to log into the Schedules Direct website and remove others listings from your account before proceeeding.", "ErrorAddingListingsToSchedulesDirect": "There was an error adding the lineup to your Schedules Direct account. Schedules Direct only allows a limited number of lineups per account. You may need to log into the Schedules Direct website and remove others listings from your account before proceeeding.",
"PleaseAddAtLeastOneFolder": "Please add at least one folder to this library by clicking the Add button." "PleaseAddAtLeastOneFolder": "Please add at least one folder to this library by clicking the Add button.",
"ErrorAddingMediaPathToVirtualFolder": "There was an error adding the media path. Please ensure the path is valid and the Emby Server process has access to that location.",
"ErrorRemovingEmbyConnectAccount": "There was an error removing the Emby Connect account. Please ensure you have an active internet connection and try again.",
"ErrorAddingEmbyConnectAccount": "There was an error adding the Emby Connect account. Please ensure the Emby account has been activated by following the instructions in the email sent after creating the account. If this email was not received please send an email to apps@emby.media from the email address used with the Emby account."
} }

4
dashboard-ui/themes/halloween/theme.js
View file

@ -4,8 +4,8 @@
var iconCreated; var iconCreated;
var destroyed; var destroyed;
var currentSound; var currentSound;
var cancelKey = 'cancelHalloween'; var cancelKey = 'cancelHalloween2015';
var cancelValue = '5'; var cancelValue = '6';
function onPageShow() { function onPageShow() {
var page = this; var page = this;