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

fix recording cancel

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-25 02:17:02 -04:00
parent da603728ba
commit be5357c365
48 changed files with 60 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.322",
"_release": "1.4.322",
"version": "1.4.324",
"_release": "1.4.324",
"_resolution": {
"type": "version",
"tag": "1.4.322",
"commit": "2d485829160b70374abe2d36631e7725096d1285"
"tag": "1.4.324",
"commit": "65e5d919b19f4b447aee6914ee8c40347c4e98ff"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

4
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -964,8 +964,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (item.RecordAnyChannel) {
lines.push(globalize.translate('sharedcomponents#AllChannels'));
}
else if (item.ChannelId) {
lines.push(item.ChannelName || '');
else {
lines.push(item.ChannelName || globalize.translate('sharedcomponents#OneChannel'));
}
}

2
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordinghelper.js vendored
View file

@ -1,4 +1,4 @@
define(['globalize', 'loading'], function (globalize, loading) {
define(['globalize', 'loading', 'connectionManager'], function (globalize, loading, connectionManager) {
'use strict';
function changeRecordingToSeries(apiClient, timerId, programId) {

3
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View file

@ -350,5 +350,6 @@
"MessageDidYouKnowCinemaMode": "Did you know that with Emby Premiere, you can enhance your experience with features like Cinema Mode?",
"MessageDidYouKnowCinemaMode2": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature.",
"HeaderPlayMyMedia": "Play my Media",
"HeaderDiscoverEmbyPremiere": "Discover Emby Premiere"
"HeaderDiscoverEmbyPremiere": "Discover Emby Premiere",
"OneChannel": "One channel"
}