From e91902401c27145152e51814f9d2b1abcae40cc8 Mon Sep 17 00:00:00 2001 From: Santos Gallegos Date: Tue, 21 Apr 2020 13:01:34 -0500 Subject: [PATCH 1/2] Use proxied api for search --- sphinx_search/static/js/rtd_sphinx_search.js | 2 +- sphinx_search/static/js/rtd_sphinx_search.min.js | 2 +- tests/test_ui.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sphinx_search/static/js/rtd_sphinx_search.js b/sphinx_search/static/js/rtd_sphinx_search.js index 308ee68..fcd96c3 100644 --- a/sphinx_search/static/js/rtd_sphinx_search.js +++ b/sphinx_search/static/js/rtd_sphinx_search.js @@ -640,7 +640,7 @@ window.addEventListener("DOMContentLoaded", evt => { const project = READTHEDOCS_DATA.project; const version = READTHEDOCS_DATA.version; const language = READTHEDOCS_DATA.language || "en"; - const api_host = READTHEDOCS_DATA.api_host; + const api_host = '/_'; let initialHtml = generateAndReturnInitialHtml(); document.body.innerHTML += initialHtml; diff --git a/sphinx_search/static/js/rtd_sphinx_search.min.js b/sphinx_search/static/js/rtd_sphinx_search.min.js index 498957e..c111d2d 100644 --- a/sphinx_search/static/js/rtd_sphinx_search.min.js +++ b/sphinx_search/static/js/rtd_sphinx_search.min.js @@ -1 +1 @@ -"use strict";var MAX_SUGGESTIONS=50,MAX_SECTION_RESULTS=3,MAX_SUBSTRING_LIMIT=100,SEARCH_MODAL_OPENED="opened",SEARCH_MODAL_CLOSED="closed",SEARCH_MODAL_STATE=SEARCH_MODAL_CLOSED,TOTAL_PAGE_RESULTS=0,SEARCH_QUERY="",COUNT=0,debounce=function(r,n){function e(){var e=this,t=arguments;clearTimeout(i),i=setTimeout(function(){return r.apply(e,t)},n)}var i;return e.cancel=function(){clearTimeout(i),i=null},e},convertObjToUrlParams=function(t){for(var e=Object.keys(t).map(function(e){if(_is_string(e))return e+"="+encodeURI(t[e])}),r=[],n=0;n
<%= section_subheading %> <% for (var i = 0; i < section_content.length; ++i) { %>

<%= section_content[i] %>

<% } %>

',{section_link:s,section_id:c,section_subheading:r,section_content:i})},getHighlightListData=function(e,t){return!!_is_array(e[t])&&e[t]},get_domain_html=function(e,t){var r="".concat(t,"#").concat(e._source.anchor),n=e._source.role_name,i=e._source.name,a=e._source.docstrings.substr(0,MAX_SUBSTRING_LIMIT)+" ...";if(void 0!==e.highlight&&null!==e.highlight){var o=e.highlight,s=getHighlightListData(o,"domains.name"),c=getHighlightListData(o,"domains.docstrings");s&&(i=s[0]),c&&(a=c[0])}var l=i,_=a,u="hit__"+COUNT;return n="["+n+"]",$u.template('
<%= domain_subheading %>
<%= domain_role_name %>

<%= domain_content %>
',{domain_link:r,domain_id:u,domain_content:_,domain_subheading:l,domain_role_name:n})},generateSingleResult=function(e,t){var r=createDomNode("div"),n="".concat(e.link).concat(DOCUMENTATION_OPTIONS.FILE_SUFFIX),i=e.title;void 0!==e.highlight&&null!==e.highlight&&void 0!==e.highlight.title&&null!==e.highlight.title&&(i=e.highlight.title),t!==e.project&&(i+=" "+$u.template(' (from project <%= project %>) ',{project:e.project})),i+="
",r.innerHTML+=$u.template('

<%= page_title %>

',{page_link:n,page_title:i});for(var a=0;aSearching ....",a.appendChild(t);var r=function(){$.ajax({url:e,crossDomain:!0,xhrFields:{withCredentials:!0},complete:function(e,t){if("success"===t||void 0!==e.responseJSON)if(0
\x3c!--?xml version="1.0" encoding="UTF-8"?--\x3e
Search by Read the Docs & readthedocs-sphinx-search
'},showSearchModal=function(t){removeResults(),SEARCH_MODAL_STATE=SEARCH_MODAL_OPENED,getInputField().blur(),$(".search__outer__wrapper").fadeIn(400,function(){var e=document.querySelector(".search__outer__input");null!==e&&(void 0!==t&&_is_string(t)?e.value=t:e.value="",e.focus())})},removeSearchModal=function(){removeResults(),SEARCH_MODAL_STATE=SEARCH_MODAL_CLOSED;var e=document.querySelector(".search__outer__input");null!==e&&(e.value="",e.blur()),SEARCH_QUERY="",updateUrl(),$(".search__outer__wrapper").fadeOut(400)};window.addEventListener("DOMContentLoaded",function(e){if(window.hasOwnProperty("READTHEDOCS_DATA")){var r=READTHEDOCS_DATA.project,n=READTHEDOCS_DATA.version,i=READTHEDOCS_DATA.language||"en",a=READTHEDOCS_DATA.api_host,t=generateAndReturnInitialHtml();document.body.innerHTML+=t;var o=document.querySelector(".search__outer__wrapper"),s=document.querySelector(".search__outer__input"),c=document.querySelector(".search__cross"),l=0,_=null,u=getInputField();u.addEventListener("focus",function(e){showSearchModal()}),s.addEventListener("input",function(e){SEARCH_QUERY=e.target.value,COUNT=0;var t=a+"/api/v2/docsearch/?"+convertObjToUrlParams({q:SEARCH_QUERY,project:r,version:n,language:i});"string"==typeof SEARCH_QUERY&&0
<%= section_subheading %> <% for (var i = 0; i < section_content.length; ++i) { %>

<%= section_content[i] %>

<% } %>

',{section_link:s,section_id:c,section_subheading:r,section_content:i})},getHighlightListData=function(e,t){return!!_is_array(e[t])&&e[t]},get_domain_html=function(e,t){var r="".concat(t,"#").concat(e._source.anchor),n=e._source.role_name,i=e._source.name,a=e._source.docstrings.substr(0,MAX_SUBSTRING_LIMIT)+" ...";if(void 0!==e.highlight&&null!==e.highlight){var o=e.highlight,s=getHighlightListData(o,"domains.name"),c=getHighlightListData(o,"domains.docstrings");s&&(i=s[0]),c&&(a=c[0])}var l=i,_=a,u="hit__"+COUNT;return n="["+n+"]",$u.template('
<%= domain_subheading %>
<%= domain_role_name %>

<%= domain_content %>
',{domain_link:r,domain_id:u,domain_content:_,domain_subheading:l,domain_role_name:n})},generateSingleResult=function(e,t){var r=createDomNode("div"),n="".concat(e.link).concat(DOCUMENTATION_OPTIONS.FILE_SUFFIX),i=e.title;void 0!==e.highlight&&null!==e.highlight&&void 0!==e.highlight.title&&null!==e.highlight.title&&(i=e.highlight.title),t!==e.project&&(i+=" "+$u.template(' (from project <%= project %>) ',{project:e.project})),i+="
",r.innerHTML+=$u.template('

<%= page_title %>

',{page_link:n,page_title:i});for(var a=0;aSearching ....",a.appendChild(t);var r=function(){$.ajax({url:e,crossDomain:!0,xhrFields:{withCredentials:!0},complete:function(e,t){if("success"===t||void 0!==e.responseJSON)if(0
\x3c!--?xml version="1.0" encoding="UTF-8"?--\x3e
Search by Read the Docs & readthedocs-sphinx-search
'},showSearchModal=function(t){removeResults(),SEARCH_MODAL_STATE=SEARCH_MODAL_OPENED,getInputField().blur(),$(".search__outer__wrapper").fadeIn(400,function(){var e=document.querySelector(".search__outer__input");null!==e&&(void 0!==t&&_is_string(t)?e.value=t:e.value="",e.focus())})},removeSearchModal=function(){removeResults(),SEARCH_MODAL_STATE=SEARCH_MODAL_CLOSED;var e=document.querySelector(".search__outer__input");null!==e&&(e.value="",e.blur()),SEARCH_QUERY="",updateUrl(),$(".search__outer__wrapper").fadeOut(400)};window.addEventListener("DOMContentLoaded",function(e){if(window.hasOwnProperty("READTHEDOCS_DATA")){var r=READTHEDOCS_DATA.project,n=READTHEDOCS_DATA.version,i=READTHEDOCS_DATA.language||"en",t=generateAndReturnInitialHtml();document.body.innerHTML+=t;var a=document.querySelector(".search__outer__wrapper"),o=document.querySelector(".search__outer__input"),s=document.querySelector(".search__cross"),c=0,l=null,_=getInputField();_.addEventListener("focus",function(e){showSearchModal()}),o.addEventListener("input",function(e){SEARCH_QUERY=e.target.value,COUNT=0;var t="/_/api/v2/docsearch/?"+convertObjToUrlParams({q:SEARCH_QUERY,project:r,version:n,language:i});"string"==typeof SEARCH_QUERY&&0 Date: Tue, 21 Apr 2020 13:18:44 -0500 Subject: [PATCH 2/2] Update chrome driver --- scripts/setup_chromedriver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup_chromedriver.sh b/scripts/setup_chromedriver.sh index c2ae4ca..29b5c64 100644 --- a/scripts/setup_chromedriver.sh +++ b/scripts/setup_chromedriver.sh @@ -1,4 +1,4 @@ -wget -N https://chromedriver.storage.googleapis.com/77.0.3865.40/chromedriver_linux64.zip -P ~/ +wget -N https://chromedriver.storage.googleapis.com/81.0.4044.69/chromedriver_linux64.zip -P ~/ unzip ~/chromedriver_linux64.zip -d ~/ rm ~/chromedriver_linux64.zip sudo mv -f ~/chromedriver /usr/local/bin/