refactor: replace shjs with hljs (#136)

UniversalOJ · Jun 20, 2024 · d4cebd9 · d4cebd9
1 parent d2c9aca
commit d4cebd9
Show file tree

Hide file tree

Showing 54 changed files with 687 additions and 56 deletions.
diff --git a/web/app/controllers/faq.php b/web/app/controllers/faq.php
@@ -1,5 +1,5 @@
 <?php
-	requireLib('shjs');
+	requireLib('hljs');
 	requireLib('mathjax');
 	echoUOJPageHeader(UOJLocale::get('help')) 
 ?>

diff --git a/web/app/controllers/hack.php b/web/app/controllers/hack.php
@@ -54,7 +54,7 @@
 	}
 ?>
 <?php
-	$REQUIRE_LIB['shjs'] = "";
+	$REQUIRE_LIB['hljs'] = "";
 ?>
 <?php echoUOJPageHeader(UOJLocale::get('problems::hack').' #'.$hack['id']) ?>
 

diff --git a/web/app/controllers/problem.php b/web/app/controllers/problem.php
@@ -204,7 +204,7 @@ function(response_text) {custom_test_onsubmit(response_text, $('#div-custom_test
 ?>
 <?php
 	$REQUIRE_LIB['mathjax'] = '';
-	$REQUIRE_LIB['shjs'] = '';
+	$REQUIRE_LIB['hljs'] = '';
 ?>
 <?php echoUOJPageHeader(HTML::stripTags($problem['title']) . ' - ' . UOJLocale::get('problems::problem')) ?>
 <?php

diff --git a/web/app/controllers/subdomain/blog/archive.php b/web/app/controllers/subdomain/blog/archive.php
@@ -26,7 +26,7 @@
 	$all_tags = DB::selectAll("select distinct tag from blogs_tags where blog_id in (select id from blogs where $blogs_cond)");
 
 	requireLib('mathjax');
-	requireLib('shjs');
+	requireLib('hljs');
 ?>
 <?php echoUOJPageHeader('日志') ?>
 

diff --git a/web/app/controllers/subdomain/blog/blog.php b/web/app/controllers/subdomain/blog/blog.php
@@ -139,7 +139,7 @@ function($comment) {
 ?>
 <?php
 	$REQUIRE_LIB['mathjax'] = '';
-	$REQUIRE_LIB['shjs'] = '';
+	$REQUIRE_LIB['hljs'] = '';
 ?>
 <?php echoUOJPageHeader(HTML::stripTags($blog['title']) . ' - 博客') ?>
 <?php echoBlog($blog, array('show_title_only' => isset($_GET['page']) && $_GET['page'] != 1)) ?>

diff --git a/web/app/controllers/subdomain/blog/index.php b/web/app/controllers/subdomain/blog/index.php
@@ -9,7 +9,7 @@
 ?>
 <?php
 	$REQUIRE_LIB['mathjax'] = '';
-	$REQUIRE_LIB['shjs'] = '';
+	$REQUIRE_LIB['hljs'] = '';
 ?>
 <?php echoUOJPageHeader(UOJContext::user()['username'] . '的博客') ?>
 

diff --git a/web/app/controllers/submission.php b/web/app/controllers/submission.php
@@ -126,7 +126,7 @@
 	}
 ?>
 <?php 
-	$REQUIRE_LIB['shjs'] = "";
+	$REQUIRE_LIB['hljs'] = "";
 ?>
 <?php echoUOJPageHeader(UOJLocale::get('problems::submission').' #'.$submission['id']) ?>
 <?php echoSubmissionsListOnlyOne($submission, array(), $myUser) ?>

diff --git a/web/app/controllers/super_manage.php b/web/app/controllers/super_manage.php
@@ -356,7 +356,7 @@ function ($x, &$vdata) {
 	}
 ?>
 <?php
-	requireLib('shjs');
+	requireLib('hljs');
 	requireLib('morris');
 ?>
 <?php echoUOJPageHeader('系统管理') ?>

diff --git a/web/app/models/UOJBlogEditor.php b/web/app/models/UOJBlogEditor.php
@@ -201,7 +201,7 @@ public function handleSave() {
 		if (isset($_POST['need_preview'])) {
 			ob_start();
 			if ($this->type == 'blog') {
-				echoUOJPageHeader('博客预览', array('ShowPageHeader' => false, 'REQUIRE_LIB' => array('mathjax' => '', 'shjs' => '')));
+				echoUOJPageHeader('博客预览', array('ShowPageHeader' => false, 'REQUIRE_LIB' => array('mathjax' => '', 'hljs' => '')));
 				echo '<article>';
 				echo $this->post_data['content'];
 				echo '</article>';

diff --git a/web/app/views/page-header.php b/web/app/views/page-header.php
@@ -192,11 +192,11 @@
 		<?= HTML::js_src('/js/raphael.min.js') ?>
 		<?php endif ?>
 
-		<?php if (isset($REQUIRE_LIB['shjs'])): ?>
-		<!-- shjs -->
-		<?= HTML::css_link('/css/sh_typical.min.css') ?>
-		<?= HTML::js_src('/js/sh_main.min.js') ?>
-		<script type="text/javascript">$(document).ready(function(){sh_highlightDocument()})</script>
+		<?php if (isset($REQUIRE_LIB['hljs'])): ?>
+		<!-- hljs -->
+		<?= HTML::css_link('/css/highlight_github.css') ?>
+		<?= HTML::js_src('/js/highlight.min.js') ?>
+		<script type="text/javascript">$(document).ready(function(){hljs.highlightAll()})</script>
 		<?php endif ?>
 
 		<?php if (isset($REQUIRE_LIB['ckeditor'])): ?>

diff --git a/web/css/highlight_github.css b/web/css/highlight_github.css
diff --git a/web/css/sh_typical.min.css b/web/css/sh_typical.min.css