From ac857059fee85e2c162b9266c6d338173508bd39 Mon Sep 17 00:00:00 2001 From: Martin Heidegger Date: Mon, 22 Jan 2018 12:51:57 +0900 Subject: [PATCH 1/2] Stop using private createElement method and use render/element instead. --- elements/header.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elements/header.js b/elements/header.js index 63c6dd64..16404194 100644 --- a/elements/header.js +++ b/elements/header.js @@ -97,13 +97,13 @@ HeaderElement.prototype.createElement = function (props) { } function clickedOutside (e) { - if (!self.createElement(self.props).contains(e.target)) toggle(false) + if (!self.element.contains(e.target)) toggle(false) } return html`
- ${importButton.createElement({ + ${importButton.render({ onsubmit: onimport })} ${createButton} From 8573a4cb45cd0406a0bb96eb551e51918af9a993 Mon Sep 17 00:00:00 2001 From: Martin Heidegger Date: Mon, 22 Jan 2018 12:57:44 +0900 Subject: [PATCH 2/2] Using partials instead of parts by advice in https://github.com/datproject/dat-desktop/pull/450#discussion_r162816525 --- elements/table-row.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/elements/table-row.js b/elements/table-row.js index 88417d12..b0876a31 100644 --- a/elements/table-row.js +++ b/elements/table-row.js @@ -119,7 +119,7 @@ function Row () { if (!(this instanceof Row)) return new Row() Nanocomponent.call(this) - this.parts = { + this.partials = { hexContent: HexContent(), finderButton: FinderButton(), linkButton: LinkButton(), @@ -133,15 +133,15 @@ Row.prototype = Object.create(Nanocomponent.prototype) Row.prototype.createElement = function (props) { var { dat, emit, highlight } = props - var parts = this.parts - if (dat instanceof Error) return errorRow(dat, emit, parts.deleteButton) + var partials = this.partials + if (dat instanceof Error) return errorRow(dat, emit, partials.deleteButton) var key = encoding.encode(dat.key) var styles = cellStyles if (highlight) styles += ' fade-highlight' function onclick () { - if (!parts.titleField.state.isEditing) { + if (!partials.titleField.state.isEditing) { emit('dats:inspect', dat) } } @@ -150,12 +150,12 @@ Row.prototype.createElement = function (props) {
- ${parts.hexContent.render(props)} + ${partials.hexContent.render(props)}
- ${parts.titleField.render(props)} + ${partials.titleField.render(props)}

${dat.metadata.author || 'Anonymous'} • @@ -171,14 +171,14 @@ Row.prototype.createElement = function (props) { ${datSize(dat)} - ${parts.networkIcon.render(props)} + ${partials.networkIcon.render(props)} ${datPeers(dat)}

- ${parts.finderButton.render(props)} - ${parts.linkButton.render(props)} - ${parts.deleteButton.render(props)} + ${partials.finderButton.render(props)} + ${partials.linkButton.render(props)} + ${partials.deleteButton.render(props)}
@@ -186,7 +186,7 @@ Row.prototype.createElement = function (props) { } Row.prototype.update = function (props) { - return Object.values(this.parts).find(component => component.update(props, true)) !== undefined + return Object.values(this.partials).find(component => component.update(props, true)) !== undefined } function FinderButton () {