sou 7 лет назад
Родитель
Сommit
7c8afd2ff9
2 измененных файлов с 11 добавлено и 10 удалено
  1. 2 6
      lib/routes/admin.js
  2. 9 4
      lib/views/admin/markdown.html

+ 2 - 6
lib/routes/admin.js

@@ -107,14 +107,10 @@ module.exports = function(crowi, app) {
   actions.markdown.index = function(req, res) {
   actions.markdown.index = function(req, res) {
     const config = crowi.getConfig();
     const config = crowi.getConfig();
     const markdownSetting = Config.setupCofigFormData('markdown', config);
     const markdownSetting = Config.setupCofigFormData('markdown', config);
-    const spacedRecommendedXssList = {
-      tags: recommendedXssWhiteList.tags.join(', '),
-      attrs: recommendedXssWhiteList.attrs.join(', ')
-    };
 
 
     return res.render('admin/markdown', {
     return res.render('admin/markdown', {
       markdownSetting: markdownSetting,
       markdownSetting: markdownSetting,
-      recommendedXssWhiteList: spacedRecommendedXssList,
+      recommendedXssWhiteList: recommendedXssWhiteList,
     });
     });
   };
   };
 
 
@@ -161,7 +157,7 @@ module.exports = function(crowi, app) {
 
 
   const stringToArray = (string) => {
   const stringToArray = (string) => {
     const array = string.split(',');
     const array = string.split(',');
-    return array.map(item => item.trim()).join(', ');
+    return array.map(item => item.trim());
   };
   };
 
 
   // app.get('/admin/customize' , admin.customize.index);
   // app.get('/admin/customize' , admin.customize.index);

+ 9 - 4
lib/views/admin/markdown.html

@@ -136,11 +136,11 @@
               <p class="font-weight-bold">{{ t('markdown_setting.Recommended setting') }}</p>
               <p class="font-weight-bold">{{ t('markdown_setting.Recommended setting') }}</p>
               <div class="m-t-15">
               <div class="m-t-15">
                 {{ t('markdown_setting.Tag names') }}
                 {{ t('markdown_setting.Tag names') }}
-                <textarea class="form-control" name="recommendedTags" rows="5" cols="40" readonly>{{ recommendedXssWhiteList.tags }}</textarea>
+                <textarea class="form-control xss-list" name="recommendedTags" rows="5" cols="40" readonly>{{ recommendedXssWhiteList.tags }}</textarea>
               </div>
               </div>
               <div class="m-t-15">
               <div class="m-t-15">
                 {{ t('markdown_setting.Tag attributes') }}
                 {{ t('markdown_setting.Tag attributes') }}
-                <textarea class="form-control" name="recommendedAttrs" rows="5" cols="40" readonly>{{ recommendedXssWhiteList.attrs }}</textarea>
+                <textarea class="form-control xss-list" name="recommendedAttrs" rows="5" cols="40" readonly>{{ recommendedXssWhiteList.attrs }}</textarea>
               </div>
               </div>
             </label>
             </label>
           </div>
           </div>
@@ -156,7 +156,7 @@
                     {{ t('markdown_setting.import_recommended', 'tags') }}
                     {{ t('markdown_setting.import_recommended', 'tags') }}
                   </p>
                   </p>
                 </div>
                 </div>
-                <textarea class="form-control" type="text" name="markdownSetting[markdown:xss:tagWhiteList]" rows="5" cols="40" placeholder="e.g. iframe, script, video...">{{ markdownSetting['markdown:xss:tagWhiteList'] }}</textarea>
+                <textarea class="form-control xss-list" type="text" name="markdownSetting[markdown:xss:tagWhiteList]" rows="5" cols="40" placeholder="e.g. iframe, script, video...">{{ markdownSetting['markdown:xss:tagWhiteList'] }}</textarea>
               </div>
               </div>
               <div class="m-t-15">
               <div class="m-t-15">
                 <div class="d-flex justify-content-between">
                 <div class="d-flex justify-content-between">
@@ -165,7 +165,7 @@
                     {{ t('markdown_setting.import_recommended', 'attributes') }}
                     {{ t('markdown_setting.import_recommended', 'attributes') }}
                   </p>
                   </p>
                 </div>
                 </div>
-                <textarea class="form-control" name="markdownSetting[markdown:xss:attrWhiteList]" rows="5" cols="40" placeholder="e.g. src, id, name...">{{ markdownSetting['markdown:xss:attrWhiteList'] }}</textarea>
+                <textarea class="form-control xss-list" name="markdownSetting[markdown:xss:attrWhiteList]" rows="5" cols="40" placeholder="e.g. src, id, name...">{{ markdownSetting['markdown:xss:attrWhiteList'] }}</textarea>
               </div>
               </div>
             </label>
             </label>
           </div>
           </div>
@@ -186,6 +186,11 @@
 </div>
 </div>
 
 
 <script>
 <script>
+  // give a space between items in textarea(',' => ', ')
+  for (var i = 0; i < $('textarea.xss-list').length; i++) {
+    $($('textarea.xss-list')[i]).val($($('textarea.xss-list')[i]).val().replace(/,/g, ', '));
+  };
+
   $('input[name="markdownSetting[markdown:xss:isPrevented]"]').change(function() {
   $('input[name="markdownSetting[markdown:xss:isPrevented]"]').change(function() {
     if ($(this).val() === 'true') {
     if ($(this).val() === 'true') {
       $('#xss-hide-when-disabled').slideDown();
       $('#xss-hide-when-disabled').slideDown();