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 schedules direct

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-15 16:33:53 -04:00
parent 7f44f00a69
commit 5060d1766f
8 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json vendored
View file

@ -29,14 +29,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a" "commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a"
}, },
"_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-a11y-keys-behavior" "_originalSource": "polymerelements/iron-a11y-keys-behavior"
} }

4
dashboard-ui/bower_components/paper-styles/.bower.json vendored
View file

@ -34,7 +34,7 @@
"tag": "v1.0.11", "tag": "v1.0.11",
"commit": "347542e9ebe3e6e5f0830ee10e1c20c12956ff2c" "commit": "347542e9ebe3e6e5f0830ee10e1c20c12956ff2c"
}, },
"_source": "git://github.com/PolymerElements/paper-styles.git", "_source": "git://github.com/polymerelements/paper-styles.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-styles" "_originalSource": "polymerelements/paper-styles"
} }

2
dashboard-ui/css/librarybrowser.css
View file

@ -1231,7 +1231,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
margin-right: auto; margin-right: auto;
} }
@media all and (min-height: 520px) { @media all and (min-height: 480px) {
.alphabetPicker { .alphabetPicker {
display: block; display: block;

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

@ -101,7 +101,7 @@
var cacheDuration; var cacheDuration;
if (AppInfo.isNativeApp) { if (AppInfo.isNativeApp) {
cacheDuration = 600000; cacheDuration = 300000;
} }
else if ($.browser.ipad || $.browser.iphone || $.browser.android) { else if ($.browser.ipad || $.browser.iphone || $.browser.android) {
cacheDuration = 10000; cacheDuration = 10000;
@ -247,9 +247,11 @@
// When transition animations are used, add a content loading delay to allow the animations to finish // When transition animations are used, add a content loading delay to allow the animations to finish
// Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed. // Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed.
var delay = LibraryBrowser.enableFullPaperTabs() ? 500 : 0; var enablePaperTabs = LibraryBrowser.enableFullPaperTabs();
var delay = enablePaperTabs ? 500 : 0;
var pgs = this; var pgs = this;
setTimeout(function () { setTimeout(function () {
$(pgs).trigger('tabchange'); $(pgs).trigger('tabchange');
}, delay); }, delay);
}); });
@ -1129,7 +1131,7 @@
if (item.UserData.UnplayedItemCount) { if (item.UserData.UnplayedItemCount) {
//html += '<span class="ui-li-count">' + item.UserData.UnplayedItemCount + '</span>'; //html += '<span class="ui-li-count">' + item.UserData.UnplayedItemCount + '</span>';
} else if (item.UserData.Played && item.Type != 'TvChannel') { } else if (item.UserData.Played && item.Type != 'TvChannel') {
html += '<div class="playedIndicator"><i class="fa fa-check"></i></div>'; html += '<div class="playedIndicator"><iron-icon icon="check"></iron-icon></div>';
} }
} }
html += '</a>'; html += '</a>';
@ -2162,7 +2164,7 @@
if (item.SyncPercent) { if (item.SyncPercent) {
if (item.SyncPercent >= 100) { if (item.SyncPercent >= 100) {
return '<div class="syncIndicator"><i class="fa fa-refresh"></i></div>'; return '<div class="syncIndicator"><iron-icon icon="refresh"></iron-icon></div>';
} }
var degree = (item.SyncPercent / 100) * 360; var degree = (item.SyncPercent / 100) * 360;

2
dashboard-ui/scripts/livetvguideprovider-scd.js
View file

@ -10,7 +10,7 @@
var info = config.ListingProviders.filter(function (i) { var info = config.ListingProviders.filter(function (i) {
return i.Id == providerId; return i.Id == providerId;
})[0]; })[0] || {};
listingsId = info.ListingsId; listingsId = info.ListingsId;
$('#selectListing', page).val(info.ListingsId || '').selectmenu('refresh'); $('#selectListing', page).val(info.ListingsId || '').selectmenu('refresh');

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

@ -390,10 +390,10 @@
var menuItems = []; var menuItems = [];
//menuItems.push({ menuItems.push({
// name: 'Schedules Direct', name: 'Schedules Direct',
// id: 'SchedulesDirect' id: 'SchedulesDirect'
//}); });
//menuItems.push({ //menuItems.push({
// name: 'Emby Guide', // name: 'Emby Guide',

1
dashboard-ui/scripts/moviecollections.js
View file

@ -21,7 +21,6 @@
view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster') view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster')
}; };
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query); LibraryBrowser.loadSavedQueryValues(key, pageData.query);
} }
return pageData; return pageData;

9
dashboard-ui/scripts/sync.js
View file

@ -2,7 +2,7 @@
var currentDialogOptions; var currentDialogOptions;
function submitJob(userId, syncOptions, form) { function submitJob(panel, userId, syncOptions, form) {
if (!userId) { if (!userId) {
throw new Error('userId cannot be null'); throw new Error('userId cannot be null');
@ -46,11 +46,12 @@
type: "POST", type: "POST",
url: ApiClient.getUrl("Sync/Jobs"), url: ApiClient.getUrl("Sync/Jobs"),
data: JSON.stringify(options), data: JSON.stringify(options),
contentType: "application/json" contentType: "application/json",
dataType: 'json'
}).done(function () { }).done(function () {
$('.syncPanel').panel('close'); panel.panel('close');
$(window.SyncManager).trigger('jobsubmit'); $(window.SyncManager).trigger('jobsubmit');
Dashboard.alert(Globalize.translate('MessageSyncJobCreated')); Dashboard.alert(Globalize.translate('MessageSyncJobCreated'));
}); });
@ -256,7 +257,7 @@
$('form', elem).on('submit', function () { $('form', elem).on('submit', function () {
submitJob(userId, options, this); submitJob(elem, userId, options, this);
return false; return false;
}); });