Merge branch 'main' into Language-tabs-should-be-URL-aware

10xtechie · Jul 12, 2022 · 8c506ff · 8c506ff
2 parents 1eff72b + dc0abbd
commit 8c506ff
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 29 deletions.
diff --git a/content/docs/tools/general.md b/content/docs/tools/general.md
@@ -41,6 +41,7 @@ See the [Cucumber extension](https://extensions.panic.com/extensions/com.rpowell
 * [Java IDEs](/docs/tools/java#ides)
 * [Ruby IDEs](/docs/tools/ruby#ides)
 * [CukeTest](http://cuketest.com) is a Gherkin editor and Cucumber.js development tool.
+* [testjam.io](https://testjam.io) is an online IDE for running and sharing Cucumber.js snippets.
 
 # Build Tools
 You can run Cucumber using build tools, rather than from the command line.

diff --git a/layouts/shortcodes/gherkin-i18n-table.html b/layouts/shortcodes/gherkin-i18n-table.html
@@ -632,7 +632,7 @@
        </tr>
        <tr>
          <td><code>rule</code></th>
-         <td><code>Rule</code><br></td>
+         <td><code>Rule</code><br><code>规则</code><br></td>
        </tr>
      </tbody>
    </table>

diff --git a/themes/cucumber-sb/static/js/site.js b/themes/cucumber-sb/static/js/site.js
@@ -127,31 +127,31 @@ function showDefaultLang(){
 }
 // Activate
 
-var supportedLanguages = [
-  "java",
-  "javascript",
-  "ruby",
-  "kotlin",
-  "scala"
-]
-
-var defaultLanguage = 'java'
-
 ready(function() {
-  var selectedLang = getLangFromUrl();
-  if((selectedLang == '' || !supportedLanguages.includes(selectedLang))){
-    showDefaultLang()
-    }else{
-      showOnly(selectedLang)
+  const supportedLanguages = [...document.querySelectorAll('.tabs li')].map((li) => li.getAttribute('data-language'))
+
+  if (supportedLanguages.length >= 1) {
+    const defaultLanguage = supportedLanguages[0]
+    const localLanguage = localStorage.getItem('language');
+    const selectedLanguage = getLangFromUrl();
+
+    if (supportedLanguages.includes(selectedLanguage)) {
+      showOnly(selectedLanguage)
+    } else if (supportedLanguages.includes(localLanguage)) {
+      showOnly(localLanguage)
+    } else {
+      showOnly(defaultLanguage)
+    }
+
+    each(document, '.tabs li', function(li) {
+      var language = li.getAttribute('data-language')
+      li.addEventListener('click', function () {
+        window.location.search = updateQueryParam(language);
+        showOnly(language)
+      })
+    })
   }
 
-  each(document, '.tabs li', function(li) {
-    var language = li.getAttribute('data-language')
-    li.addEventListener('click', function () {
-      window.location.search = updateQueryParam(language);
-      showOnly(language)
-    })
-  })
 
   each(document, '.panel.collapsible > a', function(a) {
     var targetSelector = a.getAttribute('data-target');
@@ -161,12 +161,6 @@ ready(function() {
     })
   })
 
-  var firstLi = document.querySelector('.tabs li')
-  if(firstLi) {
-    var language = localStorage.getItem('language') || firstLi.getAttribute('data-language')
-    showOnly(language)
-  }
-
   // Toggle navbar menu
   var burger = document.querySelector('.navbar-burger')
   if(burger) {