From 026989d5c51f0930d59e1e5bc8af023174e4d69c Mon Sep 17 00:00:00 2001
From: Qiming Teng <tengqim@cn.ibm.com>
Date: Sat, 18 Jul 2020 20:09:24 +0800
Subject: [PATCH] Fix language selector issue

The language selector is not working. We are getting ERR_CONNECTION_CLOSED
when fetching jquery-3.3.1.min.js from code.jquery.com. The failure of
jquery is breaking other scripts such as jquery-ui-1.12.1.min.js,
script.js, bootstrap.min.js etc.

This PR changes the head partial to use cached version of
jquery-3.3.1.min.js in hope we fix the language selector issue and
possibly other relate problems.
---
 layouts/partials/head.html                 | 4 ++--
 layouts/partials/navbar-lang-selector.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 88e11f262e..16fd6d321b 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -34,7 +34,7 @@
 {{ end }}
 {{ partialCached "head-css.html" . "asdf" }}
 <script
-  src="https://code.jquery.com/jquery-3.3.1.min.js"
+  src="{{ "js/jquery-3.3.1.min.js" | relURL }}"
   integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
   crossorigin="anonymous"></script>
 {{ if and (.Site.Params.offlineSearch) (not .Site.Params.gcs_engine_id) }}
@@ -84,4 +84,4 @@
 
 <script src="{{ "js/script.js" | relURL }}"></script>
 {{ with .Params.js }}{{ range (split . ",") }}<script src="{{ (trim . " ") | relURL }}"></script><!-- custom js added -->
-{{ end }}{{ else }}<!-- no custom js detected -->{{ end }}
\ No newline at end of file
+{{ end }}{{ else }}<!-- no custom js detected -->{{ end }}
diff --git a/layouts/partials/navbar-lang-selector.html b/layouts/partials/navbar-lang-selector.html
index 7459c621c3..6f8bfc42f4 100644
--- a/layouts/partials/navbar-lang-selector.html
+++ b/layouts/partials/navbar-lang-selector.html
@@ -1,10 +1,10 @@
 {{/* Link directly to documentation etc., if possible. */}}
 {{ $langPage := cond (gt (len .Translations) 0) . .Site.Home }}
-<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 	{{ $langPage.Language.LanguageName }}
 </a>
 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
 	{{ range $langPage.Translations }}
 	<a class="dropdown-item" href="{{ .RelPermalink }}">{{ .Language.LanguageName }}</a>
 	{{ end }}
-</div>
\ No newline at end of file
+</div>