Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Select input for select series in manual import

This commit is contained in:
Mark McDowall 2015-05-12 17:07:56 -07:00
parent ee224cb422
commit 149c149094
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/UI/ManualImport/Series/SelectSeriesLayout.js
View File

@ -35,6 +35,7 @@ module.exports = Marionette.Layout.extend({
}); });
this.listenTo(this.seriesCollection, 'row:selected', this._onSelected); this.listenTo(this.seriesCollection, 'row:selected', this._onSelected);
this.listenTo(this, 'modal:afterShow', this._setFocus);
}, },
onRender : function() { onRender : function() {
@ -88,5 +89,9 @@ module.exports = Marionette.Layout.extend({
this.trigger('manualimport:selected:series', { model: e.model }); this.trigger('manualimport:selected:series', { model: e.model });
vent.trigger(vent.Commands.CloseModal2Command); vent.trigger(vent.Commands.CloseModal2Command);
},
_setFocus : function () {
this.ui.filter.focus();
} }
}); });

7
src/UI/Shared/Modal/ModalRegionBase.js
View File

@ -1,3 +1,4 @@
var _ = require('underscore');
var $ = require('jquery'); var $ = require('jquery');
var Backbone = require('backbone'); var Backbone = require('backbone');
var Marionette = require('marionette'); var Marionette = require('marionette');
@ -33,7 +34,10 @@ var region = Marionette.Region.extend({
this.currentView.$el.addClass('modal-dialog'); this.currentView.$el.addClass('modal-dialog');
this.trigger('modal:afterShow'); this.$el.on('shown.bs.modal', _.bind(function() {
this.trigger('modal:afterShow');
this.currentView.trigger('modal:afterShow');
}, this));
}, },
closeModal : function() { closeModal : function() {
@ -44,6 +48,7 @@ var region = Marionette.Region.extend({
_closing : function() { _closing : function() {
if (this.$el) { if (this.$el) {
this.$el.off('hide.bs.modal'); this.$el.off('hide.bs.modal');
this.$el.off('shown.bs.modal');
} }
this.reset(); this.reset();