From 62ffed8095f03e059e9b7c016ebcd79014a2ee23 Mon Sep 17 00:00:00 2001 From: Timothy Farrell Date: Fri, 29 Sep 2017 22:44:37 -0500 Subject: [PATCH] Remove unnecessary ThumbnailView.js --- packages/gallery/src/interface/image.js | 30 +++++++++++++-------- packages/gallery/src/interface/thumbnail.js | 23 ---------------- 2 files changed, 19 insertions(+), 34 deletions(-) delete mode 100644 packages/gallery/src/interface/thumbnail.js diff --git a/packages/gallery/src/interface/image.js b/packages/gallery/src/interface/image.js index 4bf84b2..ce244ce 100644 --- a/packages/gallery/src/interface/image.js +++ b/packages/gallery/src/interface/image.js @@ -1,5 +1,4 @@ import { defineView, defineElement as el } from 'domvm'; -import { ThumbnailView } from './thumbnail.js'; export function ImageView(vm, model) { const { addTag } = model; @@ -11,21 +10,30 @@ export function ImageView(vm, model) { return function(vm, model, key, opts) { const { imageRow, showTags, remove, addTag, removeTag } = model; const { doc } = imageRow; + const { _id: id, _rev: rev, tags } = doc; const { thumbnail } = doc._attachments; const _showTags = showTags !== undefined ? showTags : true; + const filteredTags = _showTags ? Object.entries(doc.tags).filter(([_, visible]) => visible) : []; if (thumbnail) { return el('div', [ - defineView(ThumbnailView, { - id: doc._id, - rev: doc._rev, - name: 'thumbnail', - doc: thumbnail, - tags: _showTags ? doc.tags : [], - remove: remove, - removeTag: removeTag - }), - addTag ? el('button', { onclick: [onAddTag, doc._id] }, '+') : null + el(`figure#${doc._id}.image`, [ + el('img', { + src: `data:${thumbnail.content_type};base64,${thumbnail.data}`, + title: `${id} ${name}`, + 'data-id': id, + onclick: [remove, id, rev] + }), + filteredTags.length + ? el( + 'figcaption', + filteredTags.map(([title, _]) => + el('span.tag', { onclick: [removeTag, title, id] }, [title]) + ) + ) + : null + ]), + addTag ? el('button', { onclick: [onAddTag, id] }, '+') : null ]); } diff --git a/packages/gallery/src/interface/thumbnail.js b/packages/gallery/src/interface/thumbnail.js deleted file mode 100644 index 9d95c0d..0000000 --- a/packages/gallery/src/interface/thumbnail.js +++ /dev/null @@ -1,23 +0,0 @@ -import { defineElement as el } from 'domvm'; - -export function ThumbnailView(vm, model) { - return function(vm, model, key, opts) { - const { id, rev, name, doc, tags, remove, removeTag } = model; - const filteredTags = Object.entries(tags).filter(([_, visible]) => visible); - - return el(`figure#${id}.image`, [ - el('img', { - src: `data:${doc.content_type};base64,${doc.data}`, - title: `${id} ${name}`, - 'data-id': id, - onclick: [remove, id, rev] - }), - filteredTags.length - ? el( - 'figcaption', - filteredTags.map(([title, _]) => el('span.tag', { onclick: [removeTag, title, id] }, [title])) - ) - : null - ]); - }; -}