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

modified element value names and placed to different file

mayu morita 7 лет назад
Родитель
Сommit
f31ba556ee

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

@@ -88,7 +88,7 @@
             <div class="col-xs-5">
                 <div class="btn-group btn-toggle" data-toggle="buttons">
                     <label class="btn btn-default btn-rounded btn-outline {% if markdownSetting['markdown:isEnabledPreventXss'] %}active{% endif %}" data-active-class="primary" for="check1">
-                      <input id="check1" name="markdownSetting[markdown:isEnabledPreventXss]" value="true" type="radio"
+                      <input id="xsscheck1" name="markdownSetting[markdown:isEnabledPreventXss]" value="true" type="radio"
                           {% if true === markdownSetting['markdown:isEnabledPreventXss'] %}checked{% endif %} > ON
                     </label>
                     <label class="btn btn-default btn-rounded btn-outline {% if !markdownSetting['markdown:isEnabledPreventXss'] %}active{% endif %}" data-active-class="default">
@@ -101,11 +101,11 @@
                   <form>
                     <input type="radio" name="preventXSS" value="1" checked>
                       {{ t('markdown_setting.Allow all') }}<br>
-                    <input type="radio" name="preventXSS" value="1">
+                    <input type="radio" name="preventXSS" value="2">
                       {{ t('markdown_setting.Ignore all') }}<br>
-                    <input type="radio" name="preventXSS" value="1">
+                    <input type="radio" name="preventXSS" value="3">
                       {{ t('markdown_setting.Recommended setting') }}<br>
-                    <input type="radio" name="preventXSS" value="2">
+                    <input type="radio" name="preventXSS" value="4">
                       {{ t('markdown_setting.Whitelist setting') }}<br>
                       <div id="WLsetting" class="input">
                          <p class="help-block">{{ t('markdown_setting.Add white list desc') }}</p>

+ 7 - 11
resource/js/legacy/crowi-admin.js

@@ -110,21 +110,17 @@ $(function() {
 
 //XSS prevention accordion display
 $(function() {
-  $('input[type=radio]').change(function() {
+  $('input:radio[name=\'markdownSetting[markdown:isEnabledPreventXss]'.change(function() {
     $('#selectXSS').removeClass('invisible');
 
     if ($('input:radio[name=\'markdownSetting[markdown:isEnabledPreventXss]\']:checked').val() == 'false') {
       $('#selectXSS').addClass('invisible');
     }
-  }).trigger('change'); //←(1)
-});
-
-$(function() {
-  $('input[type=radio]').change(function() {
-    $('#WLsetting').removeClass('invisible');
+    $('input:radio[name=\'preventXSS]'.change(function() {
+      $('#WLsetting').removeClass('invisible');
 
-    if ($('input:radio[name=\'preventXSS\']:checked').val() == '1') {
-      $('#WLsetting').addClass('invisible');
-    }
-  }).trigger('change'); //←(1)
+      if ($('input:radio[name=\'preventXSS\']:checked').val() !== '4') {
+        $('#WLsetting').addClass('invisible');
+      }
+  }).trigger('change');
 });

+ 0 - 14
resource/styles/agile-admin/inverse/pages.scss

@@ -1429,20 +1429,6 @@ a.mytooltip {
 }
 
 
-.input{
-  margin: 1em;
-}
-
-.inputbox{
-  width: 100%;
-}
-
-
-.invisible {
-  display: none;
- }
-
-
 /********* Megamenu Page**********/
 /*
 .megamenu {

+ 14 - 0
resource/styles/scss/_admin.scss

@@ -89,3 +89,17 @@
     }
   }
 }
+
+
+.input{
+  margin: 1em;
+}
+
+.inputbox{
+  width: 100%;
+}
+
+
+.invisible {
+  display: none;
+ }