From d1495102f2bd63a1932c89a919a58ab2153f8f3d Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 1 Apr 2014 11:22:03 -0400
Subject: [PATCH] fixed positioning if no sidebar widget selected
---
public/src/widgets.js | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/public/src/widgets.js b/public/src/widgets.js
index d16f0e27fd..00bad7ffe6 100644
--- a/public/src/widgets.js
+++ b/public/src/widgets.js
@@ -30,17 +30,6 @@
function renderWidgets(location) {
var area = $('#content [widget-area="' + location + '"]');
- if (!area.length && window.location.pathname.indexOf('/admin') === -1) {
- if (location === 'footer') {
- $('#content').append($('<div class="col-xs-12"><div widget-area="footer"></div></div>'));
- } else if (location === 'sidebar') {
- $('#content > *').wrapAll($('<div class="col-xs-9"></div>'));
- $('#content').append($('<div class="col-xs-3"><div widget-area="sidebar"></div></div>'));
- }
-
- area = $('#content [widget-area="' + location + '"]');
- }
-
socket.emit('widgets.render', {template: tpl_url + '.tpl', url: url, location: location}, function(err, renderedWidgets) {
var html = '';
@@ -50,6 +39,17 @@
}
}
+ 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') {
+ $('#content > *').wrapAll($('<div class="col-xs-9"></div>'));
+ $('#content').append($('<div class="col-xs-3"><div widget-area="sidebar"></div></div>'));
+ }
+
+ area = $('#content [widget-area="' + location + '"]');
+ }
+
area.html(html).removeClass('hidden');
if (!renderedWidgets.length) {