1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-30 23:42:33 +01:00

Moar require

This commit is contained in:
Mark McDowall 2013-06-23 19:31:02 -07:00
parent ee28926da0
commit e856a31a4d
20 changed files with 83 additions and 63 deletions

View File

@ -2,7 +2,6 @@
<FileVersion>1</FileVersion>
<AutoEnableOnStartup>False</AutoEnableOnStartup>
<AllowParallelTestExecution>true</AllowParallelTestExecution>
<AllowTestsToRunInParallelWithThemselves>true</AllowTestsToRunInParallelWithThemselves>
<FrameworkUtilisationTypeForNUnit>UseDynamicAnalysis</FrameworkUtilisationTypeForNUnit>
<FrameworkUtilisationTypeForGallio>Disabled</FrameworkUtilisationTypeForGallio>
<FrameworkUtilisationTypeForMSpec>Disabled</FrameworkUtilisationTypeForMSpec>

View File

@ -1,6 +1,6 @@
'use strict';
define(['app', 'Shared/FormatHelpers','backgrid'], function () {
NzbDrone.Cells.AirDateCell = Backgrid.Cell.extend({
define(['app', 'Shared/FormatHelpers', 'Cells/NzbDroneCell'], function () {
return NzbDrone.Cells.NzbDroneCell.extend({
className: 'air-date-cell',
render: function () {

View File

@ -1,7 +1,7 @@
'use strict';
define(['app', 'Cells/NzbDroneCell'], function () {
NzbDrone.Cells.EpisodeNumberCell = NzbDrone.Cells.NzbDroneCell.extend({
return NzbDrone.Cells.NzbDroneCell.extend({
className: 'episode-number-cell',

View File

@ -1,7 +1,7 @@
'use strict';
define(['app','backgrid' ], function () {
NzbDrone.Cells.EpisodeStatusCell = Backgrid.Cell.extend({
define(['app','cells/nzbdronecell' ], function () {
return NzbDrone.Cells.NzbDroneCell.extend({
className: 'episode-status-cell',

View File

@ -1,7 +1,7 @@
'use strict';
define(['app', 'Cells/NzbDroneCell'], function () {
NzbDrone.Cells.EpisodeTitleCell = NzbDrone.Cells.NzbDroneCell.extend({
return NzbDrone.Cells.NzbDroneCell.extend({
className: 'episode-title-cell',

View File

@ -1,6 +1,6 @@
'use strict';
define(['app', 'Cells/TemplatedCell'], function () {
NzbDrone.Cells.QualityCell = NzbDrone.Cells.TemplatedCell.extend({
define(['app', 'Cells/TemplatedCell'], function (App, TemplatedCell) {
return TemplatedCell.extend({
className: 'quality-cell',
template : 'Cells/QualityTemplate'

View File

@ -1,6 +1,6 @@
'use strict';
define(['app','Cells/NzbDroneCell'], function () {
NzbDrone.Cells.RelativeDateCell = NzbDrone.Cells.NzbDroneCell.extend({
return NzbDrone.Cells.NzbDroneCell.extend({
className : 'relative-date-cell',

View File

@ -1,6 +1,6 @@
'use strict';
define(['app','backgrid'], function () {
Backgrid.SeriesStatusCell = Backgrid.Cell.extend({
define(['app','cells/nzbdronecell'], function () {
return NzbDrone.Cells.NzbDroneCell.extend({
className: 'series-status-cell',
render: function () {
@ -22,6 +22,4 @@ define(['app','backgrid'], function () {
return this;
}
});
return Backgrid.SeriesStatusCell;
});

View File

@ -1,6 +1,6 @@
'use strict';
define(['app', 'Cells/TemplatedCell'], function () {
NzbDrone.Cells.SeriesTitleCell = NzbDrone.Cells.TemplatedCell.extend({
define(['app', 'Cells/TemplatedCell'], function (App, TemplatedCell) {
return TemplatedCell.extend({
className: 'series-title',
template : 'Cells/SeriesTitleTemplate'

View File

@ -1,9 +1,7 @@
'use strict';
define(['app','Cells/NzbDroneCell'], function () {
NzbDrone.Cells.TemplatedCell = NzbDrone.Cells.NzbDroneCell.extend({
return NzbDrone.Cells.NzbDroneCell.extend({
render: function () {
var templateName = this.column.get('template') || this.template;

View File

@ -1,7 +1,7 @@
'use strict';
define(['app', 'Episode/Layout'], function () {
NzbDrone.Cells.ToggleCell = Backgrid.Cell.extend({
return Backgrid.Cell.extend({
className: 'toggle-cell clickable',

View File

@ -4,6 +4,8 @@ define(
'app',
'Settings/SettingsLayout',
'AddSeries/AddSeriesLayout',
'Missing/MissingLayout',
'History/HistoryLayout',
'Form/FormBuilder',
'Series/Index/SeriesIndexLayout',
'Calendar/CalendarLayout',
@ -14,12 +16,10 @@ define(
'Series/EpisodeCollection',
'Logs/Layout',
'Release/Layout',
'Missing/MissingLayout',
'History/HistoryLayout',
'Shared/FormatHelpers',
'Shared/TemplateHelpers',
'Shared/Footer/View'
], function (App, SettingsLayout, AddSeriesLayout) {
], function (App, SettingsLayout, AddSeriesLayout, MissingLayout, HistoryLayout) {
var controller = Backbone.Marionette.Controller.extend({
series : function () {
@ -58,13 +58,13 @@ define(
missing: function () {
this._setTitle('Missing');
App.mainRegion.show(new NzbDrone.Missing.MissingLayout());
App.mainRegion.show(new MissingLayout());
},
history: function () {
this._setTitle('History');
App.mainRegion.show(new NzbDrone.History.HistoryLayout());
App.mainRegion.show(new HistoryLayout());
},
rss: function () {

View File

@ -1,6 +1,6 @@
'use strict';
define(['app', 'History/Model', 'backbone.pageable'], function (App, HistoryModel, PageableCollection) {
NzbDrone.History.Collection = PageableCollection.extend({
return PageableCollection.extend({
url : NzbDrone.Constants.ApiRoot + '/history',
model : NzbDrone.History.Model,

View File

@ -1,7 +1,7 @@
'use strict';
define(['app', 'Cells/NzbDroneCell' ], function () {
NzbDrone.History.EventTypeCell = NzbDrone.Cells.NzbDroneCell.extend({
return NzbDrone.Cells.NzbDroneCell.extend({
className: 'history-event-type-cell',

View File

@ -14,8 +14,20 @@ define([
'Shared/Grid/HeaderCell',
'Shared/LoadingView'
],
function () {
NzbDrone.History.HistoryLayout = Backbone.Marionette.Layout.extend({
function (App,
HistoryCollection,
EventTypeCell,
RelativeDateCell,
TemplatedCell,
SeriesTitleCell,
EpisodeNumberCell,
EpisodeTitleCell,
QualityCell,
ToolbarLayout,
Pager,
HeaderCell,
LoadingView) {
return Backbone.Marionette.Layout.extend({
template: 'History/HistoryLayoutTemplate',
regions: {
@ -28,34 +40,34 @@ define([
{
name: 'eventType',
label:'',
cell : NzbDrone.History.EventTypeCell
cell : EventTypeCell
},
{
name : 'series',
label : 'Series',
cell : NzbDrone.Cells.SeriesTitleCell
cell : SeriesTitleCell
},
{
name : 'episode',
label : 'Episode',
sortable: false,
cell : NzbDrone.Cells.EpisodeNumberCell
cell : EpisodeNumberCell
},
{
name : 'episode',
label : 'Episode Title',
sortable: false,
cell : NzbDrone.Cells.EpisodeTitleCell
cell : EpisodeTitleCell
},
{
name : 'quality',
label: 'Quality',
cell : NzbDrone.Cells.QualityCell
name : 'quality',
label : 'Quality',
cell : QualityCell
},
{
name : 'date',
label: 'Date',
cell : NzbDrone.Cells.RelativeDateCell
cell : RelativeDateCell
}
],
@ -69,7 +81,7 @@ define([
className : 'table table-hover'
}));
this.pager.show(new NzbDrone.Shared.Grid.Pager({
this.pager.show(new Pager({
columns : this.columns,
collection: this.historyCollection
}));
@ -78,9 +90,9 @@ define([
onShow: function () {
var self = this;
this.history.show(new NzbDrone.Shared.LoadingView());
this.history.show(new LoadingView());
this.historyCollection = new NzbDrone.History.Collection();
this.historyCollection = new HistoryCollection();
this.historyCollection.fetch()
.done(function () {
self._showTable();

View File

@ -1,6 +1,6 @@
'use strict';
define(['app', 'Series/EpisodeModel', 'backbone.pageable'], function (app, EpisodeModel, PagableCollection) {
NzbDrone.Missing.Collection = PagableCollection.extend({
return PagableCollection.extend({
url : NzbDrone.Constants.ApiRoot + '/missing',
model: NzbDrone.Series.EpisodeModel,

View File

@ -10,11 +10,20 @@ define(
'Cells/SeriesTitleCell',
'Cells/EpisodeNumberCell',
'Cells/EpisodeTitleCell',
'Cells/AirDateCell',
'Shared/Grid/Pager',
'Shared/LoadingView'
], function (App, MissingRow) {
NzbDrone.Missing.MissingLayout = Backbone.Marionette.Layout.extend({
], function (App,
MissingRow,
MissingCollection,
AirDateCell,
SeriesStatusCell,
ToolbarLayout,
SeriesTitleCell,
EpisodeNumberCell,
EpisodeTitleCell,
Pager,
LoadingView) {
return Backbone.Marionette.Layout.extend({
template: 'Missing/MissingLayoutTemplate',
regions: {
@ -29,24 +38,24 @@ define(
name : 'series',
label : 'Series Title',
sortable: false,
cell : NzbDrone.Cells.SeriesTitleCell
cell : SeriesTitleCell
},
{
name : 'this',
label : 'Episode',
sortable: false,
cell : NzbDrone.Cells.EpisodeNumberCell
cell : EpisodeNumberCell
},
{
name : 'this',
label : 'Episode Title',
sortable: false,
cell : NzbDrone.Cells.EpisodeTitleCell
cell : EpisodeTitleCell
},
{
name : 'airDate',
label: 'Air Date',
cell : NzbDrone.Cells.AirDateCell
name : 'airDate',
label : 'Air Date',
cell : AirDateCell
}
],
@ -67,9 +76,9 @@ define(
onShow: function () {
var self = this;
this.missing.show(new NzbDrone.Shared.LoadingView());
this.missing.show(new LoadingView());
this.missingCollection = new NzbDrone.Missing.Collection();
this.missingCollection = new MissingCollection();
this.missingCollection.fetch().done(function () {
self._showTable();
});

View File

@ -1,8 +1,12 @@
'use strict';
define(['app', 'Series/Details/SeasonLayout', 'Series/SeasonCollection', 'Series/EpisodeCollection'], function () {
define(['app',
'Series/Details/SeasonLayout',
'Series/SeasonCollection',
'Series/EpisodeCollection'],
function (App, SeasonLayout, SeasonCollection, EpisodeCollection) {
NzbDrone.Series.Details.SeasonCollectionView = Backbone.Marionette.CollectionView.extend({
itemView : NzbDrone.Series.Details.SeasonLayout,
itemView : SeasonLayout,
initialize: function (options) {

View File

@ -5,8 +5,8 @@ define([
'Cells/EpisodeTitleCell',
'Cells/AirDateCell',
'Cells/ToggleCell'],
function () {
NzbDrone.Series.Details.SeasonLayout = Backbone.Marionette.Layout.extend({
function (App, EpisodeStatusCell, EpisodeTitleCell, AirDateCell, ToggleCell) {
return Backbone.Marionette.Layout.extend({
template: 'Series/Details/SeasonLayoutTemplate',
regions: {
@ -18,7 +18,7 @@ define([
{
name : 'ignored',
label : '',
cell : NzbDrone.Cells.ToggleCell,
cell : ToggleCell,
trueClass : 'icon-bookmark-empty',
falseClass: 'icon-bookmark'
},
@ -33,17 +33,17 @@ define([
{
name : 'this',
label: 'Title',
cell : NzbDrone.Cells.EpisodeTitleCell
cell : EpisodeTitleCell
},
{
name : 'airDate',
label: 'Air Date',
cell : NzbDrone.Cells.AirDateCell
cell : AirDateCell
} ,
{
name : 'status',
label: 'Status',
cell : NzbDrone.Cells.EpisodeStatusCell
cell : EpisodeStatusCell
}
],

View File

@ -7,8 +7,8 @@ define([
'Series/SeriesCollection',
'Cells/AirDateCell',
'Cells/SeriesTitleCell',
'Cells/SeriesStatusCell',
'Cells/TemplatedCell',
'Series/Index/Table/SeriesStatusCell',
'Shared/Toolbar/ToolbarLayout',
'Config',
'Shared/LoadingView'
@ -21,8 +21,8 @@ define([
SeriesCollection,
AirDateCell,
SeriesTitleCell,
TemplatedCell,
SeriesStatusCell,
TemplatedCell,
ToolbarLayout,
Config,
LoadingView)
@ -39,7 +39,7 @@ define([
{
name : 'status',
label: '',
cell : 'seriesStatus'
cell : SeriesStatusCell
},
{
name : 'this',