Главная Обзор Помощь
Вход
wiki
/
weseek__growi
зеркало из https://github.com/weseek/growi
2
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

clean code

Yuki Takei 8 лет назад
Родитель
af4e42c5a5
Сommit
009afe3358
4 измененных файлов с 9 добавлено и 19 удалено
Единый вид Показать статистику Diff
  1. 8 9
      lib/views/admin/customize.html
  2. 0 5
      lib/views/layout/2column.html
  3. 1 3
      lib/views/layout/layout.html
  4. 0 2
      lib/views/page_presentation.html

+ 8 - 9
lib/views/admin/customize.html
Просмотреть файл 

@@ -37,9 +37,6 @@
 
   </div>
 
   </div>
 
   {% endif %}
 
   {% endif %}
 
 
 
-  <!-- highlight.js -->
 
-  <link class="highlightJsCss" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js@9.12.0/styles/{{ highlightJsStyle() }}.css">
 
-
 
   <div class="row">
 
   <div class="row">
 
     <div class="col-md-3">
 
     <div class="col-md-3">
 
       {% include './widget/menu.html' with {current: 'customize'} %}
 
       {% include './widget/menu.html' with {current: 'customize'} %}
 
@@ -220,7 +217,9 @@
 
 
 
           <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js@9.12.0/styles/{{ highlightJsStyle() }}.css" class="highlightJsCss">
 
           <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js@9.12.0/styles/{{ highlightJsStyle() }}.css" class="highlightJsCss">
 
 
 
-          <pre><code class="highlight-demo">function $initHighlight(block, cls) {
 
+          <p class="help-block">
 
+            Examples:
 
+            <pre class="hljs"><code class="highlightjs-demo">function $initHighlight(block, cls) {
 
   try {
 
   try {
 
     if (cls.search(/\bno\-highlight\b/) != -1)
 
     if (cls.search(/\bno\-highlight\b/) != -1)
 
       return process(block, true, 0x0F) +
 
       return process(block, true, 0x0F) +
 
@@ -235,6 +234,7 @@
 
 }
 
 }
 
 
 
 export  $initHighlight;</code></pre>
 
 export  $initHighlight;</code></pre>
 
+          </p>
 
 
 
           <div class="form-group">
 
           <div class="form-group">
 
             <div class="col-xs-offset-5 col-xs-6">
 
             <div class="col-xs-offset-5 col-xs-6">
 
@@ -257,7 +257,7 @@ export  $initHighlight;</code></pre>
 
 
 
         <p class="help-block">
 
         <p class="help-block">
 
           Examples:
 
           Examples:
 
-          <pre><code>&lt;script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js" defer&gt;&lt;/script&gt;</code></pre>
 
+          <pre class="hljs"><code>&lt;script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js" defer&gt;&lt;/script&gt;</code></pre>
 
         </p>
 
         </p>
 
 
 
         <div class="form-group">
 
         <div class="form-group">
 
@@ -343,7 +343,7 @@ export  $initHighlight;</code></pre>
 
         </p>
 
         </p>
 
         <p class="help-block">
 
         <p class="help-block">
 
           Examples:
 
           Examples:
 
-<pre><code>console.log($('.main-container'));
 
+<pre class="hljs"><code>console.log($('.main-container'));
 
 
 
 window.addEventListener('load', (event) => {
 
 window.addEventListener('load', (event) => {
 
   console.log('config: ', crowi.config);
 
   console.log('config: ', crowi.config);
 
@@ -426,16 +426,15 @@ window.addEventListener('load', (event) => {
 
     });
 
     });
 
 
 
     // init highlight.js
 
     // init highlight.js
 
-    hljs.initHighlighting()
 
+    hljs.initHighlightingOnLoad()
 
 
 
     function selectHighlightJsStyle(event) {
 
     function selectHighlightJsStyle(event) {
 
       var highlightJsCssDOM = $(".highlightJsCss")[0]
 
       var highlightJsCssDOM = $(".highlightJsCss")[0]
 
       // selected value
 
       // selected value
 
       var val = event.target.value
 
       var val = event.target.value
 
       // replace css url
 
       // replace css url
 
+      // see https://regex101.com/r/gBNZYu/3
 
       highlightJsCssDOM.href = highlightJsCssDOM.href.replace(/[^/]+\.css$/, `${val}.css`);
 
       highlightJsCssDOM.href = highlightJsCssDOM.href.replace(/[^/]+\.css$/, `${val}.css`);
 
-      // reload highlight.js of demo code
 
-      hljs.highlightBlock(highlightJsCssDOM);
 
     }
 
     }
 
 
 
   </script>
 
   </script>

+ 0 - 5
lib/views/layout/2column.html
Просмотреть файл 

@@ -1,10 +1,5 @@
 
 {% extends 'layout.html' %}
 
 {% extends 'layout.html' %}
 
 
 
-{% block highlight_js_css %}
 
-  <!-- highlight.js -->
 
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js@9.12.0/styles/{{ highlightJsStyle() }}.css">
 
-{% endblock %}
 
-
 
 {% block layout_sidebar %}
 
 {% block layout_sidebar %}
 
 
 
 <a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar"><i class="fa fa-chevron-right"></i> <span class="hide-on-affix-top"></span></a>
 
 <a href="" class=" hidden-xs hidden-sm layout-control" id="toggle-sidebar"><i class="fa fa-chevron-right"></i> <span class="hide-on-affix-top"></span></a>

+ 1 - 3
lib/views/layout/layout.html
Просмотреть файл 

@@ -91,7 +91,7 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
   <!-- emojione -->
 
   <!-- emojione -->
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emojione@3.1.2/extras/css/emojione.min.css">
 
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emojione@3.1.2/extras/css/emojione.min.css">
 
   <!-- highlight.js -->
 
   <!-- highlight.js -->
 
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js@9.12.0/styles/github.css">
 
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js@9.12.0/styles/{{ highlightJsStyle() }}.css">
 
 
 
   {% block html_additional_headers %}{% endblock %}
 
   {% block html_additional_headers %}{% endblock %}
 
 
 
@@ -101,8 +101,6 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
 </head>
 
 </head>
 
 {% endblock %}
 
 {% endblock %}
 
 
 
-{% block highlight_js_css %}{% endblock %}
 
-
 
 {% block html_body %}
 
 {% block html_body %}
 
 <body
 
 <body
 
   class="crowi main-container {% block html_base_css %}{% endblock %} {% if 'crowi-plus' === layoutType() %}crowi-plus{% endif %}"
 
   class="crowi main-container {% block html_base_css %}{% endblock %} {% if 'crowi-plus' === layoutType() %}crowi-plus{% endif %}"

+ 0 - 2
lib/views/page_presentation.html
Просмотреть файл 

@@ -48,8 +48,6 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
 
 
     <!-- Google Fonts -->
 
     <!-- Google Fonts -->
 
     <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
 
     <link href='https://fonts.googleapis.com/css?family=Lato:400,700' rel='stylesheet' type='text/css'>
 
-    <!-- highlight.js -->
 
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js@9.12.0/styles/{{ highlightJsStyle() }}.css">
 
 
 
     <style>
 
     <style>
 
       {{ customCss() }}
 
       {{ customCss() }}