diff --git a/dashboard-ui/components/remotecontrol.js b/dashboard-ui/components/remotecontrol.js
index b52461c2aa..bf102c70cd 100644
--- a/dashboard-ui/components/remotecontrol.js
+++ b/dashboard-ui/components/remotecontrol.js
@@ -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) {
require(['scripts/slideshow'], function () {
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 74d9351ac9..86b6e3d221 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -186,7 +186,7 @@
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 5514ae2a96..fb337072e2 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -113,6 +113,10 @@
function allowSwipeOn(elem) {
+ if (dom.parentWithTag(elem, 'input')) {
+ return false;
+ }
+
if (elem.classList) {
return !elem.classList.contains('hiddenScrollX') && !elem.classList.contains('smoothScrollX') && !elem.classList.contains('libraryViewNav');
}
diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js
index 6f3aa4752e..4d85e3f253 100644
--- a/dashboard-ui/scripts/syncactivity.js
+++ b/dashboard-ui/scripts/syncactivity.js
@@ -179,6 +179,8 @@
showTargetName = !hasLocalSync();
}
+ var hasOpenSection = false;
+
for (var i = 0, length = jobs.length; i < length; i++) {
var job = jobs[i];
@@ -188,9 +190,11 @@
if (targetName != lastTargetName) {
if (lastTargetName) {
+ html += '';
html += '
';
html += '
';
html += '
';
+ hasOpenSection = false;
}
lastTargetName = targetName;
@@ -200,12 +204,18 @@
html += '' + targetName + '
';
html += '';
+ html += '';
+ hasOpenSection = true;
}
}
html += getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage);
}
+ if (hasOpenSection) {
+ html += '
';
+ }
+
var elem = $('.syncActivity', page).html(html).lazyChildren();
$('.btnJobMenu', elem).on('click', function () {