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

refactored widgets api call to render all at once rather than one area at a time, closes https://github.com/NodeBB/NodeBB/issues/2062

Browse Source
This commit is contained in:
psychobunny
2014-09-16 10:12:12 -04:00
parent 0ecaa05c76
commit ecd00bb679
2 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
public/src/widgets.js
View File

@@ -30,21 +30,25 @@
ajaxify.widgets.reposition(); ajaxify.widgets.reposition();
} }
function renderWidgets(location) { function renderWidgets(locations) {
var area = $('#content [widget-area="' + location + '"]'), var areaDatas = [];
areaData = {
location: location, $.get(RELATIVE_PATH + '/api/widgets/render', {
locations: locations,
template: template + '.tpl', template: template + '.tpl',
url: url url: url
}; }, function(renderedAreas) {
for (var x=0; x<renderedAreas.length; ++x) {
$.get(RELATIVE_PATH + '/api/widgets/render', areaData, function(renderedWidgets) { var renderedWidgets = renderedAreas[x].widgets,
var html = ''; location = renderedAreas[x].location,
html = '';
for (var i=0; i<renderedWidgets.length; ++i) { for (var i=0; i<renderedWidgets.length; ++i) {
html += templates.parse(renderedWidgets[i].html, {}); html += templates.parse(renderedWidgets[i].html, {});
} }
var area = $('#content [widget-area="' + location + '"]');
if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) { if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) {
if (location === 'footer' && !$('#content [widget-area="footer"]').length) { if (location === 'footer' && !$('#content [widget-area="footer"]').length) {
$('#content').append($('<div class="col-xs-12"><div widget-area="footer"></div></div>')); $('#content').append($('<div class="col-xs-12"><div widget-area="footer"></div></div>'));
@@ -66,24 +70,16 @@
} }
$('#content [widget-area] img:not(.user-img)').addClass('img-responsive'); $('#content [widget-area] img:not(.user-img)').addClass('img-responsive');
checkCallback();
});
} }
function checkCallback() {
numLocations--;
if (numLocations < 0) {
$(window).trigger('action:widgets.loaded', {}); $(window).trigger('action:widgets.loaded', {});
if (typeof callback === 'function') { if (typeof callback === 'function') {
callback(); callback();
} }
} });
} }
for (var i=0; i<widgetLocations.length; ++i) { renderWidgets(widgetLocations);
renderWidgets(widgetLocations[i]);
}
checkCallback();
}; };
}(ajaxify || {})); }(ajaxify || {}));

29
src/controllers/api.js
View File

@@ -84,19 +84,34 @@ apiController.getConfig = function(req, res, next) {
apiController.renderWidgets = function(req, res, next) { apiController.renderWidgets = function(req, res, next) {
var uid = req.user ? req.user.uid : 0, var async = require('async'),
area = { uid = req.user ? req.user.uid : 0,
areas = {
template: req.query.template, template: req.query.template,
location: req.query.location, locations: req.query.locations,
url: req.query.url url: req.query.url
}; },
renderedWidgets = [];
if (!area.template || !area.location) { if (!areas.template || !areas.locations) {
return res.json(200, {}); return res.json(200, {});
} }
widgets.render(uid, area, function(err, data) { async.each(areas.locations, function(location, next) {
res.json(200, data); widgets.render(uid, {
template: areas.template,
url: areas.url,
location: location
}, function(err, widgets) {
renderedWidgets.push({
location: location,
widgets: widgets
});
next();
});
}, function(err) {
res.json(200, renderedWidgets);
}); });
}; };