From 5060d1766f12f2f173718180af9423bb278d8f14 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 15 Aug 2015 16:33:53 -0400 Subject: [PATCH] update schedules direct --- .../iron-a11y-keys-behavior/.bower.json | 6 +++--- dashboard-ui/bower_components/paper-styles/.bower.json | 4 ++-- dashboard-ui/css/librarybrowser.css | 2 +- dashboard-ui/scripts/librarybrowser.js | 10 ++++++---- dashboard-ui/scripts/livetvguideprovider-scd.js | 2 +- dashboard-ui/scripts/livetvstatus.js | 8 ++++---- dashboard-ui/scripts/moviecollections.js | 1 - dashboard-ui/scripts/sync.js | 9 +++++---- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json index 4072b4af7..f0a9c76d5 100644 --- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json @@ -29,14 +29,14 @@ "web-component-tester": "*", "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", "_resolution": { "type": "version", "tag": "v1.0.5", "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", - "_originalSource": "PolymerElements/iron-a11y-keys-behavior" + "_originalSource": "polymerelements/iron-a11y-keys-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-styles/.bower.json b/dashboard-ui/bower_components/paper-styles/.bower.json index 04e2128c8..91d22f356 100644 --- a/dashboard-ui/bower_components/paper-styles/.bower.json +++ b/dashboard-ui/bower_components/paper-styles/.bower.json @@ -34,7 +34,7 @@ "tag": "v1.0.11", "commit": "347542e9ebe3e6e5f0830ee10e1c20c12956ff2c" }, - "_source": "git://github.com/PolymerElements/paper-styles.git", + "_source": "git://github.com/polymerelements/paper-styles.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-styles" + "_originalSource": "polymerelements/paper-styles" } \ No newline at end of file diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 73534a4b7..7972e739a 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1231,7 +1231,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { margin-right: auto; } -@media all and (min-height: 520px) { +@media all and (min-height: 480px) { .alphabetPicker { display: block; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 7a679c4db..3622e65b4 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -101,7 +101,7 @@ var cacheDuration; if (AppInfo.isNativeApp) { - cacheDuration = 600000; + cacheDuration = 300000; } else if ($.browser.ipad || $.browser.iphone || $.browser.android) { cacheDuration = 10000; @@ -247,9 +247,11 @@ // 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. - var delay = LibraryBrowser.enableFullPaperTabs() ? 500 : 0; + var enablePaperTabs = LibraryBrowser.enableFullPaperTabs(); + var delay = enablePaperTabs ? 500 : 0; var pgs = this; setTimeout(function () { + $(pgs).trigger('tabchange'); }, delay); }); @@ -1129,7 +1131,7 @@ if (item.UserData.UnplayedItemCount) { //html += '' + item.UserData.UnplayedItemCount + ''; } else if (item.UserData.Played && item.Type != 'TvChannel') { - html += '
'; + html += '
'; } } html += ''; @@ -2162,7 +2164,7 @@ if (item.SyncPercent) { if (item.SyncPercent >= 100) { - return '
'; + return '
'; } var degree = (item.SyncPercent / 100) * 360; diff --git a/dashboard-ui/scripts/livetvguideprovider-scd.js b/dashboard-ui/scripts/livetvguideprovider-scd.js index b0e7f9c69..3e2c20ff5 100644 --- a/dashboard-ui/scripts/livetvguideprovider-scd.js +++ b/dashboard-ui/scripts/livetvguideprovider-scd.js @@ -10,7 +10,7 @@ var info = config.ListingProviders.filter(function (i) { return i.Id == providerId; - })[0]; + })[0] || {}; listingsId = info.ListingsId; $('#selectListing', page).val(info.ListingsId || '').selectmenu('refresh'); diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js index fabbbd7a6..0ce1ba4ba 100644 --- a/dashboard-ui/scripts/livetvstatus.js +++ b/dashboard-ui/scripts/livetvstatus.js @@ -390,10 +390,10 @@ var menuItems = []; - //menuItems.push({ - // name: 'Schedules Direct', - // id: 'SchedulesDirect' - //}); + menuItems.push({ + name: 'Schedules Direct', + id: 'SchedulesDirect' + }); //menuItems.push({ // name: 'Emby Guide', diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index a92b160a0..2059e4dae 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -21,7 +21,6 @@ view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster') }; - pageData.query.ParentId = LibraryMenu.getTopParentId(); LibraryBrowser.loadSavedQueryValues(key, pageData.query); } return pageData; diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index cca1c16e9..3f7ce7d95 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -2,7 +2,7 @@ var currentDialogOptions; - function submitJob(userId, syncOptions, form) { + function submitJob(panel, userId, syncOptions, form) { if (!userId) { throw new Error('userId cannot be null'); @@ -46,11 +46,12 @@ type: "POST", url: ApiClient.getUrl("Sync/Jobs"), data: JSON.stringify(options), - contentType: "application/json" + contentType: "application/json", + dataType: 'json' }).done(function () { - $('.syncPanel').panel('close'); + panel.panel('close'); $(window.SyncManager).trigger('jobsubmit'); Dashboard.alert(Globalize.translate('MessageSyncJobCreated')); }); @@ -256,7 +257,7 @@ $('form', elem).on('submit', function () { - submitJob(userId, options, this); + submitJob(elem, userId, options, this); return false; });