diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css
index 0df50a690f..1fae944283 100644
--- a/dashboard-ui/css/search.css
+++ b/dashboard-ui/css/search.css
@@ -163,9 +163,10 @@
.viewMenuSearch {
position: absolute;
top: 0;
- left: 35%;
- right: 35%;
+ left: 40%;
+ right: 40%;
display: none;
+ padding-right: 55px;
}
@media all and (min-width: 800px) {
@@ -179,6 +180,14 @@
}
}
+@media all and (min-width: 1200px) {
+
+ .viewMenuSearch {
+ left: 42%;
+ right: 42%;
+ }
+}
+
.searchResultsOverlay {
position: fixed;
background: #222 !important;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 29d7e9103f..f3d874e558 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1633,7 +1633,7 @@
}
// If really close to 16:9 (episode image), just return 16:9
- if (Math.abs(1.777777778 - result) <= .15) {
+ if (Math.abs(1.777777778 - result) <= .2) {
return 1.777777778;
}
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index ed1694295f..c237b8eb27 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -84,6 +84,7 @@
html += '
';
html += '';
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index cdea5081d0..84b25e9e24 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -380,7 +380,7 @@
// Down key
if (e.keyCode == 40) {
- //var first = $('.searchHint', panel)[0];
+ //var first = $('.card', panel)[0];
//if (first) {
// first.focus();
diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js
index ebd348735b..a062aa2296 100644
--- a/dashboard-ui/scripts/syncactivity.js
+++ b/dashboard-ui/scripts/syncactivity.js
@@ -258,8 +258,6 @@
var page = this;
- reloadData(page);
-
// off here
$('.btnSync', page).taskButton({
mode: 'off'
diff --git a/dashboard-ui/scripts/taskbutton.js b/dashboard-ui/scripts/taskbutton.js
index 4e577abaa4..42308a944c 100644
--- a/dashboard-ui/scripts/taskbutton.js
+++ b/dashboard-ui/scripts/taskbutton.js
@@ -65,6 +65,39 @@ $.fn.taskButton = function (options) {
}
}
+ function onScheduledTaskMessageConfirmed(instance, id) {
+ ApiClient.startScheduledTask(id).done(function () {
+
+ pollTasks(instance);
+ });
+ }
+
+ function onButtonClick(instance, id) {
+
+ var key = 'scheduledTaskButton' + options.taskKey;
+ var expectedValue = '4';
+
+ if (store.getItem(key) == expectedValue) {
+ onScheduledTaskMessageConfirmed(instance, id);
+ } else {
+
+ var msg = Globalize.translate('ConfirmMessageScheduledTaskButton');
+ msg += '
';
+ msg += '
';
+ msg += '' + Globalize.translate('ButtonScheduledTasks') + '';
+
+ Dashboard.confirm(msg, Globalize.translate('HeaderConfirmation'), function (result) {
+
+ if (result) {
+
+ store.setItem(key, expectedValue);
+ onScheduledTaskMessageConfirmed(instance, id);
+ }
+ });
+
+ }
+ }
+
var self = this;
if (options.panel) {
@@ -73,24 +106,21 @@ $.fn.taskButton = function (options) {
if (options.mode == 'off') {
+ this.off(".taskbutton");
+ $(ApiClient).off(".taskbutton");
+
if (ApiClient.isWebSocketOpen()) {
ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
}
- $(ApiClient).off(".taskbutton");
-
} else {
- this.on('click', function () {
+ this.on('click.taskbutton', function () {
var button = this;
var id = button.getAttribute('data-taskid');
- ApiClient.startScheduledTask(id).done(function () {
-
- pollTasks(self);
- });
-
+ onButtonClick(self, id);
});
pollTasks(self);