From 17e99958e16b08b05a28da2043e3ec9435a67494 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 3 May 2013 00:20:52 -0700 Subject: [PATCH] Merge from hell? Something from the past came back to haunt us --- UI/Content/settings.quality.less | 3 --- UI/Controller.js | 7 +------ UI/History/HistoryLayout.js | 1 - UI/Index.html | 3 +-- UI/Routing.js | 2 -- UI/app.js | 1 - 6 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 UI/Content/settings.quality.less diff --git a/UI/Content/settings.quality.less b/UI/Content/settings.quality.less deleted file mode 100644 index 8a74e00a7..000000000 --- a/UI/Content/settings.quality.less +++ /dev/null @@ -1,3 +0,0 @@ -.quality-size-item { - padding-left: 10px; -} \ No newline at end of file diff --git a/UI/Controller.js b/UI/Controller.js index f5dbaed87..3516e136d 100644 --- a/UI/Controller.js +++ b/UI/Controller.js @@ -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(); diff --git a/UI/History/HistoryLayout.js b/UI/History/HistoryLayout.js index 4ed0c2972..2b40e1c2c 100644 --- a/UI/History/HistoryLayout.js +++ b/UI/History/HistoryLayout.js @@ -3,7 +3,6 @@ define([ 'app', 'History/Collection', 'Series/Index/Table/AirDateCell', - 'Shared/Toolbar/ToolbarView', 'Shared/Toolbar/ToolbarLayout' ], function () { diff --git a/UI/Index.html b/UI/Index.html index c5ed1b2cf..a95c090dd 100644 --- a/UI/Index.html +++ b/UI/Index.html @@ -14,11 +14,10 @@ - + - diff --git a/UI/Routing.js b/UI/Routing.js index 9e2294b17..cc8fb9e58 100644 --- a/UI/Routing.js +++ b/UI/Routing.js @@ -11,8 +11,6 @@ require(['app', 'Controller'], function (app, controller) { 'series/add' : 'addSeries', 'series/add/:action(/:query)': 'addSeries', 'series/details/:query' : 'seriesDetails', - 'upcoming' : 'upcoming', - 'upcoming/index' : 'upcoming', 'calendar' : 'calendar', 'settings' : 'settings', 'settings/:action(/:query)' : 'settings', diff --git a/UI/app.js b/UI/app.js index 7d70bbe4e..6f82a28e4 100644 --- a/UI/app.js +++ b/UI/app.js @@ -45,7 +45,6 @@ define('app', function () { window.NzbDrone.Quality = {}; window.NzbDrone.Shared = {}; window.NzbDrone.Shared.Toolbar = {}; - window.NzbDrone.Upcoming = {}; window.NzbDrone.Calendar = {}; window.NzbDrone.Settings = {}; window.NzbDrone.Settings.Naming = {};