Explorar el Código

Set isIndentSizeForced false in default

Yuki Takei hace 5 años
padre
commit
7a30e21ebb

+ 2 - 2
resource/locales/en_US/admin/admin.json

@@ -82,9 +82,9 @@
     "indent_desc": "You can change indent settings.",
     "indent_options": {
       "indentSize": "Default indent size",
-      "indentSize_desc": "You can change the default indent size for the Markdown editor",
+      "indentSize_desc": "Set the default indent size for the Markdown editor",
       "disallow_indent_change": "Disallow change of indent size by users",
-      "disallow_indent_change_desc": "You can force users to use a specific indent size."
+      "disallow_indent_change_desc": "Force users to use ther default indent size."
     },
     "presentation_header": "Presentation setting",
     "presentation_desc": "You can change presentation settings.",

+ 1 - 1
src/client/js/services/AdminMarkDownContainer.js

@@ -19,7 +19,7 @@ export default class AdminMarkDownContainer extends Container {
       isEnabledLinebreaks: this.dummyIsEnabledLinebreaks,
       isEnabledLinebreaksInComments: false,
       adminPreferredIndentSize: 4,
-      isIndentSizeForced: true,
+      isIndentSizeForced: false,
       pageBreakSeparator: 1,
       pageBreakCustomSeparator: '',
       isEnabledXss: false,

+ 1 - 1
src/server/models/config.js

@@ -138,7 +138,7 @@ module.exports = function(crowi) {
       'markdown:isEnabledLinebreaks': false,
       'markdown:isEnabledLinebreaksInComments': true,
       'markdown:adminPreferredIndentSize': 4,
-      'markdown:isIndentSizeForced': true,
+      'markdown:isIndentSizeForced': false,
       'markdown:presentation:pageBreakSeparator': 1,
       'markdown:presentation:pageBreakCustomSeparator': undefined,
     };