This is an automated email from the ASF dual-hosted git repository.
amaranhao pushed a commit to branch upgrade-to-eslint-v4
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git
commit 0f2e7acc05b42ac727059e85dfe7e14f04bb7313
Author: Antonio Maranhao <antonio@Antonios-MacBook-Pro.local>
AuthorDate: Wed Jan 3 12:19:00 2018 -0500
More lint fixes after rebasing
---
app/addons/documents/rev-browser/actions.js | 52 +++++++++++-----------
.../rev-browser/components/confirmmodal.js | 2 +-
.../rev-browser/components/splitscreenarea.js | 8 ++--
app/addons/documents/rev-browser/container.js | 1 -
4 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/app/addons/documents/rev-browser/actions.js
b/app/addons/documents/rev-browser/actions.js
index 9d24c02..7e9fcee 100644
--- a/app/addons/documents/rev-browser/actions.js
+++ b/app/addons/documents/rev-browser/actions.js
@@ -28,19 +28,19 @@ export const initDiffEditor = (dbName, docId) => dispatch
=> {
// XXX: we need spec compliant promise support and get rid of jQ "deferreds"
Promise.all([db.get(docId), getTree(db, docId)])
- .then(([doc, tree]) => {
- const conflictingRevs = getConflictingRevs(tree.paths, tree.winner,
Object.keys(tree.deleted));
- const initialRev = conflictingRevs[0];
-
- if (!initialRev) {
- return dispatch(treeLoaded(tree, doc, conflictingRevs, null, dbName));
- }
-
- db.get(doc._id, {rev: initialRev})
- .then((conflictDoc) => {
- dispatch(treeLoaded(tree, doc, conflictingRevs, conflictDoc, dbName));
- });
- });
+ .then(([doc, tree]) => {
+ const conflictingRevs = getConflictingRevs(tree.paths, tree.winner,
Object.keys(tree.deleted));
+ const initialRev = conflictingRevs[0];
+
+ if (!initialRev) {
+ return dispatch(treeLoaded(tree, doc, conflictingRevs, null, dbName));
+ }
+
+ db.get(doc._id, {rev: initialRev})
+ .then((conflictDoc) => {
+ dispatch(treeLoaded(tree, doc, conflictingRevs, conflictDoc,
dbName));
+ });
+ });
};
function getConflictingRevs (paths, winner, deleted) {
@@ -111,22 +111,22 @@ export const selectRevAsWinner = (databaseName, docId,
paths, revToWin) => dispa
const payload = buildBulkDeletePayload(docId, revsToDelete);
post(FauxtonAPI.urls('bulk_docs', 'server', databaseName, ''), payload)
- .then((resp) => {
- if (resp.error) {
- return FauxtonAPI.addNotification({
- msg: 'Failed to delete clean up conflicts!',
- type: 'error',
+ .then((resp) => {
+ if (resp.error) {
+ return FauxtonAPI.addNotification({
+ msg: 'Failed to delete clean up conflicts!',
+ type: 'error',
+ clear: true
+ });
+ }
+
+ FauxtonAPI.addNotification({
+ msg: 'Conflicts successfully solved.',
clear: true
});
- }
-
- FauxtonAPI.addNotification({
- msg: 'Conflicts successfully solved.',
- clear: true
+ dispatch(toggleConfirmModal(false, null));
+ FauxtonAPI.navigate(FauxtonAPI.urls('allDocs', 'app', databaseName, ''));
});
- dispatch(toggleConfirmModal(false, null));
- FauxtonAPI.navigate(FauxtonAPI.urls('allDocs', 'app', databaseName, ''));
- });
};
function buildBulkDeletePayload (docId, revs) {
diff --git a/app/addons/documents/rev-browser/components/confirmmodal.js
b/app/addons/documents/rev-browser/components/confirmmodal.js
index 77fc8a7..16e6796 100644
--- a/app/addons/documents/rev-browser/components/confirmmodal.js
+++ b/app/addons/documents/rev-browser/components/confirmmodal.js
@@ -48,7 +48,7 @@ export default class ConfirmModal extends React.Component {
</Modal.Header>
<Modal.Body>
<p>
- <i className="icon-warning-sign"></i> Do you want to delete all
conflicting revisions for this document?
+ <i className="icon-warning-sign"></i> Do you want to delete all
conflicting revisions for this document?
</p>
diff --git a/app/addons/documents/rev-browser/components/splitscreenarea.js
b/app/addons/documents/rev-browser/components/splitscreenarea.js
index 49aa300..b848d66 100644
--- a/app/addons/documents/rev-browser/components/splitscreenarea.js
+++ b/app/addons/documents/rev-browser/components/splitscreenarea.js
@@ -41,8 +41,8 @@ export default class SplitScreenArea extends React.Component {
const format = (input) => { return JSON.stringify(input, null, ' '); };
const jsmode = new JavaScriptMode();
- const left = ReactDOM.findDOMNode(this.refs.revLeftOurs);
- const right = ReactDOM.findDOMNode(this.refs.revRightTheirs);
+ const left = this.revLeftOurs;
+ const right = this.revRightTheirs;
const leftRes = highlight.render(format(this.props.ours), jsmode, theme,
0, true);
left.innerHTML = leftRes.html;
@@ -61,12 +61,12 @@ export default class SplitScreenArea extends
React.Component {
<div className="revision-split-area">
<div data-id="ours" style={{width: '50%'}}>
<div style={{marginBottom: '20px'}}>{ours._rev} (Server-Selected
Rev)</div>
- <pre ref="revLeftOurs"></pre>
+ <pre ref={node => this.revLeftOurs = node}></pre>
</div>
<div data-id="theirs" style={{width: '50%'}}>
<div style={{marginBottom: '20px'}}>{theirs._rev}</div>
- <pre ref="revRightTheirs"></pre>
+ <pre ref={node => this.revRightTheirs = node}></pre>
</div>
</div>
);
diff --git a/app/addons/documents/rev-browser/container.js
b/app/addons/documents/rev-browser/container.js
index 345b05d..d0ea5c6 100644
--- a/app/addons/documents/rev-browser/container.js
+++ b/app/addons/documents/rev-browser/container.js
@@ -37,7 +37,6 @@ import {
const mapStateToProps = ({revisionBrowser}, ownProps) => {
return {
- databaseName: ownProps.databaseName,
docId: ownProps.docId,
tree: getTree(revisionBrowser),
doc: getDoc(revisionBrowser),
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <commits@couchdb.apache.org>.
