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 polymer

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-14 10:42:40 -04:00
parent dbf135beac
commit 2a2b9b7fe5
32 changed files with 322 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/scripts/appsettings.js
View file

@ -64,6 +64,14 @@
return appStorage.getItem('syncOnlyOnWifi') != 'false';
},
syncLosslessAudio: function (val) {
if (val != null) {
update('syncLosslessAudio', val.toString());
}
return appStorage.getItem('syncLosslessAudio') != 'false';
},
syncPath: function (val) {
if (val != null) {

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

@ -2159,18 +2159,18 @@
}
var degree = (item.SyncPercent / 100) * 360;
return '<div class="pieIndicator"><i class="fa fa-refresh"></i><div class="pieBackground"></div><div class="hold"><div class="pie" style="-webkit-transform: rotate(' + degree + 'deg);-moz-transform: rotate(' + degree + 'deg);-o-transform: rotate(' + degree + 'deg);transform: rotate(' + degree + 'deg);"></div></div></div>';
return '<div class="pieIndicator"><iron-icon icon="refresh"></iron-icon><div class="pieBackground"></div><div class="hold"><div class="pie" style="-webkit-transform: rotate(' + degree + 'deg);-moz-transform: rotate(' + degree + 'deg);-o-transform: rotate(' + degree + 'deg);transform: rotate(' + degree + 'deg);"></div></div></div>';
}
if (item.SyncStatus) {
if (item.SyncStatus == 'Queued' || item.SyncStatus == 'Converting' || item.SyncStatus == 'ReadyToTransfer' || item.SyncStatus == 'Transferring') {
return '<div class="syncIndicator syncWorkingIndicator"><i class="fa fa-refresh"></i></div>';
return '<div class="syncIndicator syncWorkingIndicator"><iron-icon icon="refresh"></iron-icon></div>';
}
if (item.SyncStatus == 'Synced') {
return '<div class="syncIndicator"><i class="fa fa-refresh"></i></div>';
return '<div class="syncIndicator"><iron-icon icon="refresh"></iron-icon></div>';
}
}

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

@ -4,6 +4,7 @@
page.querySelector('#txtSyncPath').value = AppSettings.syncPath();
page.querySelector('#chkWifi').checked = AppSettings.syncOnlyOnWifi();
page.querySelector('#chkSyncLosslessAudio').checked = AppSettings.syncLosslessAudio();
Dashboard.hideLoadingMsg();
}
@ -12,6 +13,7 @@
AppSettings.syncPath(page.querySelector('#txtSyncPath').value);
AppSettings.syncOnlyOnWifi(page.querySelector('#chkWifi').checked);
AppSettings.syncLosslessAudio(page.querySelector('#chkSyncLosslessAudio').checked);
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('SettingsSaved'));

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

@ -1731,13 +1731,8 @@ var AppInfo = {};
AppInfo.supportsSyncPathSetting = isCordova && isAndroid;
AppInfo.supportsUserDisplayLanguageSetting = Dashboard.isConnectMode() && !isCordova;
if (isCordova && isAndroid) {
AppInfo.directPlayAudioContainers = "flac,aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
AppInfo.directPlayVideoContainers = "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm".split(',');
} else {
AppInfo.directPlayAudioContainers = [];
AppInfo.directPlayVideoContainers = [];
}
AppInfo.directPlayAudioContainers = [];
AppInfo.directPlayVideoContainers = [];
if (isCordova && isIOS) {
AppInfo.moreIcon = 'more-horiz';
@ -2079,6 +2074,17 @@ var AppInfo = {};
require(deps, function () {
if (Dashboard.isRunningInCordova() && $.browser.android) {
AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
// TODO: This is going to exclude it from both playback and sync, so improve on this
if (AppSettings.syncLosslessAudio()) {
AppInfo.directPlayAudioContainers.push('flac');
}
AppInfo.directPlayVideoContainers = "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm".split(',');
}
capabilities.DeviceProfile = MediaPlayer.getDeviceProfile(Math.max(screen.height, screen.width));
createConnectionManager(capabilities).done(function () { onConnectionManagerCreated(deferred); });
});