Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 15:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4558

Browse Source
This commit is contained in:
barisusakli
2016-04-22 19:48:41 +03:00
parent 9d6532fe7b
commit c790373dfc
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/client/account/settings.js
View File

@@ -78,11 +78,12 @@ define('forum/account/settings', ['forum/account/header', 'components', 'csrf'],
}; };
function toggleCustomRoute() { function toggleCustomRoute() {
$('[data-property="homePageCustom"]').val('');
if ($('[data-property="homePageRoute"]').val() === 'custom') { if ($('[data-property="homePageRoute"]').val() === 'custom') {
$('#homePageCustom').show(); $('#homePageCustom').show();
}else{ } else {
$('#homePageCustom').hide(); $('#homePageCustom').hide();
$('[data-property="homePageCustom"]').val('');
} }
} }

64
src/controllers/accounts/settings.js
View File

@@ -96,8 +96,18 @@ settingsController.get = function(req, res, callback) {
{ "name": "Yeti", "value": "yeti" } { "name": "Yeti", "value": "yeti" }
]; ];
var isCustom = true;
userData.homePageRoutes.forEach(function(route) { userData.homePageRoutes.forEach(function(route) {
route.selected = route.route === userData.settings.homePageRoute; route.selected = route.route === userData.settings.homePageRoute;
if (route.selected) {
isCustom = false;
}
});
userData.homePageRoutes.push({
route: 'custom',
name: 'Custom',
selected: isCustom
}); });
userData.bootswatchSkinOptions.forEach(function(skin) { userData.bootswatchSkinOptions.forEach(function(skin) {
@@ -142,40 +152,28 @@ function getHomePageRoutes(callback) {
name: 'Category: ' + category.name name: 'Category: ' + category.name
}; };
}); });
next(null, categoryData);
categoryData = categoryData || [];
plugins.fireHook('filter:homepage.get', {routes: [
{
route: 'categories',
name: 'Categories'
},
{
route: 'recent',
name: 'Recent'
},
{
route: 'popular',
name: 'Popular'
}
].concat(categoryData)}, next);
},
function (data, next) {
next(null, data.routes);
} }
], function(err, categoryData) { ], callback);
if (err) {
return callback(err);
}
categoryData = categoryData || [];
plugins.fireHook('filter:homepage.get', {routes: [
{
route: 'categories',
name: 'Categories'
},
{
route: 'recent',
name: 'Recent'
},
{
route: 'popular',
name: 'Popular'
}
].concat(categoryData)}, function(err, data) {
if (err) {
return callback(err);
}
data.routes.push({
route: 'custom',
name: 'Custom'
});
callback(null, data.routes);
});
});
} }