Merge from hell? Something from the past came back to haunt us

This commit is contained in:
Mark McDowall 2013-05-03 00:20:52 -07:00
parent 7ab1084437
commit 17e99958e1
6 changed files with 2 additions and 15 deletions

View file

@ -1,6 +1,6 @@
"use strict";
define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
'Series/Index/SeriesIndexLayout', 'Upcoming/UpcomingCollectionView',
'Series/Index/SeriesIndexLayout',
'Calendar/CalendarCollectionView', 'Shared/NotificationView',
'Shared/NotFoundView', 'MainMenuView',
'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
@ -32,11 +32,6 @@ define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout({action: action}));
},
upcoming: function () {
this._setTitle('Upcoming');
NzbDrone.mainRegion.show(new NzbDrone.Upcoming.UpcomingCollectionView());
},
calendar: function () {
this._setTitle('Calendar');
var calendarCollection = new NzbDrone.Calendar.CalendarCollection();