fixed more require issues

Gruntfile.js

@@ -76,7 +76,7 @@ module.exports = function (grunt) {
 
         handlebars: {
             options: {
-                namespace   : "Templates",
+                namespace   : "T",
                 partialRegex: /Partial.html/,
                 wrapped     : true,
                 amd         : true,

UI/Mixins/backbone.marionette.templates.js

@@ -1,7 +1,8 @@
 "use strict";
 
-define(['app', 'marionette', 'handlebars', 'templates'], function (App, Marionette, HandleBars, Templates) {
+define(['templates'], function (Templates) {
-    Marionette.TemplateCache.get = function (templateId) {
+    return function () {
+        this.get = function (templateId) {
 
             var templateKey = templateId.toLowerCase();
 
@@ -23,4 +24,7 @@ define(['app', 'marionette', 'handlebars', 'templates'], function (App, Marionet
                 }
             };
         };
+    };
 });
+
+

UI/Mixins/underscore.mixin.deepExtend.js

@@ -98,6 +98,8 @@
         return finalObj;
     };
 
+    require(['underscore'], function (_) {
+
         _.mixin({
             deepClone    : deepClone,
             isBasicObject: isBasicObject,
@@ -105,5 +107,6 @@
             arrays       : arrays,
             deepExtend   : deepExtend
         });
+    });
 
 }).call(this);

UI/Release/DownloadReportCell.js

@@ -1,6 +1,6 @@
 "use strict";
 
-define(['app'], function () {
+define(['app','backgrid'], function () {
     NzbDrone.Release.DownloadReportCell = Backgrid.Cell.extend({
 
         className: "download-report-cell",

UI/Shared/Modal/Region.js

@@ -1,6 +1,6 @@
 "use strict";
-define(['marionette'], function () {
+define(['marionette', 'bootstrap'], function (Marionette) {
-    return Backbone.Marionette.Region.extend({
+    return Marionette.Region.extend({
         el: "#modal-region",
 
         constructor: function () {

UI/app.js

@@ -39,38 +39,33 @@ require.config({
         },
 
         'underscore': {
-            dep    : ['$'],
+            deps   : ['$'],
-            exports: '_',
+            exports: '_'
-            init   : function () {
-                require(['mixins/underscore.mixin.deepExtend']);
-            }
         },
 
         backbone: {
             deps   : ['underscore', '$'],
-            exports: 'Backbone',
+            exports: 'Backbone'
-            init   : function () {
+        },
-                require(['libs/backbone.mutators']);
+
-            }
+        'backbone.deepmodel': {
+            deps: ['mixins/underscore.mixin.deepExtend']
         },
 
         marionette: {
-            deps   : ['backbone'],
+            deps   : ['backbone', 'mixins/backbone.marionette.templates'],
             exports: 'Marionette',
-            init   : function () {
+            init   : function (Backbone, TemplateMixin) {
-                require(['mixins/backbone.marionette.templates']);
+                TemplateMixin.call(Marionette.TemplateCache);
             }
         },
 
         signalR: {
-            dep: ['$']
+            deps: ['$']
         },
 
         'backbone.pageable': {
-            dep : ['backbone'],
+            deps: ['backbone']
-            init: function () {
-                console.log(this);
-            }
         },
 
         backgrid            : {
@@ -101,6 +96,9 @@ define([
     'Instrumentation/ErrorHandler'
 ], function (Marionette, ModalRegion) {
 
+    require(['libs/backbone.mutators']);
+
+
     window.NzbDrone = new Marionette.Application();
     window.NzbDrone.Config = {};
     window.NzbDrone.Form = {};