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

closed #159 - issue where theme listing would hang if a theme folder did

Browse Source 
not contain theme.json

Also refactored theme socket event a bit
This commit is contained in:
Julian Lam
2013-08-11 13:09:27 -04:00
parent 27f874759e
commit 272806a25d
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/forum/admin/themes.js
View File

@@ -39,7 +39,7 @@ var nodebb_admin = (function(nodebb_admin) {
(function() { (function() {
var scriptEl = document.createElement('script'); var scriptEl = document.createElement('script');
scriptEl.src = 'http://api.bootswatch.com?callback=nodebb_admin.themes.render'; scriptEl.src = 'http://api.bootswatch.com/2/?callback=nodebb_admin.themes.render';
document.body.appendChild(scriptEl); document.body.appendChild(scriptEl);
var bootstrapThemeContainer = document.querySelector('#bootstrap_themes'), var bootstrapThemeContainer = document.querySelector('#bootstrap_themes'),
@@ -81,7 +81,7 @@ var nodebb_admin = (function(nodebb_admin) {
}, false); }, false);
// Installed Themes // Installed Themes
socket.once('api:admin:themes.getInstalled', function(themes) { socket.emit('api:admin.themes.getInstalled', function(themes) {
var instListEl = document.getElementById('installed_themes'), var instListEl = document.getElementById('installed_themes'),
themeFrag = document.createDocumentFragment(), themeFrag = document.createDocumentFragment(),
liEl = document.createElement('li'); liEl = document.createElement('li');
@@ -108,5 +108,4 @@ var nodebb_admin = (function(nodebb_admin) {
instListEl.innerHTML = ''; instListEl.innerHTML = '';
instListEl.appendChild(themeFrag); instListEl.appendChild(themeFrag);
}); });
socket.emit('api:admin:themes.getInstalled');
})(); })();

5
src/meta.js
View File

@@ -49,7 +49,7 @@ var utils = require('./../public/src/utils.js'),
themeArr.push(conf); themeArr.push(conf);
next(); next();
}); });
} } else next();
}); });
} else next(); } else next();
}); });
@@ -57,9 +57,6 @@ var utils = require('./../public/src/utils.js'),
callback(err, themeArr); callback(err, themeArr);
}); });
}); });
},
saveViaGithub: function(repo_url, callback) {
// ...
} }
} }

4
src/websockets.js
View File

@@ -701,9 +701,9 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.emit('api:admin.user.search', null); socket.emit('api:admin.user.search', null);
}); });
socket.on('api:admin:themes.getInstalled', function() { socket.on('api:admin.themes.getInstalled', function(callback) {
meta.themes.get(function(err, themeArr) { meta.themes.get(function(err, themeArr) {
socket.emit('api:admin:themes.getInstalled', themeArr); callback(themeArr);
}); });
}); });