[web] (mostly) remove jQuery

2 files changed, 10 insertions, 5 deletions

diff --git a/web/src/js/components/ContentView/ContentLoader.jsx b/web/src/js/components/ContentView/ContentLoader.jsx
index f346dc01..1a23325c 100644
--- a/web/src/js/components/ContentView/ContentLoader.jsx
+++ b/web/src/js/components/ContentView/ContentLoader.jsx
@@ -1,5 +1,8 @@
 import React, { Component, PropTypes } from 'react'
 import { MessageUtils } from '../../flow/utils.js'
+// This is the only place where we use jQuery.
+// Remove when possible.
+import $ from "jquery"
 
 export default class ContentLoader extends Component {
 
@@ -18,7 +21,8 @@ export default class ContentLoader extends Component {
             this.state.request.abort()
         }
 
-        const request = MessageUtils.getContent(nextProps.flow, nextProps.message)
+        const requestUrl = MessageUtils.getContentURL(nextProps.flow, nextProps.message)
+        const request = $.get(requestUrl)
 
         this.setState({ content: null, request })
 
diff --git a/web/src/js/components/Header/FilterDocs.jsx b/web/src/js/components/Header/FilterDocs.jsx
index efb4818c..c237e230 100644
--- a/web/src/js/components/Header/FilterDocs.jsx
+++ b/web/src/js/components/Header/FilterDocs.jsx
@@ -1,5 +1,6 @@
 import React, { Component } from 'react'
-import $ from 'jquery'
+import { fetchApi } from "../../utils";
+
 
 export default class FilterDocs extends Component {
 
@@ -15,13 +16,13 @@ export default class FilterDocs extends Component {
 
     componentWillMount() {
         if (!FilterDocs.xhr) {
-            FilterDocs.xhr = $.getJSON('/filter-help')
-            FilterDocs.xhr.fail(() => {
+            FilterDocs.xhr = fetchApi('/filter-help').then(response => response.json())
+            FilterDocs.xhr.catch(() => {
                 FilterDocs.xhr = null
             })
         }
         if (!this.state.doc) {
-            FilterDocs.xhr.done(doc => {
+            FilterDocs.xhr.then(doc => {
                 FilterDocs.doc = doc
                 this.setState({ doc })
             })