From 59f487392e8993ac0513b1c380042c1e668182dd Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 17 Feb 2015 21:52:06 -0800 Subject: [PATCH] Fixed: UI notification after Sonarr updates --- src/UI/JsLibraries/jquery.signalR.js | 10 +++++----- src/UI/Shared/NzbDroneController.js | 4 ++-- src/UI/Shared/VersionChangeMonitor.js | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/UI/JsLibraries/jquery.signalR.js b/src/UI/JsLibraries/jquery.signalR.js index 9f510b02d..fcacbc371 100644 --- a/src/UI/JsLibraries/jquery.signalR.js +++ b/src/UI/JsLibraries/jquery.signalR.js @@ -424,7 +424,7 @@ connection.log("Negotiating with '" + url + "'."); $.ajax({ url: url, - global: false, + global: true, cache: false, type: "GET", contentType: connection.contentType, @@ -758,7 +758,7 @@ $.ajax({ url: url, - global: false, + global: true, cache: false, type: "GET", contentType: connection.contentType, @@ -861,7 +861,7 @@ url = this.addQs(url, connection); return $.ajax({ url: url, - global: false, + global: true, type: connection.ajaxDataType === "jsonp" ? "GET" : "POST", contentType: signalR._.defaultContentType, dataType: connection.ajaxDataType, @@ -899,7 +899,7 @@ url: url, async: async, timeout: 1000, - global: false, + global: true, type: "POST", contentType: connection.contentType, dataType: connection.ajaxDataType, @@ -1665,7 +1665,7 @@ connection.log("Attempting to connect to '" + url + "' using longPolling."); instance.pollXhr = $.ajax({ url: url, - global: false, + global: true, cache: false, type: "GET", dataType: connection.ajaxDataType, diff --git a/src/UI/Shared/NzbDroneController.js b/src/UI/Shared/NzbDroneController.js index dffc7f51e..b6c1d0b52 100644 --- a/src/UI/Shared/NzbDroneController.js +++ b/src/UI/Shared/NzbDroneController.js @@ -2,7 +2,7 @@ var vent = require('vent'); var AppLayout = require('../AppLayout'); var Marionette = require('marionette'); var NotFoundView = require('./NotFoundView'); -var Messenger = require('messenger'); +var Messenger = require('./Messenger'); module.exports = Marionette.AppRouter.extend({ initialize : function() { @@ -41,7 +41,7 @@ module.exports = Marionette.AppRouter.extend({ Messenger.show({ message : 'Sonarr has been updated', hideAfter : 0, - id : 'droneUpdated', + id : 'sonarrUpdated', actions : { viewChanges : { label : 'View Changes', diff --git a/src/UI/Shared/VersionChangeMonitor.js b/src/UI/Shared/VersionChangeMonitor.js index a2bf14d23..932d97f6c 100644 --- a/src/UI/Shared/VersionChangeMonitor.js +++ b/src/UI/Shared/VersionChangeMonitor.js @@ -10,4 +10,4 @@ $(document).ajaxSuccess(function(event, xhr) { if (version !== window.NzbDrone.Version) { vent.trigger(vent.Events.ServerUpdated); } -}); \ No newline at end of file +});