Merge pull request #6804 from readthedocs/fix-search-sphinx-2.1

Make search compatible with sphinx 2.2.1

Author: ericholscher

readthedocs/core/static-src/core/js/doc-embed/search.js

@@ -77,7 +77,13 @@ function attach_elastic_search_query(data) {
                         }
 
                         // Creating the result from elements
-                        var link = doc.link + DOCUMENTATION_OPTIONS.FILE_SUFFIX;
+                        var suffix = DOCUMENTATION_OPTIONS.FILE_SUFFIX;
+                        // Since sphinx 2.2.1 FILE_SUFFIX is .html for all builders,
+                        // and there is a new BUILDER option.
+                        if ('BUILDER' in DOCUMENTATION_OPTIONS && DOCUMENTATION_OPTIONS.BUILDER === 'readthedocsdirhtml') {
+                          suffix = '';
+                        }
+                        var link = doc.link + suffix;
 
                         var item = $('<a>', {'href': link});