Просмотр исходного кода

abolish pageBreakCustomSeparator isEnabledXssPrevention xssOption pageBreakCustomSeparator

mizozobu 6 лет назад
Родитель
Сommit
f75215b476
3 измененных файлов с 2 добавлено и 31 удалено
  1. 0 20
      src/server/models/config.js
  2. 0 9
      src/server/util/swigFunctions.js
  3. 2 2
      src/server/views/page_presentation.html

+ 0 - 20
src/server/models/config.js

@@ -321,26 +321,6 @@ module.exports = function(crowi) {
     return false;
     return false;
   };
   };
 
 
-  configSchema.statics.pageBreakSeparator = function(config) {
-    const key = 'markdown:presentation:pageBreakSeparator';
-    return getValueForMarkdownNS(config, key);
-  };
-
-  configSchema.statics.pageBreakCustomSeparator = function(config) {
-    const key = 'markdown:presentation:pageBreakCustomSeparator';
-    return getValueForMarkdownNS(config, key);
-  };
-
-  configSchema.statics.isEnabledXssPrevention = function(config) {
-    const key = 'markdown:xss:isEnabledPrevention';
-    return getValueForMarkdownNS(config, key);
-  };
-
-  configSchema.statics.xssOption = function(config) {
-    const key = 'markdown:xss:option';
-    return getValueForMarkdownNS(config, key);
-  };
-
   configSchema.statics.getLocalconfig = function() { // CONF.RF: これも別のメソッドにする
   configSchema.statics.getLocalconfig = function() { // CONF.RF: これも別のメソッドにする
     const env = process.env;
     const env = process.env;
 
 

+ 0 - 9
src/server/util/swigFunctions.js

@@ -165,15 +165,6 @@ module.exports = function(crowi, app, req, locals) {
     return Config.isEnabledLinebreaksInComments(config);
     return Config.isEnabledLinebreaksInComments(config);
   };
   };
 
 
-  locals.pageBreakSeparator = function() {
-    const config = crowi.getConfig();
-    return Config.pageBreakSeparator(config);
-  };
-
-  locals.pageBreakCustomSeparator = function() {
-    const config = crowi.getConfig();
-    return Config.pageBreakCustomSeparator(config);
-  };
 
 
   locals.customCss = function() {
   locals.customCss = function() {
     const customizeService = crowi.customizeService;
     const customizeService = crowi.customizeService;

+ 2 - 2
src/server/views/page_presentation.html

@@ -41,8 +41,8 @@
   <body>
   <body>
     <div class="reveal">
     <div class="reveal">
       <div class="slides">
       <div class="slides">
-        {% set pageBreakSeparator = pageBreakSeparator()|default(1) %}
-        {% set pageBreakCustomSeparator = pageBreakCustomSeparator()|default('') %}
+        {% set pageBreakSeparator = getConfig('markdown', 'markdown:presentation:pageBreakSeparator') | default(1) %}
+        {% set pageBreakCustomSeparator = getConfig('markdown', 'markdown:presentation:pageBreakCustomSeparator') | default('') %}
 
 
         {% if 3 === pageBreakSeparator %}
         {% if 3 === pageBreakSeparator %}
           {% set dataSeparator = pageBreakCustomSeparator %}
           {% set dataSeparator = pageBreakCustomSeparator %}