From 2554e6dd7243b2760246c1a0f31ec4749c065c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 21 Aug 2019 17:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb              |  2 +-
 public/javascripts/create_kindeditor.js     | 36 ++++++++++-----------
 public/react/public/js/create_kindeditor.js | 33 +++++++++----------
 3 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index f8c686bd..106d720a 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -3,7 +3,7 @@
     <%= javascript_include_tag 'create_kindeditor'%>
 <% end %>
 <script>
-    var reply_editor = sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
 </script>
 <style>
   .set_Reply_detail ul li.homepagePostReplyContainer,.set_Reply_detail div.homepagePostReplyContainer{padding-left: 10px;padding-right: 0px }
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index d7b5539a..fdd493d8 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -37,7 +37,7 @@ function sd_create_editor(params){
             //params.toolbar_container.hide();
             $('#reply_image_' + id).addClass('imageFuzzy');
             if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(this.edit.html())){
-                params.submit_btn.show();
+                params.submit_btn.hide();
                 params.toolbar_container.hide();
                 this.resize("100%", null);
             }else if(this.edit.html().trim() != ""){
@@ -74,7 +74,7 @@ function sd_create_editor(params){
             $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
-            params.submit_btn.show();
+            params.submit_btn.hide();
             //init
             var edit = this.edit;
             var body = edit.doc.body;
@@ -124,7 +124,7 @@ function sd_create_shixun_editor(params){
             sd_check_editor_form_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
             if(this.isEmpty()) {
                 this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
-                params.submit_btn.show();
+                params.submit_btn.hide();
                 params.toolbar_container.hide();
                 this.resize("100%", "30px");
                 $("#dis_reply_id").val("");
@@ -180,7 +180,7 @@ function sd_create_shixun_editor(params){
             $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
             params.toolbar_container.append(toolbar);
             params.toolbar_container.hide();
-            params.submit_btn.show();
+            params.submit_btn.hide();
             //init
             var edit = this.edit;
             var body = edit.doc.body;
@@ -206,20 +206,18 @@ function sd_check_editor_form_field(params){
         if(params.content.isEmpty()){
             result=false;
         }
-        console.log(params.content)
-        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-        //     params.textarea.html(params.content.html());
-        //
-        //     params.content.sync();
-        //     if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
-        //         params.contentmsg.html('内容不能为空');
-        //         params.contentmsg.css({color:'#ff0000'});
-        //     }else{
-        //         params.contentmsg.html('填写正确');
-        //         params.contentmsg.css({color:'#008000'});
-        //     }
-        //     params.contentmsg.show();
-        // }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            params.content.sync();
+            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
     }
     return result;
 }
@@ -434,7 +432,7 @@ function sd_create_message_editor(params){
                 this.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>我要回复</span>");
                 params.toolbar_container.hide();
                 this.resize("100%", "30px");
-                params.submit_btn.show();
+                params.submit_btn.hide();
                 params.notice_msg.hide();
             }
             $('#mini_comment_section').height('auto');
diff --git a/public/react/public/js/create_kindeditor.js b/public/react/public/js/create_kindeditor.js
index 89f1dbbd..434c9b46 100644
--- a/public/react/public/js/create_kindeditor.js
+++ b/public/react/public/js/create_kindeditor.js
@@ -245,22 +245,21 @@ function sd_create_shixun_editor(params){
 function sd_check_editor_form_field(params){
     var result=true;
     if(params.content!=undefined){
-
-        // if(params.content.isEmpty()){
-        //     result=false;
-        // }
-        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-        //     params.textarea.html(params.content.html());
-        //     params.content.sync();
-        //     if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
-        //         params.contentmsg.html('内容不能为空');
-        //         params.contentmsg.css({color:'#ff0000'});
-        //     }else{
-        //         params.contentmsg.html('填写正确');
-        //         params.contentmsg.css({color:'#008000'});
-        //     }
-        //     params.contentmsg.show();
-        // }
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            params.content.sync();
+            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
     }
     return result;
 }
@@ -315,7 +314,7 @@ function sd_create_editor_from_data(id){
             params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
             params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
             params.cancel_btn = $("#new_message_cancel_btn_" + id);
-            params.submit_btn = $("#fnew_message_submit_btn_" + id);
+            params.submit_btn = $("#new_message_submit_btn_" + id);
             params.height = height;
             params.width = width;
             if (params.textarea.data('init') == undefined) {