From 015c55f144b4e10bcc6cdfff820f64de614bdf61 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 13 May 2021 12:46:10 +0800
Subject: [PATCH] ui: fix highlighter

---
 packages/ui-default/package.json                   | 2 +-
 packages/ui-default/pages/home_preference.page.jsx | 7 +++++--
 packages/ui-default/pages/problem_submit.page.js   | 7 +++++--
 packages/ui-default/templates/record_detail.html   | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 4efa3272b..1e2f9c6a3 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.8.12",
+  "version": "4.8.13",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/pages/home_preference.page.jsx b/packages/ui-default/pages/home_preference.page.jsx
index 76275de03..4bd703e7a 100644
--- a/packages/ui-default/pages/home_preference.page.jsx
+++ b/packages/ui-default/pages/home_preference.page.jsx
@@ -95,7 +95,6 @@ const page = new NamedPage('home_preference', async () => {
       .after($el);
 
     $('#codelang-main-select').on('change', function () {
-      $('[name="codeLang"]').val(this.value);
       const options = {};
       for (const key in window.LANGS) {
         if (key.startsWith(`${this.value}.`) && key !== this.value) options[key] = window.LANGS[key].display;
@@ -103,7 +102,11 @@ const page = new NamedPage('home_preference', async () => {
       if (Object.keys(options).length > 1) {
         setOptions($('#codelang-sub-select'), options);
         $('#codelang-sub-container').show();
-      } else $('#codelang-sub-container').hide();
+        $('[name="codeLang"]').val($('#codelang-sub-container').val());
+      } else {
+        $('#codelang-sub-container').hide();
+        $('[name="codeLang"]').val(this.value);
+      }
     });
     $('#codelang-sub-select').on('change', function () {
       $('[name="codeLang"]').val(this.value);
diff --git a/packages/ui-default/pages/problem_submit.page.js b/packages/ui-default/pages/problem_submit.page.js
index 84bea15a0..8c907d8f3 100644
--- a/packages/ui-default/pages/problem_submit.page.js
+++ b/packages/ui-default/pages/problem_submit.page.js
@@ -13,7 +13,6 @@ const page = new NamedPage(['problem_submit', 'contest_detail_problem_submit'],
     $('[name="problem-sidebar__categories"]').show();
   });
   $('#codelang-main-select').on('change', function () {
-    $('[name="lang"]').val(this.value);
     const options = {};
     for (const key in window.LANGS) {
       if (key.startsWith(`${this.value}.`) && key !== this.value) options[key] = window.LANGS[key].display;
@@ -21,7 +20,11 @@ const page = new NamedPage(['problem_submit', 'contest_detail_problem_submit'],
     if (Object.keys(options).length > 1) {
       setOptions($('#codelang-sub-select'), options);
       $('#codelang-sub-container').show();
-    } else $('#codelang-sub-container').hide();
+      $('[name="codeLang"]').val($('#codelang-sub-container').val());
+    } else {
+      $('#codelang-sub-container').hide();
+      $('[name="codeLang"]').val(this.value);
+    }
   });
   $('#codelang-sub-select').on('change', function () {
     $('[name="lang"]').val(this.value);
diff --git a/packages/ui-default/templates/record_detail.html b/packages/ui-default/templates/record_detail.html
index 983eb607a..7a024b0e6 100644
--- a/packages/ui-default/templates/record_detail.html
+++ b/packages/ui-default/templates/record_detail.html
@@ -11,7 +11,7 @@
         <h1 class="section__title">{{ _('Code') }}</h1>
       </div>
       <div class="section__body">
-        <pre><code class="line-numbers language-{{ model.system.langs[rdoc.lang].highlight }}">{{ rdoc['code'] }}</code></pre>
+        <pre><code class="line-numbers language-{{ model.setting.langs[rdoc.lang].highlight }}">{{ rdoc['code'] }}</code></pre>
       </div>
     </div>
     {% endif %}