tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-17 21:26:22 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Error messages not being shown in the UI or being shown in the wrong place

Browse Source
This commit is contained in:
Mark McDowall
2014-06-04 08:38:26 -07:00
parent 9916479f02
commit 545bc756f2
13 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/UI/Shared/ControlPanel/ControlPanelController.js
View File

@@ -9,15 +9,15 @@ define(
return Marionette.AppRouter.extend({
initialize: function () {
vent.on(vent.Commands.OpenControlPanelCommand, this._openControlPanel, this);
vent.on(vent.Commands.CloseControlPanelCommand, this._closeControlPanel, this);
vent.on(vent.Commands.OpenControlPanelCommand, this._openModal, this);
vent.on(vent.Commands.CloseControlPanelCommand, this._closeModal, this);
},
_openControlPanel: function (view) {
_openModal: function (view) {
AppLayout.controlPanelRegion.show(view);
},
_closeControlPanel: function () {
_closeModal: function () {
AppLayout.controlPanelRegion.closePanel();
}
});

10
src/UI/Shared/Modal/ModalController.js
View File

@@ -15,8 +15,8 @@ define(
return Marionette.AppRouter.extend({
initialize: function () {
vent.on(vent.Commands.OpenModalCommand, this._openControlPanel, this);
vent.on(vent.Commands.CloseModalCommand, this._closeControlPanel, this);
vent.on(vent.Commands.OpenModalCommand, this._openModal, this);
vent.on(vent.Commands.CloseModalCommand, this._closeModal, this);
vent.on(vent.Commands.EditSeriesCommand, this._editSeries, this);
vent.on(vent.Commands.DeleteSeriesCommand, this._deleteSeries, this);
vent.on(vent.Commands.ShowEpisodeDetails, this._showEpisode, this);
@@ -25,12 +25,12 @@ define(
vent.on(vent.Commands.ShowRenamePreview, this._showRenamePreview, this);
},
_openControlPanel: function (view) {
_openModal: function (view) {
AppLayout.modalRegion.show(view);
},
_closeControlPanel: function () {
AppLayout.modalRegion.closePanel();
_closeModal: function () {
AppLayout.modalRegion.closeModal();
},
_editSeries: function (options) {

6
src/UI/Shared/Modal/ModalRegion.js
View File

@@ -11,7 +11,7 @@ define(
constructor: function () {
Backbone.Marionette.Region.prototype.constructor.apply(this, arguments);
this.on('show', this.showPanel, this);
this.on('show', this.showModal, this);
},
getEl: function (selector) {
@@ -20,7 +20,7 @@ define(
return $el;
},
showPanel: function () {
showModal: function () {
this.$el.addClass('modal fade');
//need tab index so close on escape works
@@ -32,7 +32,7 @@ define(
'backdrop': 'static'});
},
closePanel: function () {
closeModal: function () {
$(this.el).modal('hide');
this.reset();
}