Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTML: Fix search unnecessarily requiring source files #9129

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions CHANGES
@@ -1,3 +1,24 @@
Release 5.0.0 (in development)
==============================

Dependencies
------------

Incompatible changes
--------------------

Deprecated
----------

Features added
--------------

Bugs fixed
----------

Testing
--------

Release 4.1.0 (in development)
==============================

Expand Down
6 changes: 3 additions & 3 deletions sphinx/__init__.py
Expand Up @@ -27,8 +27,8 @@
warnings.filterwarnings('ignore', "'U' mode is deprecated",
DeprecationWarning, module='docutils.io')

__version__ = '4.1.0'
__released__ = '4.1.0' # used when Sphinx builds its own docs
__version__ = '5.0.0+'
__released__ = '5.0.0' # used when Sphinx builds its own docs

#: Version info for better programmatic use.
#:
Expand All @@ -38,7 +38,7 @@
#:
#: .. versionadded:: 1.2
#: Before version 1.2, check the string ``sphinx.__version__``.
version_info = (4, 1, 0, 'final', 0)
version_info = (5, 0, 0, 'final', 0)

package_dir = path.abspath(path.dirname(__file__))

Expand Down
8 changes: 1 addition & 7 deletions sphinx/themes/basic/static/searchtools.js
Expand Up @@ -276,7 +276,7 @@ var Search = {
setTimeout(function() {
displayNextItem();
}, 5);
} else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
} else {
$.ajax({url: requestUrl,
dataType: "text",
complete: function(jqxhr, textstatus) {
Expand All @@ -289,12 +289,6 @@ var Search = {
displayNextItem();
}, 5);
}});
} else {
// no source available, just display title
Search.output.append(listItem);
setTimeout(function() {
displayNextItem();
}, 5);
}
}
// search finished, update title and status message
Expand Down