From cdcf2767fcb70367e1847f23cd24f82b84a358d2 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 4 Jul 2013 22:07:10 -0700 Subject: [PATCH] Removed Misc from settings --- UI/Settings/Misc/MiscTemplate.html | 3 --- UI/Settings/Misc/MiscView.js | 11 ----------- UI/Settings/SettingsLayout.js | 18 ------------------ 3 files changed, 32 deletions(-) delete mode 100644 UI/Settings/Misc/MiscTemplate.html delete mode 100644 UI/Settings/Misc/MiscView.js diff --git a/UI/Settings/Misc/MiscTemplate.html b/UI/Settings/Misc/MiscTemplate.html deleted file mode 100644 index 0533837be..000000000 --- a/UI/Settings/Misc/MiscTemplate.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Misc -
diff --git a/UI/Settings/Misc/MiscView.js b/UI/Settings/Misc/MiscView.js deleted file mode 100644 index 2fa69c9b0..000000000 --- a/UI/Settings/Misc/MiscView.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -define(['marionette', 'Mixins/AsModelBoundview'], function (Marionette, AsModelBoundView) { - - var view = Marionette.ItemView.extend({ - template : 'Settings/Misc/MiscTemplate', - className: 'form-horizontal' - }); - - return AsModelBoundView.call(view); -}); diff --git a/UI/Settings/SettingsLayout.js b/UI/Settings/SettingsLayout.js index eebc768fe..b80e08b96 100644 --- a/UI/Settings/SettingsLayout.js +++ b/UI/Settings/SettingsLayout.js @@ -14,7 +14,6 @@ define( 'Settings/Notifications/CollectionView', 'Settings/Notifications/Collection', 'Settings/General/GeneralView', - 'Settings/Misc/MiscView', 'Shared/LoadingView' ], function (App, Marionette, @@ -29,7 +28,6 @@ define( NotificationCollectionView, NotificationCollection, GeneralView, - MiscView, LoadingView) { return Marionette.Layout.extend({ template: 'Settings/SettingsLayoutTemplate', @@ -41,7 +39,6 @@ define( downloadClient : '#download-client', notifications : '#notifications', general : '#general', - misc : '#misc', loading : '#loading-region' }, @@ -52,7 +49,6 @@ define( downloadClientTab : '.x-download-client-tab', notificationsTab : '.x-notifications-tab', generalTab : '.x-general-tab', - miscTab : '.x-misc-tab' }, events: { @@ -62,7 +58,6 @@ define( 'click .x-download-client-tab' : '_showDownloadClient', 'click .x-notifications-tab' : '_showNotifications', 'click .x-general-tab' : '_showGeneral', - 'click .x-misc-tab' : '_showMisc', 'click .x-save-settings' : '_save' }, @@ -120,15 +115,6 @@ define( this._navigate('settings/general'); }, - _showMisc: function (e) { - if (e) { - e.preventDefault(); - } - - this.ui.miscTab.tab('show'); - this._navigate('settings/misc'); - }, - _navigate:function(route){ require(['Router'], function(){ App.Router.navigate(route); @@ -164,7 +150,6 @@ define( self.downloadClient.show(new DownloadClientLayout({model: self.settings})); self.notifications.show(new NotificationCollectionView({collection: self.notificationSettings})); self.general.show(new GeneralView({model: self.generalSettings})); - self.misc.show(new MiscView({model: self.settings})); }); }, @@ -185,9 +170,6 @@ define( case 'general': this._showGeneral(); break; - case 'misc': - this._showMisc(); - break; default: this._showMediaManagement(); }