@@ -310,6 +310,10 @@ Custom property | Description | Default
'iron-deselect': '_onIronDeselect'
},
+ ready: function() {
+ this.setScrollDirection('y', this.$.tabsContainer);
+ },
+
_computeScrollButtonClass: function(hideThisButton, scrollable, hideScrollButtons) {
if (!scrollable || hideScrollButtons) {
return 'hidden';
@@ -364,24 +368,43 @@ Custom property | Description | Default
);
},
- _scroll: function() {
- var scrollLeft;
+ _scroll: function(e, detail) {
if (!this.scrollable) {
return;
}
- scrollLeft = this.$.tabsContainer.scrollLeft;
+ var ddx = (detail && -detail.ddx) || 0;
+ this._affectScroll(ddx);
+ },
+
+ _down: function(e) {
+ // go one beat async to defeat IronMenuBehavior
+ // autorefocus-on-no-selection timeout
+ this.async(function() {
+ if (this._defaultFocusAsync) {
+ this.cancelAsync(this._defaultFocusAsync);
+ this._defaultFocusAsync = null;
+ }
+ }, 1);
+ },
+
+ _affectScroll: function(dx) {
+ this.$.tabsContainer.scrollLeft += dx;
+
+ var scrollLeft = this.$.tabsContainer.scrollLeft;
this._leftHidden = scrollLeft === 0;
this._rightHidden = scrollLeft === this._tabContainerScrollSize;
},
_onLeftScrollButtonDown: function() {
+ this._scrollToLeft();
this._holdJob = setInterval(this._scrollToLeft.bind(this), this._holdDelay);
},
_onRightScrollButtonDown: function() {
+ this._scrollToRight();
this._holdJob = setInterval(this._scrollToRight.bind(this), this._holdDelay);
},
@@ -391,11 +414,11 @@ Custom property | Description | Default
},
_scrollToLeft: function() {
- this.$.tabsContainer.scrollLeft -= this._step;
+ this._affectScroll(-this._step);
},
_scrollToRight: function() {
- this.$.tabsContainer.scrollLeft += this._step;
+ this._affectScroll(this._step);
},
_tabChanged: function(tab, old) {
diff --git a/dashboard-ui/cordova/ios/tabbar.js b/dashboard-ui/cordova/ios/tabbar.js
index ff76bbc250..9f7d91cbcd 100644
--- a/dashboard-ui/cordova/ios/tabbar.js
+++ b/dashboard-ui/cordova/ios/tabbar.js
@@ -11,8 +11,8 @@
}
switch (name) {
- case 'Featured':
- Dashboard.navigate('index.html');
+ case 'Favorites':
+ Dashboard.navigate('favorites.html');
break;
case 'Library':
Dashboard.navigate('index.html');
@@ -68,8 +68,8 @@
*/
var items = [
- { name: 'Featured', label: Globalize.translate('ButtonForYou'), image: 'tabButton:Featured', options: {} },
{ name: 'Library', label: Globalize.translate('ButtonLibrary'), image: 'tabbar/tab-library.png', options: {} },
+ { name: 'Favorites', label: Globalize.translate('ButtonFavorites'), image: 'tabButton:Favorites', options: {} },
{ name: 'Search', label: Globalize.translate('ButtonSearch'), image: 'tabButton:Search', options: {} },
{ name: 'NowPlaying', label: Globalize.translate('ButtonNowPlaying'), image: 'tabbar/tab-nowplaying.png', options: {} },
{ name: 'Sync', label: Globalize.translate('ButtonSync'), image: 'tabbar/tab-sync.png', options: {} },
@@ -113,11 +113,11 @@
Events.on(ConnectionManager, 'localusersignedin', showTabs);
Events.on(ConnectionManager, 'localusersignedout', hideTabs);
- Events.on(ConnectionManager, 'playbackstart', onPlaybackStop);
- Events.on(ConnectionManager, 'playbackstop', onPlaybackStart);
+ Events.on(MediaController, 'playbackstart', onPlaybackStop);
+ Events.on(MediaController, 'playbackstop', onPlaybackStart);
});
- pageClassOn('pageshowready', "page", function () {
+ pageClassOn('pageshow', "page", function () {
var page = this;
diff --git a/dashboard-ui/cordova/localassetmanager.js b/dashboard-ui/cordova/localassetmanager.js
index 076d41d969..3cca552048 100644
--- a/dashboard-ui/cordova/localassetmanager.js
+++ b/dashboard-ui/cordova/localassetmanager.js
@@ -459,10 +459,20 @@
return filename;
}
- function downloadFile(url, localPath) {
+ function downloadFile(url, localPath, enableBackground) {
+
+ if (!enableBackground) {
+ return downloadWithFileTransfer(url, localPath);
+ }
var deferred = DeferredBuilder.Deferred();
+ if (localStorage.getItem('sync-' + url) == '1') {
+ Logger.log('file was downloaded previously');
+ deferred.resolveWith(null, [localPath]);
+ return deferred.promise();
+ }
+
Logger.log('downloading: ' + url + ' to ' + localPath);
getFileSystem().done(function (fileSystem) {
@@ -478,10 +488,8 @@
var downloadPromise = download.startAsync().then(function () {
// on success
- var localUrl = localPath;
-
- Logger.log('Downloaded local url: ' + localUrl);
- deferred.resolveWith(null, [localUrl]);
+ Logger.log('Downloaded local url: ' + localPath);
+ localStorage.setItem('sync-' + url, '1');
}, function () {
@@ -495,6 +503,34 @@
//Logger.log('download progress: ' + value);
});
+
+ // true indicates that it's queued
+ deferred.resolveWith(null, [localPath, true]);
+ });
+
+ }).fail(getOnFail(deferred));;
+
+ }).fail(getOnFail(deferred));
+
+ return deferred.promise();
+ }
+
+ function downloadWithFileTransfer(url, localPath) {
+
+ var deferred = DeferredBuilder.Deferred();
+
+ Logger.log('downloading: ' + url + ' to ' + localPath);
+
+ getFileSystem().done(function (fileSystem) {
+
+ createDirectory(getParentDirectoryPath(localPath)).done(function () {
+
+ var path = fileSystem.root.toURL() + "/emby/cache/" + key;
+
+ var ft = new FileTransfer();
+ ft.download(url, path, function (entry) {
+
+ deferred.resolveWith(null, [localPath]);
});
}).fail(getOnFail(deferred));;
@@ -552,10 +588,6 @@
return deferred.promise();
}
- function getParentDirectoryPath(path) {
- return path.substring(0, path.lastIndexOf('/'));;
- }
-
function downloadSubtitles(url, localItem, subtitleStream) {
var path = item.LocalPath;
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index ca1b08f0b4..3473ab7678 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -458,10 +458,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
padding: 0;
}
- .lnkSibling:hover {
- text-decoration: underline;
- }
-
.lnkSibling:not(.hide) {
display: block;
}
@@ -973,10 +969,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
text-decoration: none;
}
- .detailPageParentLink:hover {
- text-decoration: underline;
- }
-
.itemMiscInfo {
text-overflow: ellipsis;
overflow: hidden;
@@ -1049,7 +1041,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
border-radius: 50%;
color: #fff;
line-height: 19px;
- background-color: #38c;
+ background-color: #52B54B;
}
.playedIndicator + .syncIndicator {
@@ -1556,6 +1548,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
display: none !important;
}
+.homeFavoritesDisabled .homeFavoritesTab {
+ display: none !important;
+}
+
.detailsMenu {
width: 280px;
}
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 85d724adbc..f64176211a 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -352,10 +352,6 @@ body {
text-decoration: none;
}
- .textlink:hover {
- text-decoration: underline;
- }
-
h1, h1 a {
font-weight: 300 !important;
font-size: 24px;
@@ -382,7 +378,7 @@ h2 {
font-weight: 500 !important;
}
-a {
+a, a:active, a:hover {
text-decoration: none;
}
@@ -1105,10 +1101,6 @@ paper-input + .fieldDescription {
background-color: rgba(26,26,26,.94);
}
-.footerOverBottomTabs {
- bottom: 52px !important;
-}
-
.footerNotification {
padding: .75em 1em;
margin: 0;
@@ -1588,3 +1580,22 @@ progress {
.supporterMembershipDisabled .tabSupporterMembership {
display: none;
}
+
+.syncActivityForTarget {
+ margin: 0 0 3em 0;
+}
+
+.syncActivityForTarget paper-fab {
+ border-radius: 0;
+}
+
+@media all and (min-width: 800px) {
+
+ .syncActivityForTarget {
+ max-width: 600px;
+ margin: 0 3em 3em 0;
+ display: inline-block;
+ vertical-align: top;
+ min-width: 400px;
+ }
+}
diff --git a/dashboard-ui/favorites.html b/dashboard-ui/favorites.html
new file mode 100644
index 0000000000..c150d890b8
--- /dev/null
+++ b/dashboard-ui/favorites.html
@@ -0,0 +1,15 @@
+
+
+
+ Emby
+
+
+
${TabHome}
${TabNextUp}
- ${TabFavorites}
+ ${TabFavorites}
${TabUpcoming}
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index 87d95438de..1acbe574c6 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -7,7 +7,7 @@
+
+
+
+
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index 25c8f256fc..5af05e5683 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -10,13 +10,13 @@
+
+
+
+
-
+
${TabSuggestions}
${TabGuide}
${TabChannels}
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index 3b7fde43fe..c9953fee5a 100644
--- a/dashboard-ui/mypreferencesmenu.html
+++ b/dashboard-ui/mypreferencesmenu.html
@@ -77,6 +77,15 @@
+
+
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 4734f6ed88..db7199a2ee 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -8,7 +8,7 @@
-
@@ -149,7 +149,7 @@
-
+
${TabNowPlaying}
${TabControls}
diff --git a/dashboard-ui/scripts/aboutpage.js b/dashboard-ui/scripts/aboutpage.js
index 6607272194..9cd8055a79 100644
--- a/dashboard-ui/scripts/aboutpage.js
+++ b/dashboard-ui/scripts/aboutpage.js
@@ -1,6 +1,6 @@
(function ($, document) {
- $(document).on('pageshowready', "#aboutPage", function () {
+ $(document).on('pageshow', "#aboutPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index cbbb017635..d0696daf6d 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -172,7 +172,7 @@
$('.addPluginForm').off('submit', AddPluginPage.onSubmit).on('submit', AddPluginPage.onSubmit);
- }).on('pageshowready', "#addPluginPage", function () {
+ }).on('pageshow', "#addPluginPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js
index d2191e9711..2804e0a1d5 100644
--- a/dashboard-ui/scripts/advancedconfigurationpage.js
+++ b/dashboard-ui/scripts/advancedconfigurationpage.js
@@ -70,7 +70,7 @@
return false;
}
- $(document).on('pageshowready', "#advancedConfigurationPage", function () {
+ $(document).on('pageshow', "#advancedConfigurationPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/appservices.js b/dashboard-ui/scripts/appservices.js
index 72662c08bc..c17665ab60 100644
--- a/dashboard-ui/scripts/appservices.js
+++ b/dashboard-ui/scripts/appservices.js
@@ -98,7 +98,7 @@
$('.sectionTabs', page).hide();
$('.' + context + 'SectionTabs', page).show();
- }).on('pageshowready', "#appServicesPage", function () {
+ }).on('pageshow', "#appServicesPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js
index 9ec86f9db7..f3370543a9 100644
--- a/dashboard-ui/scripts/autoorganizelog.js
+++ b/dashboard-ui/scripts/autoorganizelog.js
@@ -352,7 +352,7 @@
$('.episodeCorrectionForm').off('submit', onEpisodeCorrectionFormSubmit).on('submit', onEpisodeCorrectionFormSubmit);
- }).on('pageshowready', "#libraryFileOrganizerLogPage", function () {
+ }).on('pageshow', "#libraryFileOrganizerLogPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/autoorganizetv.js b/dashboard-ui/scripts/autoorganizetv.js
index 2f4941081a..9d9a206077 100644
--- a/dashboard-ui/scripts/autoorganizetv.js
+++ b/dashboard-ui/scripts/autoorganizetv.js
@@ -153,7 +153,7 @@
$('.libraryFileOrganizerForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#libraryFileOrganizerPage", function () {
+ }).on('pageshow', "#libraryFileOrganizerPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js
index f0ccc7ec36..09471416b9 100644
--- a/dashboard-ui/scripts/channelsettings.js
+++ b/dashboard-ui/scripts/channelsettings.js
@@ -31,7 +31,7 @@
$('.channelSettingsForm', page).off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#channelSettingsPage", function () {
+ }).on('pageshow', "#channelSettingsPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js
index 0fc5a28864..b03cd24032 100644
--- a/dashboard-ui/scripts/cinemamodeconfiguration.js
+++ b/dashboard-ui/scripts/cinemamodeconfiguration.js
@@ -75,7 +75,7 @@
$('.cinemaModeConfigurationForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#cinemaModeConfigurationPage", function () {
+ }).on('pageshow', "#cinemaModeConfigurationPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js
index e1729da915..fe91c88372 100644
--- a/dashboard-ui/scripts/dashboardgeneral.js
+++ b/dashboard-ui/scripts/dashboardgeneral.js
@@ -103,7 +103,7 @@
$('.dashboardGeneralForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#dashboardGeneralPage", function () {
+ }).on('pageshow', "#dashboardGeneralPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/dashboardhosting.js b/dashboard-ui/scripts/dashboardhosting.js
index 9b606e3b6d..f5491caa0c 100644
--- a/dashboard-ui/scripts/dashboardhosting.js
+++ b/dashboard-ui/scripts/dashboardhosting.js
@@ -40,7 +40,7 @@
return false;
}
- $(document).on('pageshowready', "#dashboardHostingPage", function () {
+ $(document).on('pageshow', "#dashboardHostingPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js
index 2d5a7861ee..94f8eae4a7 100644
--- a/dashboard-ui/scripts/device.js
+++ b/dashboard-ui/scripts/device.js
@@ -82,7 +82,7 @@
$('.deviceForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#devicePage", function () {
+ }).on('pageshow', "#devicePage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js
index f5f668e8f2..dc304823ba 100644
--- a/dashboard-ui/scripts/devices.js
+++ b/dashboard-ui/scripts/devices.js
@@ -90,7 +90,7 @@
});
}
- $(document).on('pageshowready', "#devicesPage", function () {
+ $(document).on('pageshow', "#devicesPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/scripts/devicesupload.js
index 41ef3edd21..caef5796cf 100644
--- a/dashboard-ui/scripts/devicesupload.js
+++ b/dashboard-ui/scripts/devicesupload.js
@@ -136,7 +136,7 @@
$('.devicesUploadForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#devicesUploadPage", function () {
+ }).on('pageshow', "#devicesUploadPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index 0fc2ca24ef..56d61eaf11 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -1066,7 +1066,7 @@
$('.xmlAttributeForm').off('submit', DlnaProfilePage.onXmlAttributeFormSubmit).on('submit', DlnaProfilePage.onXmlAttributeFormSubmit);
$('.subtitleProfileForm').off('submit', DlnaProfilePage.onSubtitleProfileFormSubmit).on('submit', DlnaProfilePage.onSubtitleProfileFormSubmit);
- }).on('pageshowready', "#dlnaProfilePage", function () {
+ }).on('pageshow', "#dlnaProfilePage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/dlnaprofiles.js b/dashboard-ui/scripts/dlnaprofiles.js
index cbef2aa1ae..ddcaeeee5b 100644
--- a/dashboard-ui/scripts/dlnaprofiles.js
+++ b/dashboard-ui/scripts/dlnaprofiles.js
@@ -104,7 +104,7 @@
}
- $(document).on('pageshowready', "#dlnaProfilesPage", function () {
+ $(document).on('pageshow', "#dlnaProfilesPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/dlnaserversettings.js b/dashboard-ui/scripts/dlnaserversettings.js
index d307e3e400..32a07becf4 100644
--- a/dashboard-ui/scripts/dlnaserversettings.js
+++ b/dashboard-ui/scripts/dlnaserversettings.js
@@ -43,7 +43,7 @@
$('.dlnaServerSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#dlnaServerSettingsPage", function () {
+ }).on('pageshow', "#dlnaServerSettingsPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/dlnasettings.js b/dashboard-ui/scripts/dlnasettings.js
index a64dfd7a73..422ddad580 100644
--- a/dashboard-ui/scripts/dlnasettings.js
+++ b/dashboard-ui/scripts/dlnasettings.js
@@ -32,7 +32,7 @@
$('.dlnaSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#dlnaSettingsPage", function () {
+ }).on('pageshow', "#dlnaSettingsPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 910c6c4078..e729ae8d98 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -1475,7 +1475,7 @@
showMoreMenu(page, this);
});
- }).on('pageshowready', "#editItemMetadataPage", function () {
+ }).on('pageshow', "#editItemMetadataPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 5768d88ba3..445159218e 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -68,7 +68,7 @@
$('.encodingSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#encodingSettingsPage", function () {
+ }).on('pageshow', "#encodingSettingsPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js
index efa27dfadf..00d709b191 100644
--- a/dashboard-ui/scripts/favorites.js
+++ b/dashboard-ui/scripts/favorites.js
@@ -141,10 +141,24 @@
});
}
- window.HomePage.renderFavorites = function (page, tabContent) {
- if (LibraryBrowser.needsRefresh(tabContent)) {
- loadSections(tabContent, Dashboard.getCurrentUserId());
+ function initHomePage() {
+
+ window.HomePage.renderFavorites = function (page, tabContent) {
+ if (LibraryBrowser.needsRefresh(tabContent)) {
+ loadSections(tabContent, Dashboard.getCurrentUserId());
+ }
+ };
+ }
+
+ initHomePage();
+
+ pageIdOn('pageshow', "favoritesPage", function () {
+
+ var page = this;
+
+ if (LibraryBrowser.needsRefresh(page)) {
+ loadSections(page, Dashboard.getCurrentUserId());
}
- };
+ });
})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js
index 7f5d619a4b..482bc01d33 100644
--- a/dashboard-ui/scripts/htmlmediarenderer.js
+++ b/dashboard-ui/scripts/htmlmediarenderer.js
@@ -40,7 +40,7 @@
if (duration) {
if (time >= (duration - 1)) {
- onEnded();
+ //onEnded();
return;
}
}
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 2833d64a48..2d6d78707e 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -246,7 +246,7 @@
});
});
- pageIdOn('pageshowready', "indexPage", function () {
+ pageIdOn('pageshow', "indexPage", function () {
var page = this;
$(MediaController).on('playbackstop', onPlaybackStop);
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index b897e0c452..77407a1c48 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1085,30 +1085,29 @@
var reviews = result.Items;
+ html += '
';
+
for (var i = 0, length = reviews.length; i < length; i++) {
var review = reviews[i];
- html += '
';
-
- html += '';
- html += ' ';
+
+ html += '';
}
+ html += '
';
if (limit && result.TotalRecordCount > limit) {
html += '';
-
+ html += '';
if (review.Score != null) {
- html += review.Score;
+ //html += review.Score;
}
else if (review.Likes != null) {
if (review.Likes) {
- html += '
';
+ html += '
';
+ html += '
';
+ html += '';
+ html += '';
+ html += '' + review.Caption + '
';
+ html += '' + review.Caption + '
';
var vals = [];
@@ -1119,8 +1118,7 @@
vals.push(review.Publisher);
}
- html += '' + vals.join(', ') + '.';
-
+ html += '
';
+ html += '' + vals.join(', ') + '.';
if (review.Date) {
try {
@@ -1134,15 +1132,17 @@
}
}
-
html += '
';
if (review.Url) {
- html += '';
+ html += '';
}
- html += '';
itemHtml += i.Name;
- itemHtml += '';
+ itemHtml += '
';
return itemHtml;
}).join('');
@@ -29,7 +29,7 @@
});
}
- pageIdOn('pageshowready', "searchPage", function () {
+ pageIdOn('pageshow', "searchPage", function () {
var page = this;
loadSuggestions(page);
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index 20e8cb383f..9bfad7634b 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -346,7 +346,7 @@
var page = this;
updatePageStyle(page);
- }).on('pageshowready', "#selectServerPage", function () {
+ }).on('pageshow', "#selectServerPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/shared.js b/dashboard-ui/scripts/shared.js
index 303c04b4dd..29814f70f7 100644
--- a/dashboard-ui/scripts/shared.js
+++ b/dashboard-ui/scripts/shared.js
@@ -79,7 +79,7 @@
});
- }).on('pageshowready', "#publicSharedItemPage", function () {
+ }).on('pageshow', "#publicSharedItemPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 1eb6b9701b..faa7f00e8c 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1564,7 +1564,7 @@ var Dashboard = {
// The native app can handle a little bit more than safari
if (AppInfo.isNativeApp) {
- quality -= 10;
+ quality -= 5;
} else {
@@ -1724,6 +1724,8 @@ var AppInfo = {};
AppInfo.enableMovieHomeSuggestions = true;
AppInfo.enableNavDrawer = true;
AppInfo.enableSearchInTopMenu = true;
+ AppInfo.enableHomeFavorites = true;
+ AppInfo.enableNowPlayingBar = true;
AppInfo.enableAppStorePolicy = isCordova;
@@ -1741,6 +1743,8 @@ var AppInfo = {};
//AppInfo.enableSectionTransitions = true;
AppInfo.enableNavDrawer = false;
AppInfo.enableSearchInTopMenu = false;
+ AppInfo.enableHomeFavorites = false;
+ AppInfo.enableNowPlayingBar = false;
} else {
if (isMobile) {
@@ -1915,6 +1919,10 @@ var AppInfo = {};
if (AppInfo.isNativeApp) {
elem.classList.add('nativeApp');
}
+
+ if (!AppInfo.enableHomeFavorites) {
+ elem.classList.add('homeFavoritesDisabled');
+ }
}
function onDocumentReady() {
@@ -1990,6 +1998,11 @@ var AppInfo = {};
}
}
+ if (AppInfo.enableNowPlayingBar) {
+ require(['scripts/nowplayingbar']);
+ Dashboard.importCss('css/nowplayingbar.css');
+ }
+
if (navigator.splashscreen) {
navigator.splashscreen.hide();
}
diff --git a/dashboard-ui/scripts/streamingsettings.js b/dashboard-ui/scripts/streamingsettings.js
index 65cb296dbe..c9d4ac1cb9 100644
--- a/dashboard-ui/scripts/streamingsettings.js
+++ b/dashboard-ui/scripts/streamingsettings.js
@@ -49,7 +49,7 @@
$('.streamingSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#streamingSettingsPage", function () {
+ }).on('pageshow', "#streamingSettingsPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js
index 5519342b8f..5b6fc3418c 100644
--- a/dashboard-ui/scripts/supporterkeypage.js
+++ b/dashboard-ui/scripts/supporterkeypage.js
@@ -120,7 +120,7 @@
};
-$(document).on('pageshowready', "#supporterKeyPage", SupporterKeyPage.onPageShow);
+$(document).on('pageshow', "#supporterKeyPage", SupporterKeyPage.onPageShow);
(function () {
@@ -267,7 +267,7 @@ $(document).on('pageshowready', "#supporterKeyPage", SupporterKeyPage.onPageShow
$('#linkKeysForm').on('submit', SupporterKeyPage.linkSupporterKeys);
$('.popupAddUserForm').on('submit', SupporterKeyPage.onAddConnectUserSubmit).on('submit', SupporterKeyPage.onAddConnectUserSubmit);
- }).on('pageshowready', "#supporterKeyPage", function () {
+ }).on('pageshow', "#supporterKeyPage", function () {
var page = this;
loadConnectSupporters(page);
diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
index 009896b6b8..b0b3a0ae11 100644
--- a/dashboard-ui/scripts/supporterpage.js
+++ b/dashboard-ui/scripts/supporterpage.js
@@ -182,7 +182,7 @@
$('.supporterForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#supporterPage", function () {
+ }).on('pageshow', "#supporterPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 417833abd8..948b73f37a 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -407,7 +407,7 @@
onCategorySyncButtonClick(page, this);
});
- }).on('pageshowready', ".libraryPage", function () {
+ }).on('pageshow', ".libraryPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js
index b0b54a9206..30215b65ff 100644
--- a/dashboard-ui/scripts/syncactivity.js
+++ b/dashboard-ui/scripts/syncactivity.js
@@ -48,7 +48,7 @@
}
var html = '';
- html += '';
+ html += 'Emby
-
';
html += text;
html += '
';
@@ -59,59 +59,23 @@
var html = '';
- html += "";
-
- html += '
';
}
lastTargetName = targetName;
- html += '';
- html += '
'; - html += '
'; - html += '
'; + html += '
';
+ html += '';
-
- html += '';
-
- syncJobPage += '?id=' + job.Id;
-
- html += '';
-
- var imgUrl;
- var style = '';
+ html += '';
if (job.PrimaryImageItemId) {
- imgUrl = ApiClient.getScaledImageUrl(job.PrimaryImageItemId, {
+ var imgUrl = ApiClient.getScaledImageUrl(job.PrimaryImageItemId, {
type: "Primary",
- width: 400,
- tag: job.PrimaryImageTag
+ width: 40,
+ tag: job.PrimaryImageTag,
+ minScale: 3
});
- style = "background-position:center center;";
+ html += ' ";
-
- // cardScalable
- html += "
";
-
- html += '";
+ html += '';
+ html += '';
+
+ html += '';
-
- var progress = job.Progress || 0;
-
- var footerClass = 'cardFooter fullCardFooter lightCardFooter';
-
- if (progress == 0 || progress >= 100) {
- footerClass += ' hide';
- }
-
- html += '";
-
- html += "
";
-
- html += getSyncStatusBanner(job);
-
- // cardContent
- html += "";
+
+ //html += '
";
return html;
}
@@ -187,24 +207,26 @@
if (targetName != lastTargetName) {
if (lastTargetName) {
- html += '';
+ //html += '
";
+
+ //// card
+ //html += "';
+
+ //html += '';
+
+ //html += '';
+
+ //var imgUrl;
+ //var style = '';
+
+ //html += '
";
+
+ //html += '";
+
+ //// cardBox
+ //html += "';
+
+ //var progress = job.Progress || 0;
+
+ //var footerClass = 'cardFooter fullCardFooter lightCardFooter';
+
+ //if (progress == 0 || progress >= 100) {
+ // footerClass += ' hide';
+ //}
+
+ //html += '";
+
+ //html += "
";
+
+ //// cardContent
+ //html += "";
+
+ //// cardScalable
+ //html += "'; - html += '
'; - html += '
'; + html += '
';
-
- html += '
';
+ html += '' + targetName + '
';
-
- html += '';
+ html += '
';
+ }
+
var elem = $('.syncActivity', page).html(html).lazyChildren();
Events.trigger(elem[0], 'create');
@@ -229,38 +251,32 @@
function refreshJob(page, job) {
- var card = page.querySelector('.card[data-id=\'' + job.Id + '\']');
+ var card = page.querySelector('.syncJobItem[data-id=\'' + job.Id + '\']');
if (!card) {
return;
}
- var banner = card.querySelector('.syncStatusBanner');
+ var banner = card.querySelector('.syncStatus');
if (banner.getAttribute('data-status') == job.Status) {
var elem = document.createElement('div');
elem.innerHTML = getSyncStatusBanner(job);
- elem = elem.querySelector('.syncStatusBanner');
+ elem = elem.querySelector('.syncStatus');
elem.parentNode.removeChild(elem);
banner.parentNode.replaceChild(elem, banner);
}
var progress = job.Progress || 0;
- var cardFooter = card.querySelector('.cardFooter');
+ var syncProgresContainer = card.querySelector('.syncProgresContainer');
- if (progress == 0 || progress >= 100) {
- cardFooter.classList.add('hide');
- }
- else {
- cardFooter.classList.remove('hide');
- cardFooter.querySelector('.itemProgressBar').value = progress;
- }
+ syncProgresContainer.querySelector('paper-progress').value = progress;
}
function showJobMenu(page, elem) {
- var card = $(elem).parents('.card');
+ var card = $(elem).parents('.syncJobItem');
var jobId = card.attr('data-id');
var status = card.attr('data-status');
@@ -377,7 +393,7 @@
}
- $(document).on('pageshowready', ".syncActivityPage", function () {
+ $(document).on('pageshow', ".syncActivityPage", function () {
var page = this;
lastDataLoad = 0;
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index 126bacf90e..d54600cd30 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -394,7 +394,7 @@
$('.syncJobForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', ".syncJobPage", function () {
+ }).on('pageshow', ".syncJobPage", function () {
var page = this;
loadJob(page);
diff --git a/dashboard-ui/scripts/syncsettings.js b/dashboard-ui/scripts/syncsettings.js
index 427301a347..5f801af43e 100644
--- a/dashboard-ui/scripts/syncsettings.js
+++ b/dashboard-ui/scripts/syncsettings.js
@@ -52,7 +52,7 @@
$('.syncSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#syncSettingsPage", function () {
+ }).on('pageshow', "#syncSettingsPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 0a324e487d..4218425fce 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -285,7 +285,7 @@
});
});
- pageIdOn('pageshowready', "tvRecommendedPage", function () {
+ pageIdOn('pageshow', "tvRecommendedPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 40b0c888e6..87496e655d 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -201,7 +201,7 @@
$('.userLibraryAccessForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#userLibraryAccessPage", function () {
+ }).on('pageshow', "#userLibraryAccessPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js
index d72b2d78c7..4fa79b3d55 100644
--- a/dashboard-ui/scripts/usernew.js
+++ b/dashboard-ui/scripts/usernew.js
@@ -151,7 +151,7 @@
$('.newUserProfileForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#newUserPage", function () {
+ }).on('pageshow', "#newUserPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index 4599d1fa62..16fff1906f 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -388,7 +388,7 @@
$('.scheduleForm').off('submit', UserParentalControlPage.onScheduleFormSubmit).on('submit', UserParentalControlPage.onScheduleFormSubmit);
$('.userParentalControlForm').off('submit', UserParentalControlPage.onSubmit).on('submit', UserParentalControlPage.onSubmit);
- }).on('pageshowready', "#userParentalControlPage", function () {
+ }).on('pageshow', "#userParentalControlPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/wizardlivetvguide.js b/dashboard-ui/scripts/wizardlivetvguide.js
index 67e9f83d92..c8f26c716a 100644
--- a/dashboard-ui/scripts/wizardlivetvguide.js
+++ b/dashboard-ui/scripts/wizardlivetvguide.js
@@ -91,7 +91,7 @@
$('.btnSkip', page).on('click', skip);
$('.btnNext', page).on('click', next);
- }).on('pageshowready', "#wizardGuidePage", function () {
+ }).on('pageshow', "#wizardGuidePage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/wizardlivetvtuner.js b/dashboard-ui/scripts/wizardlivetvtuner.js
index 92ab815107..93d29e7488 100644
--- a/dashboard-ui/scripts/wizardlivetvtuner.js
+++ b/dashboard-ui/scripts/wizardlivetvtuner.js
@@ -89,7 +89,7 @@
$('.btnSkip', page).on('click', skip);
- }).on('pageshowready', "#wizardTunerPage", function () {
+ }).on('pageshow', "#wizardTunerPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js
index 0184259c72..6d4cf3c989 100644
--- a/dashboard-ui/scripts/wizardsettings.js
+++ b/dashboard-ui/scripts/wizardsettings.js
@@ -76,7 +76,7 @@
$('.wizardSettingsForm', page).off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#wizardSettingsPage", function () {
+ }).on('pageshow', "#wizardSettingsPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js
index 0a95c97746..83f7c64ef2 100644
--- a/dashboard-ui/scripts/wizardstartpage.js
+++ b/dashboard-ui/scripts/wizardstartpage.js
@@ -46,7 +46,7 @@
$('.wizardStartForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#wizardStartPage", function () {
+ }).on('pageshow', "#wizardStartPage", function () {
Dashboard.showLoadingMsg();
var page = this;
diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js
index fd5fc695d3..c55d817760 100644
--- a/dashboard-ui/scripts/wizarduserpage.js
+++ b/dashboard-ui/scripts/wizarduserpage.js
@@ -60,7 +60,7 @@
$('.wizardUserForm').off('submit', onSubmit).on('submit', onSubmit);
- }).on('pageshowready', "#wizardUserPage", function () {
+ }).on('pageshow', "#wizardUserPage", function () {
Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/search.html b/dashboard-ui/search.html
index 151bad2193..eb1f69c0d5 100644
--- a/dashboard-ui/search.html
+++ b/dashboard-ui/search.html
@@ -4,7 +4,7 @@
' + targetName + '
'; + html += '';
}
}
html += getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage);
}
+ if (jobs.length) {
+ html += '
';
+ html += '
+
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index a82d9cc5bd..c215414fe1 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -1541,5 +1541,6 @@
"OptionEnableVideoFrameAnalysisHelp": "Extract detailed information about videos that can be used to make transcoding as efficient as possible. This will cause library scans to take longer.",
"LabelVideoFrameAnalysisLimit": "Limit frame by frame analysis to videos less than:",
"LabelHardwareVideoDecoder": "Hardware video decoder:",
- "LabelHardwareVideoDecoderHelp": "Available on supported systems only."
+ "LabelHardwareVideoDecoderHelp": "Available on supported systems only.",
+ "ButtonManageServer": "Manage Server"
}
diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css
index dab59d7365..2d26540c40 100644
--- a/dashboard-ui/themes/android.css
+++ b/dashboard-ui/themes/android.css
@@ -3,7 +3,7 @@
}
.viewMenuBar.semiTransparent {
- background-color: rgba(27, 27, 27, .65);
+ background-color: rgba(27, 27, 27, .6);
}
.background-theme-b {
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index 5476741d58..aaf125833e 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -3,7 +3,20 @@
}
body {
- font-size: 14px;
+ font-size: 15px;
+}
+
+.ui-body-b a:visited {
+ color: #007AFF /*{b-link-visited}*/;
+}
+
+.ui-body-b a {
+ color: #007AFF /*{b-link-color}*/;
+ font-weight: 500;
+}
+
+.ui-body-b select {
+ -webkit-appearance: none;
}
.backdropContainer {
@@ -12,13 +25,17 @@ body {
}
.background-theme-b {
- background-color: #181818;
+ background-color: #161616;
}
.backdropContainer .pageBackground {
background-color: rgba(28,28,28,.92) !important;
}
+.homeTopViews .defaultBackground .cardImage {
+ background-color: #303030;
+}
+
.viewMenuBar {
/* It needs this in order to retain height since we're positioning the contents absolutely */
height: 50px;
@@ -115,7 +132,7 @@ h1, h1 a {
}
.tvGuideHeader {
- top: 86px;
+ top: 86px !important;
}
.libraryMenuButtonText {
@@ -126,6 +143,7 @@ h1, h1 a {
text-align: center;
font-size: 16px;
margin: 0 auto !important;
+ padding: 0 !important;
}
.libraryPanelHeader span {
@@ -188,3 +206,11 @@ paper-tab {
/* Eliminate transparency to prevent clicks from passing through to the elements underneath */
background-color: rgb(26,26,26);
}
+
+.nowPlayingPageBackButton {
+ display: none !important;
+}
+
+.nowPlayingPagePaperTabs {
+ display: none !important;
+}
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index 57203acda3..cc4be4dea7 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -16368,7 +16368,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
+
@@ -16503,6 +16503,10 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
'iron-deselect': '_onIronDeselect'
},
+ ready: function() {
+ this.setScrollDirection('y', this.$.tabsContainer);
+ },
+
_computeScrollButtonClass: function(hideThisButton, scrollable, hideScrollButtons) {
if (!scrollable || hideScrollButtons) {
return 'hidden';
@@ -16557,24 +16561,43 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
);
},
- _scroll: function() {
- var scrollLeft;
+ _scroll: function(e, detail) {
if (!this.scrollable) {
return;
}
- scrollLeft = this.$.tabsContainer.scrollLeft;
+ var ddx = (detail && -detail.ddx) || 0;
+ this._affectScroll(ddx);
+ },
+
+ _down: function(e) {
+ // go one beat async to defeat IronMenuBehavior
+ // autorefocus-on-no-selection timeout
+ this.async(function() {
+ if (this._defaultFocusAsync) {
+ this.cancelAsync(this._defaultFocusAsync);
+ this._defaultFocusAsync = null;
+ }
+ }, 1);
+ },
+
+ _affectScroll: function(dx) {
+ this.$.tabsContainer.scrollLeft += dx;
+
+ var scrollLeft = this.$.tabsContainer.scrollLeft;
this._leftHidden = scrollLeft === 0;
this._rightHidden = scrollLeft === this._tabContainerScrollSize;
},
_onLeftScrollButtonDown: function() {
+ this._scrollToLeft();
this._holdJob = setInterval(this._scrollToLeft.bind(this), this._holdDelay);
},
_onRightScrollButtonDown: function() {
+ this._scrollToRight();
this._holdJob = setInterval(this._scrollToRight.bind(this), this._holdDelay);
},
@@ -16584,11 +16607,11 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
},
_scrollToLeft: function() {
- this.$.tabsContainer.scrollLeft -= this._step;
+ this._affectScroll(-this._step);
},
_scrollToRight: function() {
- this.$.tabsContainer.scrollLeft += this._step;
+ this._affectScroll(this._step);
},
_tabChanged: function(tab, old) {
@@ -16930,7 +16953,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
},
_disabledChanged: function(disabled) {
- this.$.progressContainer.setAttribute('aria-disabled', disabled ? 'true' : 'false');
+ this.setAttribute('aria-disabled', disabled ? 'true' : 'false');
},
_hideSecondaryProgress: function(secondaryRatio) {
@@ -18496,6 +18519,36 @@ paper-ripple {
return this.$.textarea;
},
+ /**
+ * Returns textarea's selection start.
+ * @type Number
+ */
+ get selectionStart() {
+ return this.$.textarea.selectionStart;
+ },
+
+ /**
+ * Returns textarea's selection end.
+ * @type Number
+ */
+ get selectionEnd() {
+ return this.$.textarea.selectionEnd;
+ },
+
+ /**
+ * Sets the textarea's selection start.
+ */
+ set selectionStart(value) {
+ this.$.textarea.selectionStart = value;
+ },
+
+ /**
+ * Sets the textarea's selection end.
+ */
+ set selectionEnd(value) {
+ this.$.textarea.selectionEnd = value;
+ },
+
/**
* Returns true if `value` is valid. The validator provided in `validator`
* will be used first, if it exists; otherwise, the `textarea`'s validity