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

fix sync layout

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-01 14:16:07 -04:00
parent e0d2a9298b
commit ee11212148
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/components/remotecontrol.js
View file

@ -1,4 +1,4 @@
define(['browser', 'datetime', 'libraryBrowser', 'listView', 'userdataButtons'], function (browser, datetime, libraryBrowser, listView, userdataButtons) { define(['browser', 'datetime', 'libraryBrowser', 'listView', 'userdataButtons', 'cardStyle'], function (browser, datetime, libraryBrowser, listView, userdataButtons) {
function showSlideshowMenu(context) { function showSlideshowMenu(context) {
require(['scripts/slideshow'], function () { require(['scripts/slideshow'], function () {

2
dashboard-ui/nowplaying.html
View file

@ -186,7 +186,7 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="playlistTab" data-index="2"> <div class="pageTabContent ehsContent" id="playlistTab" data-index="2">
<div class="playlist itemsContainer" is="emby-itemscontainer" style="max-width: 800px; margin: 3em auto 0; padding-bottom: 200px;"> <div class="playlist itemsContainer vertical-list" is="emby-itemscontainer" style="max-width: 800px; margin: 3em auto 0; padding-bottom: 200px;">
</div> </div>
</div> </div>
</div> </div>

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

@ -113,6 +113,10 @@
function allowSwipeOn(elem) { function allowSwipeOn(elem) {
if (dom.parentWithTag(elem, 'input')) {
return false;
}
if (elem.classList) { if (elem.classList) {
return !elem.classList.contains('hiddenScrollX') && !elem.classList.contains('smoothScrollX') && !elem.classList.contains('libraryViewNav'); return !elem.classList.contains('hiddenScrollX') && !elem.classList.contains('smoothScrollX') && !elem.classList.contains('libraryViewNav');
} }

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

@ -179,6 +179,8 @@
showTargetName = !hasLocalSync(); showTargetName = !hasLocalSync();
} }
var hasOpenSection = false;
for (var i = 0, length = jobs.length; i < length; i++) { for (var i = 0, length = jobs.length; i < length; i++) {
var job = jobs[i]; var job = jobs[i];
@ -188,9 +190,11 @@
if (targetName != lastTargetName) { if (targetName != lastTargetName) {
if (lastTargetName) { if (lastTargetName) {
html += '</div>';
html += '<br/>'; html += '<br/>';
html += '<br/>'; html += '<br/>';
html += '<br/>'; html += '<br/>';
hasOpenSection = false;
} }
lastTargetName = targetName; lastTargetName = targetName;
@ -200,12 +204,18 @@
html += '<div>' + targetName + '</div>'; html += '<div>' + targetName + '</div>';
html += '</div>'; html += '</div>';
html += '<div class="itemsContainer vertical-wrap">';
hasOpenSection = true;
} }
} }
html += getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage); html += getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage);
} }
if (hasOpenSection) {
html += '</div>';
}
var elem = $('.syncActivity', page).html(html).lazyChildren(); var elem = $('.syncActivity', page).html(html).lazyChildren();
$('.btnJobMenu', elem).on('click', function () { $('.btnJobMenu', elem).on('click', function () {