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

update recording layout

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-05 01:39:14 -04:00
parent 80948f62fa
commit 25dbf665dd
24 changed files with 341 additions and 256 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.212",
"_release": "1.4.212",
"version": "1.4.213",
"_release": "1.4.213",
"_resolution": {
"type": "version",
"tag": "1.4.212",
"commit": "45cf1768cae1cc5bf3761a7154c429dffbd78378"
"tag": "1.4.213",
"commit": "5db5ff0f3a13742f310688474a22b44e0d38cee5"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

46
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js vendored
View file

@ -238,17 +238,6 @@
//var eventName = browser.firefox ? 'mousedown' : 'click';
var selectedId;
dlg.addEventListener('click', function (e) {
var actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem');
if (actionSheetMenuItem) {
selectedId = actionSheetMenuItem.getAttribute('data-id');
dialogHelper.close(dlg);
}
});
var timeout;
if (options.timeout) {
timeout = setTimeout(function () {
@ -258,6 +247,25 @@
return new Promise(function (resolve, reject) {
var isResolved;
dlg.addEventListener('click', function (e) {
var actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem');
if (actionSheetMenuItem) {
selectedId = actionSheetMenuItem.getAttribute('data-id');
if (options.resolveOnClick) {
resolve(selectedId);
isResolved = true;
}
dialogHelper.close(dlg);
}
});
dlg.addEventListener('close', function () {
if (layoutManager.tv) {
@ -269,14 +277,16 @@
timeout = null;
}
if (selectedId != null) {
if (options.callback) {
options.callback(selectedId);
}
if (!isResolved) {
if (selectedId != null) {
if (options.callback) {
options.callback(selectedId);
}
resolve(selectedId);
} else {
reject();
resolve(selectedId);
} else {
reject();
}
}
});

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

@ -395,7 +395,7 @@ define(['browser'], function (browser) {
Container: 'mkv',
Type: 'Video',
AudioCodec: videoAudioCodecs.join(','),
VideoCodec: 'h264',
VideoCodec: 'copy',
Context: 'Streaming',
CopyTimestamps: copyTimestamps
});

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

@ -861,10 +861,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (options.showProgramAirInfo) {
var date = datetime.parseISO8601Date(item.StartDate, true);
var text = item.StartDate ?
date.toLocaleString() :
datetime.toLocaleString(datetime.parseISO8601Date(item.StartDate, true)) :
'';
lines.push(text || ' ');

9
dashboard-ui/bower_components/emby-webcomponents/datetime.js vendored
View file

@ -103,6 +103,14 @@
return false;
}();
function toLocaleString(date) {
var currentLocale = globalize.getCurrentLocale();
return currentLocale && toLocaleTimeStringSupportsLocales ?
date.toLocaleString(currentLocale) :
date.toLocaleString();
}
function toLocaleDateString(date) {
var currentLocale = globalize.getCurrentLocale();
@ -178,6 +186,7 @@
parseISO8601Date: parseISO8601Date,
getDisplayRunningTime: getDisplayRunningTime,
toLocaleDateString: toLocaleDateString,
toLocaleString: toLocaleString,
getDisplayTime: getDisplayTime,
isRelativeDay: isRelativeDay
};

5
dashboard-ui/bower_components/emby-webcomponents/pagejs/page.js vendored
View file

@ -559,6 +559,11 @@ define([], function () {
}
page.pushState = function (state, title, url) {
if (hashbang) {
url = '#!' + url;
}
history.pushState(state, title, url);
previousPopState = state;
};