moved mixins to require.js

This commit is contained in:
kay.one 2013-06-20 22:35:56 -07:00
commit 467c88f711
6 changed files with 81 additions and 89 deletions

View file

@ -68,10 +68,14 @@ require.config({
backbone: {
deps :
[
'mixins/backbone.ajax',
'underscore',
'$'
],
exports: 'Backbone'
exports: 'Backbone',
init : function (AjaxMixin) {
AjaxMixin.apply(Backbone);
}
},
@ -87,7 +91,7 @@ require.config({
[
'backbone',
'handlebars',
'mixins/backbone.marionette.templates',
'Handlebars/backbone.marionette.templates',
'mixins/AsNamedView',
'Handlebars/Helpers/DateTime'
@ -122,6 +126,9 @@ require.config({
[
'backbone'
],
exports: 'Backgrid',
init: function () {
Backgrid.Column.prototype.defaults = {
name : undefined,
@ -199,7 +206,6 @@ define(
window.NzbDrone.History = {};
window.NzbDrone.Logs = {};
window.NzbDrone.Release = {};
window.NzbDrone.Mixins = {};
window.NzbDrone.Events = {
SeriesAdded: 'seriesAdded'
@ -214,9 +220,7 @@ define(
};
window.NzbDrone.addInitializer(function () {
console.log('starting application');
});
NzbDrone.addRegions({