Github user benkeen commented on a diff in the pull request:
https://github.com/apache/couchdb-fauxton/pull/670#discussion_r60449023
--- Diff: app/addons/documents/doc-editor/components.react.jsx ---
@@ -135,7 +150,14 @@ define([
<div>
<AttachmentsPanelButton doc={this.state.doc}
isLoading={this.state.isLoading} />
<div
className="doc-editor-extension-icons">{this.getExtensionIcons()}</div>
- <PanelButton title="Upload Attachment"
iconClass="icon-circle-arrow-up" onClick={Actions.showUploadModal} />
+
+ {this.state.conflictCount ? <PanelButton
+ title={`Conflicts (${this.state.conflictCount})`}
--- End diff --
Nice! I didn't know about the backticks, that's brilliant.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
