Browse Source

修复json格式化的bug

star7th 9 years ago
parent
commit
301e7feaee
2 changed files with 5 additions and 2 deletions
  1. 1 1
      Application/Home/View/Page/edit.html
  2. 4 1
      Public/js/page/edit.js

+ 1 - 1
Application/Home/View/Page/edit.html

@@ -141,7 +141,7 @@
 <script src="__PUBLIC__/editor.md/plugins/table-dialog/table-dialog.js"></script>
 <script src="__PUBLIC__/editor.md/plugins/reference-link-dialog/reference-link-dialog.js"></script>
 
-<script src="__PUBLIC__/js/page/edit.js?v=1.1.2thirdonmopqrstut"></script>
+<script src="__PUBLIC__/js/page/edit.js?v=1.1.2thirdonmopqrstutv"></script>
 <if condition="LANG_SET=='en-us'">
     <script src="__PUBLIC__/editor.md/languages/en.js"></script>
 </if>

+ 4 - 1
Public/js/page/edit.js

@@ -188,7 +188,10 @@ $(function() {
 $("#beautify-json-dialog .editormd-enter-btn").click(function(){
   var data = $("#beautify-json-dialog .jsons").val();
       try{
-          var text="\n ``` \n \{ \n"+dump(JSON.parse(data))+" \} \n\n ```\n\n";//整体加个大括号
+          data = data.replace(/(^\s*)|(\s*$)/g,"");
+          op1 = data.substr(0, 1) == "[" ? "[":"{";
+          op2 = (op1 == "[") ? "]":"}";
+          var text="\n ``` \n "+op1+" \n"+dump(JSON.parse(data))+" "+op2+" \n\n ```\n\n";//整体加个大括号
           //$("#beautify-json-dialog .jsons").val(text);
           $("#beautify-json-dialog .jsons").val("");
           editormd.insertValue(text);