Removed Misc from settings

pull/3113/head
Mark McDowall 12 years ago
parent ca21e0d26f
commit cdcf2767fc

@ -1,3 +0,0 @@
<fieldset>
<legend>Misc</legend>
</fieldset>

@ -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);
});

@ -14,7 +14,6 @@ define(
'Settings/Notifications/CollectionView', 'Settings/Notifications/CollectionView',
'Settings/Notifications/Collection', 'Settings/Notifications/Collection',
'Settings/General/GeneralView', 'Settings/General/GeneralView',
'Settings/Misc/MiscView',
'Shared/LoadingView' 'Shared/LoadingView'
], function (App, ], function (App,
Marionette, Marionette,
@ -29,7 +28,6 @@ define(
NotificationCollectionView, NotificationCollectionView,
NotificationCollection, NotificationCollection,
GeneralView, GeneralView,
MiscView,
LoadingView) { LoadingView) {
return Marionette.Layout.extend({ return Marionette.Layout.extend({
template: 'Settings/SettingsLayoutTemplate', template: 'Settings/SettingsLayoutTemplate',
@ -41,7 +39,6 @@ define(
downloadClient : '#download-client', downloadClient : '#download-client',
notifications : '#notifications', notifications : '#notifications',
general : '#general', general : '#general',
misc : '#misc',
loading : '#loading-region' loading : '#loading-region'
}, },
@ -52,7 +49,6 @@ define(
downloadClientTab : '.x-download-client-tab', downloadClientTab : '.x-download-client-tab',
notificationsTab : '.x-notifications-tab', notificationsTab : '.x-notifications-tab',
generalTab : '.x-general-tab', generalTab : '.x-general-tab',
miscTab : '.x-misc-tab'
}, },
events: { events: {
@ -62,7 +58,6 @@ define(
'click .x-download-client-tab' : '_showDownloadClient', 'click .x-download-client-tab' : '_showDownloadClient',
'click .x-notifications-tab' : '_showNotifications', 'click .x-notifications-tab' : '_showNotifications',
'click .x-general-tab' : '_showGeneral', 'click .x-general-tab' : '_showGeneral',
'click .x-misc-tab' : '_showMisc',
'click .x-save-settings' : '_save' 'click .x-save-settings' : '_save'
}, },
@ -120,15 +115,6 @@ define(
this._navigate('settings/general'); this._navigate('settings/general');
}, },
_showMisc: function (e) {
if (e) {
e.preventDefault();
}
this.ui.miscTab.tab('show');
this._navigate('settings/misc');
},
_navigate:function(route){ _navigate:function(route){
require(['Router'], function(){ require(['Router'], function(){
App.Router.navigate(route); App.Router.navigate(route);
@ -164,7 +150,6 @@ define(
self.downloadClient.show(new DownloadClientLayout({model: self.settings})); self.downloadClient.show(new DownloadClientLayout({model: self.settings}));
self.notifications.show(new NotificationCollectionView({collection: self.notificationSettings})); self.notifications.show(new NotificationCollectionView({collection: self.notificationSettings}));
self.general.show(new GeneralView({model: self.generalSettings})); self.general.show(new GeneralView({model: self.generalSettings}));
self.misc.show(new MiscView({model: self.settings}));
}); });
}, },
@ -185,9 +170,6 @@ define(
case 'general': case 'general':
this._showGeneral(); this._showGeneral();
break; break;
case 'misc':
this._showMisc();
break;
default: default:
this._showMediaManagement(); this._showMediaManagement();
} }

Loading…
Cancel
Save