Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 17:56:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove setTimeout hax in settingsv1 :squirrel:

Browse Source
This commit is contained in:
psychobunny
2015-07-20 17:16:30 -04:00
parent fdc66eb607
commit 0bc4799c3c
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/admin/admin.js
View File

@@ -20,7 +20,6 @@
selectMenuItem(data.url); selectMenuItem(data.url);
setupHeaderMenu(); setupHeaderMenu();
setupRestartLinks(); setupRestartLinks();
setupCheckboxes();
}); });
$(window).on('action:admin.settingsLoaded', setupCheckboxes); $(window).on('action:admin.settingsLoaded', setupCheckboxes);
@@ -43,6 +42,7 @@
// move this to admin.config // move this to admin.config
app.config = config; app.config = config;
$(window).trigger('action:config.loaded');
}); });
function setupMenu() { function setupMenu() {

10
public/src/admin/settings.js
View File

@@ -5,18 +5,10 @@ define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
var Settings = {}; var Settings = {};
Settings.init = function() { Settings.init = function() {
Settings.prepare(); $(window).on('action:config.loaded', Settings.prepare);
}; };
Settings.prepare = function(callback) { Settings.prepare = function(callback) {
// Come back in 125ms if the config isn't ready yet
if (!app.config) {
setTimeout(function() {
Settings.prepare(callback);
}, 125);
return;
}
// Populate the fields on the page from the config // Populate the fields on the page from the config
var fields = $('#content [data-field]'), var fields = $('#content [data-field]'),
numFields = fields.length, numFields = fields.length,