diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-22 16:41:40 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-22 16:42:20 +0200 |
| commit | b4cc68a79d70fe8911073c608aa6767244fe28de (patch) | |
| tree | ca7e4df33c4e5404f18e0b664e28c7c8bc4e3375 /src/scaladoc | |
| parent | cd2bbaaf70d2f35e23c0bd5f5c84240fa1c22d3f (diff) | |
| parent | 03aaf05edda92344acc642fb9e58546a8a37d33c (diff) | |
| download | scala-b4cc68a79d70fe8911073c608aa6767244fe28de.tar.gz scala-b4cc68a79d70fe8911073c608aa6767244fe28de.tar.bz2 scala-b4cc68a79d70fe8911073c608aa6767244fe28de.zip | |
Merge commit '03aaf05' into merge-2.11-to-2.12-sep-22
Diffstat (limited to 'src/scaladoc')
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js index 3d9cf8d465..cf81f7fdf5 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js +++ b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/index.js @@ -412,7 +412,17 @@ function textFilter() { var query = $("#textfilter input").attr("value") || ''; var queryRegExp = compilePattern(query); - if ((typeof textFilter.lastQuery === "undefined") || (textFilter.lastQuery !== query)) { + // if we are filtering on types, then we have to display types + // ("display packages only" is not possible when filtering) + if (query !== "") { + kindFilter("all"); + } + + // Three things trigger a reload of the left pane list: + // typeof textFilter.lastQuery === "undefined" <-- first load, there is nothing yet in the left pane + // textFilter.lastQuery !== query <-- the filter text has changed + // focusFilterState != null <-- a package has been "focused" + if ((typeof textFilter.lastQuery === "undefined") || (textFilter.lastQuery !== query) || (focusFilterState != null)) { textFilter.lastQuery = query; |