Browse Source

修改前端 Markdown 编辑器脚本文件,目的在于解决以下问题:如果点击“发布”按钮时文档处于未保存状态,则在提示框中选择保存后,可能出现并未将最新版本成功发布的情况。推测原因在于发布的命令发送到服务端时之前的保存操作可能尚未完成,因此将发布命令置于保存完成后的回调中执行。

Dandy Cheung 7 years ago
parent
commit
87f7fd29ed
1 changed files with 131 additions and 127 deletions
  1. 131 127
      static/js/markdown.js

+ 131 - 127
static/js/markdown.js

@@ -5,12 +5,12 @@ $(function () {
         height : "100%",
         path : "/static/editor.md/lib/",
         toolbar : true,
-        placeholder: "本编辑器支持Markdown编辑,左边编写,右边预览",
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "JPG", "JPEG", "GIF", "PNG"],
-        imageUploadURL: window.imageUploadURL ,
+        placeholder : "本编辑器支持 Markdown 编辑,左边编写,右边预览",
+        imageUpload : true,
+        imageFormats : ["jpg", "jpeg", "gif", "png", "JPG", "JPEG", "GIF", "PNG"],
+        imageUploadURL : window.imageUploadURL,
         toolbarModes : "full",
-        fileUpload: true,
+        fileUpload : true,
         fileUploadURL : window.fileUploadURL,
         taskList : true,
         flowChart : true,
@@ -19,10 +19,11 @@ $(function () {
         tocStartLevel : 1,
         tocm : true,
         saveHTMLToTextarea : true,
+
         onload : function() {
             this.hideToolbar();
             var keyMap = {
-                "Ctrl-S": function(cm) {
+                "Ctrl-S" : function(cm) {
                     saveDocument(false);
                 },
                 "Cmd-S" : function(cm){
@@ -35,7 +36,7 @@ $(function () {
             this.addKeyMap(keyMap);
 
             var $select_node_id = window.treeCatalog.get_selected();
-            if($select_node_id) {
+            if ($select_node_id) {
                 var $select_node = window.treeCatalog.get_node($select_node_id[0])
                 if ($select_node) {
                     $select_node.node = {
@@ -45,13 +46,14 @@ $(function () {
                     loadDocument($select_node);
                 }
             }
-            uploadImage("docEditor",function ($state, $res) {
-                if($state === "before"){
+
+            uploadImage("docEditor", function ($state, $res) {
+                if ($state === "before") {
                     return layer.load(1, {
-                        shade: [0.1,'#fff'] //0.1透明度的白色背景
+                        shade: [0.1,'#fff'] // 0.1 透明度的白色背景
                     });
-                }else if($state === "success"){
-                    if($res.errcode === 0) {
+                } else if ($state === "success") {
+                    if ($res.errcode === 0) {
                         var value = '![](' + $res.url + ')';
                         window.editor.insertValue(value);
                     }
@@ -66,62 +68,50 @@ $(function () {
     /**
      * 实现标题栏操作
      */
-    $("#editormd-tools").on("click","a[class!='disabled']",function () {
+    $("#editormd-tools").on("click", "a[class!='disabled']", function () {
        var name = $(this).find("i").attr("name");
-       if(name === "attachment"){
+       if (name === "attachment") {
            $("#uploadAttachModal").modal("show");
-       }else if(name === "history"){
+       } else if (name === "history") {
            window.documentHistory();
-       }else if(name === "save"){
+       } else if (name === "save") {
             saveDocument(false);
-       }else if(name === "template"){
+       } else if (name === "template") {
            $("#documentTemplateModal").modal("show");
-       }else if(name === "sidebar"){
-            $("#manualCategory").toggle(0,"swing",function () {
-
+       } else if (name === "sidebar") {
+            $("#manualCategory").toggle(0, "swing", function () {
                 var $then = $("#manualEditorContainer");
                 var left = parseInt($then.css("left"));
-                if(left > 0){
+                if (left > 0) {
                     window.editorContainerLeft = left;
-                    $then.css("left","0");
-                }else{
-                    $then.css("left",window.editorContainerLeft + "px");
+                    $then.css("left", "0");
+                } else {
+                    $then.css("left", window.editorContainerLeft + "px");
                 }
                 window.editor.resize();
             });
-       }else if(name === "release"){
-            if(Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0){
-                if($("#markdown-save").hasClass('change')) {
+       } else if (name === "release") {
+            if (Object.prototype.toString.call(window.documentCategory) === '[object Array]' && window.documentCategory.length > 0) {
+                if ($("#markdown-save").hasClass('change')) {
                     var comfirm_result = confirm("编辑内容未保存,需要保存吗?")
-                    if(comfirm_result) {
-                        saveDocument();
+                    if (comfirm_result) {
+                        saveDocument(false, releaseBook);
+                        return;
                     }
                 }
-                $.ajax({
-                    url : window.releaseURL,
-                    data :{"identify" : window.book.identify },
-                    type : "post",
-                    dataType : "json",
-                    success : function (res) {
-                        if(res.errcode === 0){
-                            layer.msg("发布任务已推送到任务队列,稍后将在后台执行。");
-                        }else{
-                            layer.msg(res.message);
-                        }
-                    }
-                });
-            }else{
+
+                releaseBook();
+            } else {
                 layer.msg("没有需要发布的文档")
             }
-       }else if(name === "tasks") {
-           //插入GFM任务列表
+       } else if (name === "tasks") {
+           // 插入 GFM 任务列表
            var cm = window.editor.cm;
            var selection = cm.getSelection();
 
            if (selection === "") {
                cm.replaceSelection("- [x] " + selection);
-           }
-           else {
+           } else {
                var selectionText = selection.split("\n");
 
                for (var i = 0, len = selectionText.length; i < len; i++) {
@@ -129,7 +119,7 @@ $(function () {
                }
                cm.replaceSelection(selectionText.join("\n"));
            }
-       }else {
+       } else {
            var action = window.editor.toolbarHandlers[name];
 
            if (action !== "undefined") {
@@ -145,23 +135,23 @@ $(function () {
      */
     window.loadDocument = function($node) {
         var index = layer.load(1, {
-            shade: [0.1,'#fff'] //0.1透明度的白色背景
+            shade: [0.1,'#fff'] // 0.1 透明度的白色背景
         });
 
         $.get(window.editURL + $node.node.id ).done(function (res) {
             layer.close(index);
 
             resetEditor();
-            if(res.errcode === 0){
+            if (res.errcode === 0) {
                 window.isLoad = true;
                 window.editor.clear();
                 window.editor.insertValue(res.data.markdown);
-                window.editor.setCursor({line:0, ch:0});
-                var node = { "id" : res.data.doc_id,'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id ,"text" : res.data.doc_name,"identify" : res.data.identify,"version" : res.data.version};
+                window.editor.setCursor({ line : 0, ch : 0 });
+                var node = { "id" : res.data.doc_id, 'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id, "text" : res.data.doc_name, "identify" : res.data.identify, "version" : res.data.version };
                 pushDocumentCategory(node);
                 window.selectNode = node;
                 pushVueLists(res.data.attach);
-            }else{
+            } else {
                 layer.msg("文档加载失败");
             }
         }).fail(function () {
@@ -174,66 +164,82 @@ $(function () {
      * 保存文档到服务器
      * @param $is_cover 是否强制覆盖
      */
-    function saveDocument($is_cover,callback) {
+    function saveDocument($is_cover, callback) {
         var index = null;
         var node = window.selectNode;
         var content = window.editor.getMarkdown();
         var html = window.editor.getPreviewedHTML();
         var version = "";
 
-        if(!node){
+        if (!node) {
             layer.msg("获取当前文档信息失败");
             return;
         }
+
         var doc_id = parseInt(node.id);
 
-        for(var i in window.documentCategory){
+        for (var i in window.documentCategory) {
             var item = window.documentCategory[i];
 
-            if(item.id === doc_id){
+            if (item.id === doc_id) {
                 version = item.version;
                 break;
             }
         }
         $.ajax({
             beforeSend  : function () {
-                index = layer.load(1, {shade: [0.1,'#fff'] });
+                index = layer.load(1, { shade : [0.1,'#fff'] });
             },
-            url :  window.editURL,
-            data : {"identify" : window.book.identify,"doc_id" : doc_id,"markdown" : content,"html" : html,"cover" : $is_cover ? "yes":"no","version": version},
-            type :"post",
-            dataType :"json",
+            url : window.editURL,
+            data : { "identify" : window.book.identify, "doc_id" : doc_id, "markdown" : content, "html" : html, "cover" : $is_cover ? "yes" : "no", "version" : version },
+            type : "post",
+            dataType : "json",
             success : function (res) {
                 layer.close(index);
-                if(res.errcode === 0){
+                if (res.errcode === 0) {
                     resetEditorChanged(false);
-                    for(var i in window.documentCategory){
+                    for (var i in window.documentCategory) {
                         var item = window.documentCategory[i];
 
-                        if(item.id === doc_id){
+                        if (item.id === doc_id) {
                             window.documentCategory[i].version = res.data.version;
                             break;
                         }
                     }
-                    if(typeof callback === "function"){
+                    if (typeof callback === "function") {
                         callback();
                     }
-                }else if(res.errcode === 6005){
+                } else if(res.errcode === 6005) {
                     var confirmIndex = layer.confirm('文档已被其他人修改确定覆盖已存在的文档吗?', {
-                        btn: ['确定','取消'] //按钮
-                    }, function(){
+                        btn: ['确定','取消'] // 按钮
+                    }, function() {
                         layer.close(confirmIndex);
-                        saveDocument(true,callback);
+                        saveDocument(true, callback);
                     });
-                }else{
+                } else {
                     layer.msg(res.message);
                 }
             }
         });
     }
 
-    function resetEditor($node) {
+    function releaseBook() {
+        $.ajax({
+            url : window.releaseURL,
+            data : { "identify" : window.book.identify },
+            type : "post",
+            dataType : "json",
+            success : function (res) {
+                if (res.errcode === 0) {
+                    layer.msg("发布任务已推送到任务队列,稍后将在后台执行。");
+                } else {
+                    layer.msg(res.message);
+                }
+            }
+        });
+    }
 
+    function resetEditor($node) {
     }
 
     /**
@@ -241,35 +247,34 @@ $(function () {
      * @param $is_change
      */
     function resetEditorChanged($is_change) {
-        if($is_change && !window.isLoad ){
+        if ($is_change && !window.isLoad) {
             $("#markdown-save").removeClass('disabled').addClass('change');
-        }else{
+        } else {
             $("#markdown-save").removeClass('change').addClass('disabled');
         }
         window.isLoad = false;
     }
+
     /**
      * 添加顶级文档
      */
     $("#addDocumentForm").ajaxForm({
         beforeSubmit : function () {
             var doc_name = $.trim($("#documentName").val());
-            if (doc_name === ""){
-                return showError("目录名称不能为空","#add-error-message")
+            if (doc_name === "") {
+                return showError("目录名称不能为空", "#add-error-message")
             }
             $("#btnSaveDocument").button("loading");
             return true;
         },
         success : function (res) {
-            if(res.errcode === 0){
-
-                var data = { "id" : res.data.doc_id,'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id ,"text" : res.data.doc_name,"identify" : res.data.identify,"version" : res.data.version};
+            if (res.errcode === 0) {
+                var data = { "id" : res.data.doc_id, 'parent' : res.data.parent_id === 0 ? '#' : res.data.parent_id , "text" : res.data.doc_name, "identify" : res.data.identify, "version" : res.data.version };
 
                 var node = window.treeCatalog.get_node(data.id);
-                if(node){
-                    window.treeCatalog.rename_node({"id":data.id},data.text);
-
-                }else {
+                if (node) {
+                    window.treeCatalog.rename_node({ "id" : data.id }, data.text);
+                } else {
                     window.treeCatalog.create_node(data.parent, data);
                     window.treeCatalog.deselect_all();
                     window.treeCatalog.select_node(data);
@@ -277,8 +282,8 @@ $(function () {
                 pushDocumentCategory(data);
                 $("#markdown-save").removeClass('change').addClass('disabled');
                 $("#addDocumentModal").modal('hide');
-            }else{
-                showError(res.message,"#add-error-message")
+            } else {
+                showError(res.message, "#add-error-message");
             }
             $("#btnSaveDocument").button("reset");
         }
@@ -288,55 +293,54 @@ $(function () {
      * 文档目录树
      */
     $("#sidebar").jstree({
-        'plugins': ["wholerow", "types", 'dnd', 'contextmenu'],
-        "types": {
-            "default": {
-                "icon": false  // 删除默认图标
+        'plugins' : ["wholerow", "types", 'dnd', 'contextmenu'],
+        "types" : {
+            "default" : {
+                "icon" : false  // 删除默认图标
             }
         },
-        'core': {
-            'check_callback': true,
-            "multiple": false,
-            'animation': 0,
-            "data": window.documentCategory
+        'core' : {
+            'check_callback' : true,
+            "multiple" : false,
+            'animation' : 0,
+            "data" : window.documentCategory
         },
-        "contextmenu": {
-            show_at_node: false,
-            select_node: false,
-            "items": {
-                "添加文档": {
-                    "separator_before": false,
-                    "separator_after": true,
-                    "_disabled": false,
-                    "label": "添加文档",
-                    "icon": "fa fa-plus",
-                    "action": function (data) {
-
+        "contextmenu" : {
+            show_at_node : false,
+            select_node : false,
+            "items" : {
+                "添加文档" : {
+                    "separator_before" : false,
+                    "separator_after" : true,
+                    "_disabled" : false,
+                    "label" : "添加文档",
+                    "icon" : "fa fa-plus",
+                    "action" : function (data) {
                         var inst = $.jstree.reference(data.reference),
                             node = inst.get_node(data.reference);
 
                         openCreateCatalogDialog(node);
                     }
                 },
-                "编辑": {
-                    "separator_before": false,
-                    "separator_after": true,
-                    "_disabled": false,
-                    "label": "编辑",
-                    "icon": "fa fa-edit",
-                    "action": function (data) {
+                "编辑" : {
+                    "separator_before" : false,
+                    "separator_after" : true,
+                    "_disabled" : false,
+                    "label" : "编辑",
+                    "icon" : "fa fa-edit",
+                    "action" : function (data) {
                         var inst = $.jstree.reference(data.reference);
                         var node = inst.get_node(data.reference);
                         openEditCatalogDialog(node);
                     }
                 },
-                "删除": {
-                    "separator_before": false,
-                    "separator_after": true,
-                    "_disabled": false,
-                    "label": "删除",
-                    "icon": "fa fa-trash-o",
-                    "action": function (data) {
+                "删除" : {
+                    "separator_before" : false,
+                    "separator_after" : true,
+                    "_disabled" : false,
+                    "label" : "删除",
+                    "icon" : "fa fa-trash-o",
+                    "action" : function (data) {
                         var inst = $.jstree.reference(data.reference);
                         var node = inst.get_node(data.reference);
                         openDeleteDocumentDialog(node);
@@ -347,26 +351,26 @@ $(function () {
     }).on('loaded.jstree', function () {
         window.treeCatalog = $(this).jstree();
     }).on('select_node.jstree', function (node, selected, event) {
-        if($("#markdown-save").hasClass('change')) {
-            if(confirm("编辑内容未保存,需要保存吗?")){
-                saveDocument(false,function () {
+        if ($("#markdown-save").hasClass('change')) {
+            if (confirm("编辑内容未保存,需要保存吗?")) {
+                saveDocument(false, function () {
                     loadDocument(selected);
                 });
                 return true;
             }
         }
-        loadDocument(selected);
 
-    }).on("move_node.jstree",jstree_save);
+        loadDocument(selected);
+    }).on("move_node.jstree", jstree_save);
 
-    $("#documentTemplateModal").on("click",".section>a[data-type]",function () {
+    $("#documentTemplateModal").on("click", ".section>a[data-type]", function () {
         var $this = $(this).attr("data-type");
         var body = $("#template-" + $this).html();
         if (body) {
             window.isLoad = true;
             window.editor.clear();
             window.editor.insertValue(body);
-            window.editor.setCursor({line: 0, ch: 0});
+            window.editor.setCursor({ line : 0, ch : 0 });
             resetEditorChanged(true);
         }
         $("#documentTemplateModal").modal('hide');