mirror of https://github.com/Sonarr/Sonarr
modal region is loaded by controller
This commit is contained in:
parent
20794bc461
commit
bb86e20bed
|
@ -13,7 +13,8 @@ define(
|
||||||
'Calendar/CalendarLayout',
|
'Calendar/CalendarLayout',
|
||||||
'Logs/Layout',
|
'Logs/Layout',
|
||||||
'Release/Layout',
|
'Release/Layout',
|
||||||
'Shared/NotFoundView'
|
'Shared/NotFoundView',
|
||||||
|
'Shared/Modal/Region'
|
||||||
], function (App, Marionette, HistoryLayout, SettingsLayout, AddSeriesLayout, SeriesIndexLayout, SeriesDetailsLayout, MissingLayout, SeriesModel, CalendarLayout,
|
], function (App, Marionette, HistoryLayout, SettingsLayout, AddSeriesLayout, SeriesIndexLayout, SeriesDetailsLayout, MissingLayout, SeriesModel, CalendarLayout,
|
||||||
LogsLayout, ReleaseLayout, NotFoundView) {
|
LogsLayout, ReleaseLayout, NotFoundView) {
|
||||||
return Marionette.Controller.extend({
|
return Marionette.Controller.extend({
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
define(
|
define(
|
||||||
[
|
[
|
||||||
|
'app',
|
||||||
'$',
|
'$',
|
||||||
'marionette',
|
'marionette',
|
||||||
'bootstrap'
|
'bootstrap'
|
||||||
], function ($, Marionette) {
|
], function (app, $, Marionette) {
|
||||||
return Marionette.Region.extend({
|
var region = Marionette.Region.extend({
|
||||||
el: '#modal-region',
|
el: '#modal-region',
|
||||||
|
|
||||||
constructor: function () {
|
constructor: function () {
|
||||||
|
@ -37,4 +38,12 @@ define(
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.addInitializer(function () {
|
||||||
|
app.addRegions({
|
||||||
|
modalRegion : region
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return region;
|
||||||
});
|
});
|
||||||
|
|
13
UI/app.js
13
UI/app.js
|
@ -164,9 +164,8 @@ require.config({
|
||||||
define(
|
define(
|
||||||
[
|
[
|
||||||
'marionette',
|
'marionette',
|
||||||
'shared/modal/region',
|
'Instrumentation/StringFormat'
|
||||||
'Instrumentation/StringFormat',
|
], function (Marionette) {
|
||||||
], function (Marionette, ModalRegion) {
|
|
||||||
|
|
||||||
var app = new Marionette.Application();
|
var app = new Marionette.Application();
|
||||||
|
|
||||||
|
@ -179,14 +178,12 @@ define(
|
||||||
SaveSettings: 'saveSettings'
|
SaveSettings: 'saveSettings'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
app.addInitializer(function () {
|
app.addInitializer(function () {
|
||||||
console.log('starting application');
|
console.log('starting application');
|
||||||
});
|
});
|
||||||
|
|
||||||
app.addRegions({
|
app.addRegions({
|
||||||
mainRegion : '#main-region',
|
mainRegion : '#main-region',
|
||||||
modalRegion : ModalRegion,
|
|
||||||
footerRegion : '#footer-region'
|
footerRegion : '#footer-region'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -200,9 +197,3 @@ define(
|
||||||
|
|
||||||
return app;
|
return app;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue