v1.18.x
barisusakli
parent 78509b4ad0
commit ab6429c578

@ -31,24 +31,16 @@
} }
function renderWidgets(location) { function renderWidgets(location) {
// remove when https://code.google.com/p/chromium/issues/detail?id=357625 is fixed var area = $('#content [widget-area="' + location + '"]');
try {
var temp = localStorage.getItem('cache:widgets:' + url + ':' + location);
} catch (e) {
var temp = null;
}
var area = $('#content [widget-area="' + location + '"]')
.html(temp);
socket.emit('widgets.render', {template: tpl_url + '.tpl', url: url, location: location}, function(err, renderedWidgets) { socket.emit('widgets.render', {template: tpl_url + '.tpl', url: url, location: location}, function(err, renderedWidgets) {
if (err) {
return;
}
var html = ''; var html = '';
for (var widget in renderedWidgets) { for (var i=0; i<renderedWidgets.length; ++i) {
if (renderedWidgets.hasOwnProperty(widget)) { html += templates.parse(renderedWidgets[i].html, {});
html += templates.parse(renderedWidgets[widget].html, {});
}
} }
if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) { if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) {
@ -65,10 +57,6 @@
} }
area.html(html); area.html(html);
// remove when https://code.google.com/p/chromium/issues/detail?id=357625 is fixed
try {
localStorage.setItem('cache:widgets:' + url + ':' + location, html);
} catch (e) {}
if (!renderedWidgets.length) { if (!renderedWidgets.length) {
area.addClass('hidden'); area.addClass('hidden');
@ -90,10 +78,8 @@
} }
} }
for (var i in widgetLocations) { for (var i=0; i<widgetLocations.length; ++i) {
if (widgetLocations.hasOwnProperty(i)) { renderWidgets(widgetLocations[i]);
renderWidgets(widgetLocations[i]);
}
} }
checkCallback(); checkCallback();

@ -25,23 +25,23 @@ function deleteTempFiles(files) {
function upload(req, res, filesIterator, next) { function upload(req, res, filesIterator, next) {
var files = req.files.files; var files = req.files.files;
if(!req.user) { if (!req.user) {
deleteTempFiles(files); deleteTempFiles(files);
return res.json(403, {message:'not allowed'}); return res.json(403, 'not allowed');
} }
if(!Array.isArray(files)) { if (!Array.isArray(files)) {
return res.json(500, {message: 'invalid files'}); return res.json(500, 'invalid files');
} }
if(Array.isArray(files[0])) { if (Array.isArray(files[0])) {
files = files[0]; files = files[0];
} }
async.map(files, filesIterator, function(err, images) { async.map(files, filesIterator, function(err, images) {
deleteTempFiles(files); deleteTempFiles(files);
if(err) { if (err) {
return res.send(500, err.message); return res.send(500, err.message);
} }

Loading…
Cancel
Save