removed some false/positive error message from the UI.

This commit is contained in:
kay.one 2013-05-28 22:03:43 -07:00
parent e2d17ac109
commit 53bb6254fd
2 changed files with 11 additions and 5 deletions

View File

@ -68,7 +68,8 @@
};
if (xmlHttpRequest.status === 0 && xmlHttpRequest.readyState === 0) {
message.message = 'NzbDrone Server Not Reachable. make sure NzbDrone is running.';
return false;
//message.message = 'NzbDrone Server Not Reachable. make sure NzbDrone is running.';
} else {
message.message = "[{0}] {1} : {2}".format(ajaxOptions.type, xmlHttpRequest.statusText, ajaxOptions.url);
}

View File

@ -52,7 +52,10 @@ define(['app', 'Config', 'Commands/CommandController', 'Shared/Messenger'], func
}
});
commandPromise.fail(function () {
commandPromise.fail(function (options) {
if (options.readyState === 0 || options.status === 0) {
return;
}
if (self.model.get('errorMessage')) {
NzbDrone.Shared.Messenger.show({
message: self.model.get('errorMessage'),
@ -62,9 +65,11 @@ define(['app', 'Config', 'Commands/CommandController', 'Shared/Messenger'], func
});
commandPromise.always(function () {
self.$el.removeClass('disabled');
self.ui.icon.removeClass('icon-spinner icon-spin');
self.idle = true;
if (!self.isClosed) {
self.$el.removeClass('disabled');
self.ui.icon.removeClass('icon-spinner icon-spin');
self.idle = true;
}
});
}
},