Update deps: jquery, lodash, qrcode, modulejs. Minor fixes.

This commit is contained in:
Lars Jung 2016-05-27 17:56:32 +02:00
parent 641d9b3cfa
commit 57b3ee6c2f
18 changed files with 64 additions and 56 deletions

View file

@ -28,7 +28,7 @@ modulejs.define('ext/google-analytics-ua', ['_', 'core/event', 'core/settings'],
var loc = WIN.location;
WIN[GA]('send', 'pageview', {
location: loc.protocol + '//' + loc.host + item.absHref,
title: _.pluck(item.getCrumb(), 'label').join(' > ')
title: _.map(item.getCrumb(), 'label').join(' > ')
});
});
}

View file

@ -14,11 +14,11 @@ modulejs.define('ext/thumbnails', ['_', 'core/event', 'core/server', 'core/setti
function queueItem(queue, item) {
var type = null;
if (_.contains(settings.img, item.type)) {
if (_.includes(settings.img, item.type)) {
type = 'img';
} else if (_.contains(settings.mov, item.type)) {
} else if (_.includes(settings.mov, item.type)) {
type = 'mov';
} else if (_.contains(settings.doc, item.type)) {
} else if (_.includes(settings.doc, item.type)) {
type = 'doc';
} else {
return;

View file

@ -4,7 +4,7 @@ modulejs.define('ext/title', ['_', 'core/event', 'core/settings'], function (_,
}, allsettings.title);
function onLocationChanged(item) {
var labels = _.pluck(item.getCrumb(), 'label');
var labels = _.map(item.getCrumb(), 'label');
var title = labels.join(' > ');
if (labels.length > 1) {