@@ -13,7 +13,7 @@
${TabVideos}
diff --git a/dashboard-ui/scripts/editorsidebar.js b/dashboard-ui/scripts/editorsidebar.js
index fdfadf60c6..986246298e 100644
--- a/dashboard-ui/scripts/editorsidebar.js
+++ b/dashboard-ui/scripts/editorsidebar.js
@@ -400,6 +400,11 @@
updateEditorNode(this, item);
+ }).on('pagebeforeshow', ".metadataEditorPage", function () {
+
+ Dashboard.importCss('css/metadataeditor.css');
+ window.MetadataEditor = new metadataEditor();
+
}).on('pagebeforeshow', ".metadataEditorPage", function () {
var page = this;
@@ -425,11 +430,6 @@
});
- }).on('pageinit', ".metadataEditorPage", function () {
-
- Dashboard.importCss('css/metadataeditor.css');
- window.MetadataEditor = new metadataEditor();
-
}).on('pagebeforehide', ".metadataEditorPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index a696092bcf..0ced56ca24 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2450,7 +2450,9 @@
showLayoutMenu: function (button, currentLayout) {
// Add banner and list once all screens support them
- var views = ['List', 'Poster', 'PosterCard', 'Thumb', 'ThumbCard'];
+ var views = button.getAttribute('data-layouts');
+
+ views = views ? views.split(',') : ['List', 'Poster', 'PosterCard', 'Thumb', 'ThumbCard'];
var menuItems = views.map(function (v) {
return {
@@ -2525,7 +2527,7 @@
if (options.addLayoutButton) {
- html += '
';
+ html += '
';
}
if (options.sortButton) {
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index 055f7d366a..d6a16dc85c 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -66,7 +66,8 @@
addLayoutButton: true,
viewIcon: 'filter-list',
sortButton: true,
- currentLayout: view
+ currentLayout: view,
+ layouts: 'List,Poster,PosterCard,Thumb,ThumbCard,Timeline'
});
page.querySelector('.listTopPaging').innerHTML = pagingHtml;
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 3da851aea3..b56cb96025 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -841,6 +841,7 @@
"MessageSyncStarted": "Sync started",
"OptionPoster": "Poster",
"OptionPosterCard": "Poster card",
+ "OptionTimeline": "Timeline",
"OptionList": "List",
"OptionThumb": "Thumb",
"OptionThumbCard": "Thumb card",
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
index 975b2385d5..211a1f4c9e 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js
@@ -2986,7 +2986,7 @@ $.widget( "mobile.page", {
// when dom caching is not enabled or the page is embedded bind to remove the page on hide
if ( !page.data( "mobile-page" ).options.domCache ) {
- // TODO use _on - that is, sort out why it doesn't work in this case
+ // TODO use _on - that is, sort out why it doesn't work in this case
page.bind( "pagehide.remove", callback || function( e, data ) {
//check if this is a same page transition and if so don't remove the page