Syntax adjustment for contextMenu.js

This commit is contained in:
Tobias Reich 2016-07-31 16:12:14 +02:00
parent 2b698ca024
commit 066fc90056

View File

@ -3,7 +3,8 @@
* @copyright 2015 by Tobias Reich * @copyright 2015 by Tobias Reich
*/ */
function buildAlbumList(albums, exclude, action, parent = 0, layer = 0) { const buildAlbumList = function(albums, exclude, action, parent = 0, layer = 0) {
let items = [] let items = []
for (i in albums) { for (i in albums) {
@ -17,8 +18,13 @@ function buildAlbumList(albums, exclude, action, parent = 0, layer = 0) {
if (album.title==='') album.title = 'Untitled' if (album.title==='') album.title = 'Untitled'
let prefix = layer > 0 ? "  ".repeat(layer - 1) + "└ " : "" let prefix = (layer > 0 ? '  '.repeat(layer - 1) + '└ ' : '')
let html = prefix + lychee.html`<img class='cover' width='16' height='16' src='$${ thumb }'><div class='title'>$${ album.title }</div>`
let html = lychee.html`
${ prefix }
<img class='cover' width='16' height='16' src='$${ thumb }'>
<div class='title'>$${ album.title }</div>
`
items.push({ items.push({
title: html, title: html,
@ -32,6 +38,37 @@ function buildAlbumList(albums, exclude, action, parent = 0, layer = 0) {
} }
return items return items
}
const getAlbumFrom = function(albums, id) {
for (a in albums) {
if (albums[a].id == id) return albums[a]
}
return null
}
const countSubAlbums = function(photoIDs) {
let count = 0
if (album.subjson) {
for (i in photoIDs) {
for (j in album.subjson.albums) {
if (album.subjson.albums[j].id == photoIDs[i]) {
count++
break
}
}
}
}
return count
} }
contextMenu = {} contextMenu = {}
@ -141,14 +178,6 @@ contextMenu.albumTitle = function(albumID, e) {
} }
function getAlbumFrom(albums, id) {
for (a in albums) {
if (albums[a].id == id)
return albums[a]
}
return null
}
contextMenu.mergeAlbum = function(albumID, e) { contextMenu.mergeAlbum = function(albumID, e) {
api.post('Albums::get', { parent: -1 }, function(data) { api.post('Albums::get', { parent: -1 }, function(data) {
@ -160,7 +189,8 @@ contextMenu.mergeAlbum = function(albumID, e) {
let selalbum = albums.getByID(albumID) let selalbum = albums.getByID(albumID)
let title = selalbum.title let title = selalbum.title
// disable all parents; we cannot move them into us // Disable all parents
// It's not possible to move them into us
let exclude = [ albumID ] let exclude = [ albumID ]
let a = getAlbumFrom(data.albums, selalbum.parent) let a = getAlbumFrom(data.albums, selalbum.parent)
while (a != null) { while (a != null) {
@ -202,21 +232,6 @@ contextMenu.photo = function(photoID, e) {
} }
function countSubAlbums(photoIDs) {
let count = 0
if (album.subjson) {
for (i in photoIDs) {
for (j in album.subjson.albums) {
if (album.subjson.albums[j].id == photoIDs[i]) {
count++
break
}
}
}
}
return count
}
contextMenu.photoMulti = function(photoIDs, e) { contextMenu.photoMulti = function(photoIDs, e) {
let subcount = countSubAlbums(photoIDs) let subcount = countSubAlbums(photoIDs)