From bb86e20bedc5a0248c76f93ce4466f17b288043e Mon Sep 17 00:00:00 2001
From: Keivan Beigi <kay.one@gmail.com>
Date: Fri, 19 Jul 2013 16:08:41 -0700
Subject: [PATCH] modal region is loaded by controller

---
 UI/Controller.js          |  3 ++-
 UI/Shared/Modal/Region.js | 13 +++++++++++--
 UI/app.js                 | 13 ++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/UI/Controller.js b/UI/Controller.js
index 71948fc82..4302dc339 100644
--- a/UI/Controller.js
+++ b/UI/Controller.js
@@ -13,7 +13,8 @@ define(
         'Calendar/CalendarLayout',
         'Logs/Layout',
         'Release/Layout',
-        'Shared/NotFoundView'
+        'Shared/NotFoundView',
+        'Shared/Modal/Region'
     ], function (App, Marionette, HistoryLayout, SettingsLayout, AddSeriesLayout, SeriesIndexLayout, SeriesDetailsLayout, MissingLayout, SeriesModel, CalendarLayout,
         LogsLayout, ReleaseLayout, NotFoundView) {
         return Marionette.Controller.extend({
diff --git a/UI/Shared/Modal/Region.js b/UI/Shared/Modal/Region.js
index e48ad946b..9e89d3c37 100644
--- a/UI/Shared/Modal/Region.js
+++ b/UI/Shared/Modal/Region.js
@@ -1,11 +1,12 @@
 'use strict';
 define(
     [
+        'app',
         '$',
         'marionette',
         'bootstrap'
-    ], function ($, Marionette) {
-        return Marionette.Region.extend({
+    ], function (app, $, Marionette) {
+        var region = Marionette.Region.extend({
             el: '#modal-region',
 
             constructor: function () {
@@ -37,4 +38,12 @@ define(
             }
 
         });
+
+        app.addInitializer(function () {
+            app.addRegions({
+                modalRegion       : region
+            });
+        });
+
+        return region;
     });
diff --git a/UI/app.js b/UI/app.js
index d78c98cb4..9652b433a 100644
--- a/UI/app.js
+++ b/UI/app.js
@@ -164,9 +164,8 @@ require.config({
 define(
     [
         'marionette',
-        'shared/modal/region',
-        'Instrumentation/StringFormat',
-    ], function (Marionette, ModalRegion) {
+        'Instrumentation/StringFormat'
+    ], function (Marionette) {
 
         var app = new Marionette.Application();
 
@@ -179,14 +178,12 @@ define(
             SaveSettings: 'saveSettings'
         };
 
-
         app.addInitializer(function () {
             console.log('starting application');
         });
 
         app.addRegions({
             mainRegion        : '#main-region',
-            modalRegion       : ModalRegion,
             footerRegion      : '#footer-region'
         });
 
@@ -200,9 +197,3 @@ define(
 
         return app;
     });
-
-
-
-
-
-