From f717eb59774dc7c9810c6ca6a501b8d8a6cf508c Mon Sep 17 00:00:00 2001
From: Timothy Farrell <tim@thecookiejar.me>
Date: Mon, 27 Nov 2017 09:41:01 -0600
Subject: [PATCH] Standardize on some nomenclature

---
 packages/gallery/src/interface/album.js                   | 8 +++++---
 .../gallery/src/interface/components/attachmentImage.js   | 6 +++---
 packages/gallery/src/interface/components/dropzone.js     | 8 ++++----
 packages/gallery/src/interface/components/icon.js         | 8 ++++----
 packages/gallery/src/interface/gallery.js                 | 6 +++---
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/gallery/src/interface/album.js b/packages/gallery/src/interface/album.js
index 6bde725..cb7a456 100644
--- a/packages/gallery/src/interface/album.js
+++ b/packages/gallery/src/interface/album.js
@@ -6,7 +6,7 @@ import { pouchDocArrayHash, pouchDocHash } from '../utils/conversion.js';
 import { ThumbnailTemplate } from './thumbnail.js';
 import { prop, computed } from 'frptools';
 
-export function AlbumView(vm, doc) {
+export function AlbumView(vm, params) {
 	const model = prop({}, pouchDocHash);
 	const images = prop([], pouchDocArrayHash);
 
@@ -57,9 +57,11 @@ export function AlbumView(vm, doc) {
 		subscriptions.forEach(s => s());
 	}
 
-	model(doc);
+	model(params);
+
+	return function() {
+		const album = model();
 
-	return function(vm, album, key, opts) {
 		return el('.album', [
 			el('h2', title),
 			el('button', { onclick: [removeAlbum, album] }, 'X'),
diff --git a/packages/gallery/src/interface/components/attachmentImage.js b/packages/gallery/src/interface/components/attachmentImage.js
index fd20433..2fc8d22 100644
--- a/packages/gallery/src/interface/components/attachmentImage.js
+++ b/packages/gallery/src/interface/components/attachmentImage.js
@@ -5,8 +5,8 @@ import { ImageType } from '../../data/image.js';
 import { FileType } from '../../data/file.js';
 import { pouchDocHash } from '../../utils/conversion.js';
 
-export function AttachmentImageView(vm, image) {
-	const model = prop(image, pouchDocHash);
+export function AttachmentImageView(vm, params) {
+	const model = prop(params, pouchDocHash);
 	const id = computed(pouchDocHash, [model]);
 	const sizes = computed(d => d.sizes, [model]); // always update
 
@@ -45,7 +45,7 @@ export function AttachmentImageView(vm, image) {
 		URL.revokeObjectURL(blobURL());
 	}
 
-	return function render(vm, doc) {
+	return function render() {
 		return el('img', {
 			src: imageURL,
 			onerror: loadImageFromBlob,
diff --git a/packages/gallery/src/interface/components/dropzone.js b/packages/gallery/src/interface/components/dropzone.js
index 4d52763..87c4f3a 100644
--- a/packages/gallery/src/interface/components/dropzone.js
+++ b/packages/gallery/src/interface/components/dropzone.js
@@ -15,8 +15,8 @@ const CSS_DROPZONE_ACTIVE = {
 	backgroundColor: '#eee'
 };
 
-export function Dropzone(vm, model) {
-	const { ondrop, ondragenter, ondragleave, className, activeClassName, children } = model;
+export function Dropzone(vm, params) {
+	const { ondrop, ondragenter, ondragleave, className, activeClassName, content } = params;
 
 	const baseClassName = className || injectStyle(CSS_DROPZONE);
 	const hoverClassName = `${baseClassName} ${activeClassName || injectStyle(CSS_DROPZONE_ACTIVE)}`;
@@ -54,7 +54,7 @@ export function Dropzone(vm, model) {
 		}
 	}
 
-	return function render(vm, model) {
+	return function render() {
 		return el(
 			'div',
 			{
@@ -64,7 +64,7 @@ export function Dropzone(vm, model) {
 				ondragleave: onDragLeave,
 				ondrop: onDrop
 			},
-			children()
+			content()
 		);
 	};
 }
diff --git a/packages/gallery/src/interface/components/icon.js b/packages/gallery/src/interface/components/icon.js
index 4b402db..086d8e4 100644
--- a/packages/gallery/src/interface/components/icon.js
+++ b/packages/gallery/src/interface/components/icon.js
@@ -37,9 +37,9 @@ const ICON_PATHS = {
 
 // const sizeBasis = 24;
 
-export function Icon(props) {
-	const { name, size } = props;
-	const otherProps = Object.assign({}, props);
+export function Icon(params) {
+	const { name, size } = params;
+	const attrs = Object.assign({}, params);
 	const _size = (size || 1) + 1;
 	const [boxBounds, path] = ICON_PATHS[name] || ICON_PATHS.unknown;
 
@@ -54,7 +54,7 @@ export function Icon(props) {
 				width: `${_size}em`,
 				height: `${_size}em`
 			},
-			otherProps
+			attrs
 		),
 		[sv('svg', { viewBox: `0 0 ${boxBounds}` }, [sv('path', { d: path })])]
 	);
diff --git a/packages/gallery/src/interface/gallery.js b/packages/gallery/src/interface/gallery.js
index 54542c0..bbcf466 100644
--- a/packages/gallery/src/interface/gallery.js
+++ b/packages/gallery/src/interface/gallery.js
@@ -9,7 +9,7 @@ import { Dropzone } from './components/dropzone.js';
 import { router, routeChanged } from '../services/router.js';
 import { injectStyle, styled } from '../services/style.js';
 
-export function GalleryView(vm, model) {
+export function GalleryView(vm) {
 	const NAV_OPTIONS = {
 		images: {
 			data: ImageType.find(
@@ -79,7 +79,7 @@ export function GalleryView(vm, model) {
 		];
 	}
 
-	return function render(vm, params, key, opts) {
+	return function render() {
 		if (!data || !data.ready()) {
 			return el('h1', 'Loading...');
 		}
@@ -103,7 +103,7 @@ export function GalleryView(vm, model) {
 					type: 'file',
 					multiple: true, // FIXME - these don't carry through to the input tag
 					accept: 'image/jpeg',
-					children: renderDropzone
+					content: renderDropzone
 				},
 				'dz'
 			)