fixed positioning if no sidebar widget selected

v1.18.x
psychobunny 11 years ago
parent 260579b525
commit d1495102f2

@ -30,7 +30,16 @@
function renderWidgets(location) {
var area = $('#content [widget-area="' + location + '"]');
if (!area.length && window.location.pathname.indexOf('/admin') === -1) {
socket.emit('widgets.render', {template: tpl_url + '.tpl', url: url, location: location}, function(err, renderedWidgets) {
var html = '';
for (var widget in renderedWidgets) {
if (renderedWidgets.hasOwnProperty(widget)) {
html += templates.parse(renderedWidgets[widget].html, {});
}
}
if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) {
if (location === 'footer') {
$('#content').append($('<div class="col-xs-12"><div widget-area="footer"></div></div>'));
} else if (location === 'sidebar') {
@ -41,15 +50,6 @@
area = $('#content [widget-area="' + location + '"]');
}
socket.emit('widgets.render', {template: tpl_url + '.tpl', url: url, location: location}, function(err, renderedWidgets) {
var html = '';
for (var widget in renderedWidgets) {
if (renderedWidgets.hasOwnProperty(widget)) {
html += templates.parse(renderedWidgets[widget].html, {});
}
}
area.html(html).removeClass('hidden');
if (!renderedWidgets.length) {

Loading…
Cancel
Save