cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update components

Browse Source
This commit is contained in:
Luke Pulverenti 2016-05-29 02:43:00 -04:00
parent fac1b1d5f9
commit 4d0cb27c9b
8 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View File

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.60", "version": "1.1.61",
"_release": "1.1.60", "_release": "1.1.61",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.60", "tag": "1.1.61",
"commit": "302c2d3c2f59c366ee9d198f205b8350317cda41" "commit": "6a78282741579ae715a93d4da77393d887ecc52e"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

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

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.95", "version": "1.3.96",
"_release": "1.3.95", "_release": "1.3.96",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.95", "tag": "1.3.96",
"commit": "7ce02ce7ef6b3792a1a381c62682fd217edf188b" "commit": "d3c620a7ba6ca5e56c528d687bc6b5306095fbd5"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

2
dashboard-ui/bower_components/emby-webcomponents/guide/guide.css vendored
View File

@ -201,7 +201,7 @@
} }
} }
@media all and (max-width: 1280px) { @media all and (max-width: 1200px) {
.channelHeaderCell.withImage .guideChannelNumber { .channelHeaderCell.withImage .guideChannelNumber {
display: none; display: none;

43
dashboard-ui/bower_components/emby-webcomponents/shortcuts.js vendored
View File

@ -121,13 +121,16 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
var apiClient = connectionManager.getApiClient(serverId); var apiClient = connectionManager.getApiClient(serverId);
if (seriesTimerId) { if (seriesTimerId && timerId) {
// cancel all
// cancel
cancelTimer(apiClient, timerId, true);
} else if (timerId) { } else if (timerId) {
// change to series recording, if possible // change to series recording, if possible
// otherwise cancel individual recording // otherwise cancel individual recording
changeRecordingToSeries(apiClient, timerId, id);
} else if (type == 'Program') { } else if (type == 'Program') {
// schedule recording // schedule recording
@ -135,6 +138,42 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
} }
} }
function changeRecordingToSeries(apiClient, timerId, programId) {
loading.show();
apiClient.getItem(apiClient.getCurrentUserId(), programId).then(function (item) {
if (item.IsSeries) {
// cancel, then create series
cancelTimer(apiClient, timerId, false).then(function () {
apiClient.getNewLiveTvTimerDefaults({ programId: programId }).then(function (timerDefaults) {
apiClient.createLiveTvSeriesTimer(timerDefaults).then(function () {
loading.hide();
sendToast(globalize.translate('sharedcomponents#SeriesRecordingScheduled'));
});
});
});
} else {
// cancel
cancelTimer(apiClient, timerId, true);
}
});
}
function cancelTimer(apiClient, timerId, hideLoading) {
loading.show();
return apiClient.cancelLiveTvTimer(timerId).then(function () {
if (hideLoading) {
loading.hide();
sendToast(globalize.translate('sharedcomponents#RecordingCancelled'));
}
});
}
function createRecording(apiClient, programId) { function createRecording(apiClient, programId) {
loading.show(); loading.show();

6
dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js vendored
View File

@ -119,7 +119,8 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
exitAnimationDuration: options.interactive ? 400 : 800, exitAnimationDuration: options.interactive ? 400 : 800,
size: 'fullscreen', size: 'fullscreen',
autoFocus: false, autoFocus: false,
scrollY: false scrollY: false,
exitAnimation: 'fadeout'
}); });
dlg.classList.add('slideshowDialog'); dlg.classList.add('slideshowDialog');
@ -233,7 +234,8 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
lazyLoading: true, lazyLoading: true,
lazyLoadingInPrevNext: true, lazyLoadingInPrevNext: true,
autoplayDisableOnInteraction: false, autoplayDisableOnInteraction: false,
initialSlide: options.startIndex || 0 initialSlide: options.startIndex || 0,
speed: 240
}); });
swiperInstance.on('onLazyImageLoad', onSlideChangeStart); swiperInstance.on('onLazyImageLoad', onSlideChangeStart);

2
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View File

@ -23,7 +23,9 @@
"ButtonOk": "Ok", "ButtonOk": "Ok",
"ButtonCancel": "Cancel", "ButtonCancel": "Cancel",
"ButtonGotIt": "Got It", "ButtonGotIt": "Got It",
"RecordingCancelled": "Recording cancelled.",
"RecordingScheduled": "Recording scheduled.", "RecordingScheduled": "Recording scheduled.",
"SeriesRecordingScheduled": "Series recording scheduled.",
"HeaderNewRecording": "New Recording", "HeaderNewRecording": "New Recording",
"Sunday": "Sunday", "Sunday": "Sunday",
"Monday": "Monday", "Monday": "Monday",

4
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View File

@ -36,7 +36,7 @@
"tag": "v1.5.2", "tag": "v1.5.2",
"commit": "18e8e12dcd9a4560de480562f65935feed334b86" "commit": "18e8e12dcd9a4560de480562f65935feed334b86"
}, },
"_source": "git://github.com/PolymerElements/iron-selector.git", "_source": "git://github.com/polymerelements/iron-selector.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-selector" "_originalSource": "polymerelements/iron-selector"
} }

2
dashboard-ui/bower_components/polymer/.bower.json vendored
View File

@ -34,6 +34,6 @@
"commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.0.0",
"_originalSource": "Polymer/polymer" "_originalSource": "Polymer/polymer"
} }