Merge pull request #483 from otale/develop

Develop
otale · Nov 5, 2018 · a05bd68 · a05bd68
2 parents 11e717f + ac35120
commit a05bd68
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/main/resources/static/admin/js/edit_article.js b/src/main/resources/static/admin/js/edit_article.js
@@ -166,24 +166,24 @@ var vm = new Vue({
                         });
                         $('#dropzone-container').hide();
                     }
+
+                    tale.get({
+                        url: '/admin/api/articles/content/' + cid,
+                        success: function (data) {
+                            if ($vm.article.fmtType === 'markdown') {
+                                mditor.value = data;
+                            } else {
+                                htmlEditor.summernote("code", data);
+                            }
+                        }
+                    });
+
                 },
                 error: function (error) {
                     console.log(error);
                     alert(error || '数据加载失败');
                 }
             });
-
-            tale.get({
-                url: '/admin/api/articles/content/' + cid,
-                success: function (data) {
-                    if ($vm.article.fmtType === 'markdown') {
-                        mditor.value = data;
-                    } else {
-                        htmlEditor.summernote("code", data);
-                    }
-                }
-            });
-
         },
         autoSave: function (callback) {
             var $vm = this;

diff --git a/src/main/resources/static/admin/js/edit_page.js b/src/main/resources/static/admin/js/edit_page.js
@@ -110,24 +110,24 @@ var vm = new Vue({
                             off: '关闭'
                         }
                     });
+
+                    tale.get({
+                        url: '/admin/api/articles/content/' + cid,
+                        success: function (data) {
+                            if ($vm.article.fmtType === 'markdown') {
+                                mditor.value = data;
+                            } else {
+                                htmlEditor.summernote("code", data);
+                            }
+                        }
+                    });
                 },
                 error: function (error) {
                     console.log(error);
                     alert(error || '数据加载失败');
                 }
             });
 
-            tale.get({
-                url: '/admin/api/articles/content/' + cid,
-                success: function (data) {
-                    if ($vm.article.fmtType === 'markdown') {
-                        mditor.value = data;
-                    } else {
-                        htmlEditor.summernote("code", data);
-                    }
-                }
-            });
-
         },
         autoSave: function (callback) {
             var $vm = this;