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 components

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-28 16:21:54 -04:00
parent a6c9cc632b
commit d6b60682be
10 changed files with 76 additions and 53 deletions
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.68", "version": "1.1.70",
"_release": "1.1.68", "_release": "1.1.70",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.68", "tag": "1.1.70",
"commit": "e70a2bf8680faf2b1f7ae59bf8fd97d7f969fc28" "commit": "7d03528fbb6d397ae53032e72e6230606e043b90"
}, },
"_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",

16
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -1318,14 +1318,20 @@
var md5 = getConnectPasswordHash(password); var md5 = getConnectPasswordHash(password);
ajax({ var data = {
type: "POST",
url: "https://connect.emby.media/service/register",
data: {
email: email, email: email,
userName: username, userName: username,
password: md5 password: md5
}, };
if (options.grecaptcha) {
data.grecaptcha = options.grecaptcha;
}
ajax({
type: "POST",
url: "https://connect.emby.media/service/register",
data: data,
dataType: "json", dataType: "json",
contentType: 'application/x-www-form-urlencoded; charset=UTF-8', contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
headers: { headers: {

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

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.126", "version": "1.4.127",
"_release": "1.4.126", "_release": "1.4.127",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.126", "tag": "1.4.127",
"commit": "1b55a0a69665c97be4bb2d60e03940615f73c7fd" "commit": "90c7b31f36c7c56406492a2c396c879817ce0303"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

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

@ -145,40 +145,45 @@ define(['browser'], function (browser) {
return browser.tizen || browser.web0s; return browser.tizen || browser.web0s;
} }
function getDirectPlayProfileForVideoContainer(container) { function getDirectPlayProfileForVideoContainer(container, videoAudioCodecs) {
var supported = false; var supported = false;
var profileContainer = container;
switch (container) { switch (container) {
case 'asf': case 'asf':
supported = browser.tizen || isEdgeUniversal(); supported = browser.tizen || isEdgeUniversal();
videoAudioCodecs = [];
break; break;
case '3gp':
case 'avi': case 'avi':
case 'flv': supported = isEdgeUniversal();
break;
case 'mpg': case 'mpg':
case 'mpeg': case 'mpeg':
supported = isEdgeUniversal();
break;
case '3gp':
case 'flv':
case 'mts': case 'mts':
case 'trp': case 'trp':
case 'vob': case 'vob':
case 'vro': case 'vro':
supported = browser.tizen; supported = browser.tizen;
break; break;
case 'mov':
supported = browser.chrome || isEdgeUniversal();
break;
case 'm2ts': case 'm2ts':
supported = browser.tizen || browser.web0s; supported = browser.tizen || browser.web0s || isEdgeUniversal();
break; break;
case 'wmv': case 'wmv':
supported = browser.tizen || browser.web0s || isEdgeUniversal(); supported = browser.tizen || browser.web0s || isEdgeUniversal();
videoAudioCodecs = [];
break; break;
case 'ts': case 'ts':
supported = browser.tizen || browser.web0s; supported = browser.tizen || browser.web0s || isEdgeUniversal();
if (supported) { profileContainer = 'ts,mpegts';
return {
Container: 'ts,mpegts',
Type: 'Video'
};
}
break; break;
default: default:
break; break;
@ -189,8 +194,9 @@ define(['browser'], function (browser) {
} }
return { return {
Container: container, Container: profileContainer,
Type: 'Video' Type: 'Video',
AudioCodec: videoAudioCodecs.join(',')
}; };
} }
@ -291,7 +297,7 @@ define(['browser'], function (browser) {
if (canPlayMkv) { if (canPlayMkv) {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'mkv,mov', Container: 'mkv',
Type: 'Video', Type: 'Video',
VideoCodec: 'h264', VideoCodec: 'h264',
AudioCodec: videoAudioCodecs.join(',') AudioCodec: videoAudioCodecs.join(',')
@ -299,15 +305,15 @@ define(['browser'], function (browser) {
} }
// These are formats we can't test for but some devices will support // These are formats we can't test for but some devices will support
['m2ts', 'wmv', 'ts', 'asf'].map(getDirectPlayProfileForVideoContainer).filter(function (i) { ['m2ts', 'mov', 'wmv', 'ts', 'asf', 'avi', 'mpg', 'mpeg'].map(function (container) {
return getDirectPlayProfileForVideoContainer(container, videoAudioCodecs);
}).filter(function (i) {
return i != null; return i != null;
}).forEach(function (i) { }).forEach(function (i) {
profile.DirectPlayProfiles.push(i); profile.DirectPlayProfiles.push(i);
}); });
['opus', 'mp3', 'aac', 'flac', 'webma', 'wma'].filter(canPlayAudioFormat).forEach(function (audioFormat) { ['opus', 'mp3', 'aac', 'flac', 'webma', 'wma', 'wav'].filter(canPlayAudioFormat).forEach(function (audioFormat) {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: audioFormat == 'webma' ? 'webma,webm' : audioFormat, Container: audioFormat == 'webma' ? 'webma,webm' : audioFormat,
@ -564,11 +570,13 @@ define(['browser'], function (browser) {
MimeType: 'video/mp4' MimeType: 'video/mp4'
}); });
if (browser.chrome) {
profile.ResponseProfiles.push({ profile.ResponseProfiles.push({
Type: 'Video', Type: 'Video',
Container: 'mov', Container: 'mov',
MimeType: 'video/webm' MimeType: 'video/webm'
}); });
}
return profile; return profile;
}; };

12
dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js vendored
View file

@ -5,18 +5,6 @@ define(['layoutManager', 'globalize'], function (layoutManager, globalize) {
require(['actionsheet'], function (actionSheet) { require(['actionsheet'], function (actionSheet) {
var items = [];
items.push({
name: globalize.translate('sharedcomponents#ButtonOk'),
id: 'ok'
});
items.push({
name: globalize.translate('sharedcomponents#ButtonCancel'),
id: 'cancel'
});
actionSheet.show({ actionSheet.show({
title: options.text, title: options.text,

3
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View file

@ -196,8 +196,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : ''; var positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : '';
var collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : ''; var collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : '';
var playlistIdData = options.playlistId ? (' data-playlistid="' + options.playlistId + '"') : ''; var playlistIdData = options.playlistId ? (' data-playlistid="' + options.playlistId + '"') : '';
var seriesIdData = item.SeriesId ? (' data-seriesid="' + item.SeriesId + '"') : '';
html += '<' + outerTagName + ' class="' + cssClass + '" data-index="' + i + '"' + playlistItemId + ' data-action="' + action + '" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-mediatype="' + item.MediaType + '" data-type="' + item.Type + '"' + positionTicksData + collectionIdData + playlistIdData + '>'; html += '<' + outerTagName + ' class="' + cssClass + '" data-index="' + i + '"' + playlistItemId + ' data-action="' + action + '" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-mediatype="' + item.MediaType + '" data-type="' + item.Type + '"' + positionTicksData + collectionIdData + playlistIdData + seriesIdData + '>';
if (!clickEntireItem && options.dragHandle) { if (!clickEntireItem && options.dragHandle) {
html += '<button is="paper-icon-button-light" class="listViewDragHandle autoSize"><i class="md-icon">&#xE25D;</i></button>'; html += '<button is="paper-icon-button-light" class="listViewDragHandle autoSize"><i class="md-icon">&#xE25D;</i></button>';

1
dashboard-ui/bower_components/emby-webcomponents/shortcuts.js vendored
View file

@ -169,6 +169,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
Type: card.getAttribute('data-type'), Type: card.getAttribute('data-type'),
Id: card.getAttribute('data-id'), Id: card.getAttribute('data-id'),
ChannelId: card.getAttribute('data-channelid'), ChannelId: card.getAttribute('data-channelid'),
SeriesId: card.getAttribute('data-seriesid'),
ServerId: card.getAttribute('data-serverid'), ServerId: card.getAttribute('data-serverid'),
MediaType: card.getAttribute('data-mediatype'), MediaType: card.getAttribute('data-mediatype'),
IsFolder: card.getAttribute('data-isfolder') == 'true', IsFolder: card.getAttribute('data-isfolder') == 'true',

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

@ -802,6 +802,13 @@
}); });
} }
if (item.SeriesId) {
atts.push({
name: 'seriesid',
value: item.SeriesId
});
}
if (options.collectionId) { if (options.collectionId) {
atts.push({ atts.push({
name: 'collectionid', name: 'collectionid',

2
dashboard-ui/scripts/mediaplayer.js
View file

@ -352,7 +352,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
promise = ApiClient.getCurrentUser().then(function (user) { promise = ApiClient.getCurrentUser().then(function (user) {
if (!user.Configuration.EnableNextEpisodeAutoPlay) { if (!user.Configuration.EnableNextEpisodeAutoPlay || !firstItem.SeriesId) {
return null; return null;
} }

18
dashboard-ui/scripts/site.js
View file

@ -416,10 +416,16 @@ var Dashboard = {
restartServer: function () { restartServer: function () {
var apiClient = window.ApiClient;
if (!apiClient) {
return;
}
Dashboard.suppressAjaxErrors = true; Dashboard.suppressAjaxErrors = true;
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
ApiClient.restartServer().then(function () { apiClient.restartServer().then(function () {
setTimeout(function () { setTimeout(function () {
Dashboard.reloadPageWhenServerAvailable(); Dashboard.reloadPageWhenServerAvailable();
@ -432,8 +438,14 @@ var Dashboard = {
reloadPageWhenServerAvailable: function (retryCount) { reloadPageWhenServerAvailable: function (retryCount) {
var apiClient = window.ApiClient;
if (!apiClient) {
return;
}
// Don't use apiclient method because we don't want it reporting authentication under the old version // Don't use apiclient method because we don't want it reporting authentication under the old version
ApiClient.getJSON(ApiClient.getUrl("System/Info")).then(function (info) { apiClient.getJSON(apiClient.getUrl("System/Info")).then(function (info) {
// If this is back to false, the restart completed // If this is back to false, the restart completed
if (!info.HasPendingRestart) { if (!info.HasPendingRestart) {
@ -468,7 +480,7 @@ var Dashboard = {
getPluginSecurityInfo: function () { getPluginSecurityInfo: function () {
var apiClient = ApiClient; var apiClient = window.ApiClient;
if (!apiClient) { if (!apiClient) {