From d841616d0a1d4d4aec31beccd0356c13d4343f4b Mon Sep 17 00:00:00 2001
From: Thibaud Colas <thibaudcolas@gmail.com>
Date: Wed, 17 Jan 2018 11:09:18 +0200
Subject: [PATCH] Use new onClose prop to close sources when no result was
 selected

---
 .../src/components/Draftail/sources/DocumentSource.js  | 10 ----------
 client/src/components/Draftail/sources/ModalSource.js  |  5 +++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/client/src/components/Draftail/sources/DocumentSource.js b/client/src/components/Draftail/sources/DocumentSource.js
index 851e2bcbc..b23a82ab3 100644
--- a/client/src/components/Draftail/sources/DocumentSource.js
+++ b/client/src/components/Draftail/sources/DocumentSource.js
@@ -16,21 +16,11 @@ class DocumentSource extends ModalSource {
   }
 
   componentDidMount() {
-    const { entity } = this.props;
     const documentChooser = global.chooserUrls.documentChooser;
     const url = documentChooser;
 
     $(document.body).on('hidden.bs.modal', this.onClose);
 
-    // TODO: wagtail should support passing params to this endpoint.
-    if (entity) {
-      // const entityData = entity.getData();
-      // console.log(entityData);
-      // if (entityData.title) {
-      //   url = url + `?q=${entityData.title}`
-      // }
-    }
-
     // eslint-disable-next-line new-cap
     window.ModalWorkflow({
       url,
diff --git a/client/src/components/Draftail/sources/ModalSource.js b/client/src/components/Draftail/sources/ModalSource.js
index ea9f453f8..c68ecf39b 100644
--- a/client/src/components/Draftail/sources/ModalSource.js
+++ b/client/src/components/Draftail/sources/ModalSource.js
@@ -46,10 +46,10 @@ class ModalSource extends React.Component {
   }
 
   onClose(e) {
-    const { onComplete } = this.props;
+    const { onClose } = this.props;
     e.preventDefault();
 
-    onComplete();
+    onClose();
   }
 
   render() {
@@ -63,6 +63,7 @@ ModalSource.propTypes = {
   // eslint-disable-next-line
   entity: PropTypes.object,
   onComplete: PropTypes.func.isRequired,
+  onClose: PropTypes.func.isRequired,
 };
 
 ModalSource.defaultProps = {