From ea6c4b09fe7542afb25c54e63e617f731464c208 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 4 Nov 2015 10:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E7=BC=96=E8=BE=91=E5=B8=96?=
 =?UTF-8?q?=20=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/edit.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb
index 7ab460555..d26ebdbf8 100644
--- a/app/views/memos/edit.html.erb
+++ b/app/views/memos/edit.html.erb
@@ -2,7 +2,7 @@
 <script>
 
   function check_and_submit(){
-      if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
+      if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
           if($("textarea[name='memo[subject]']").val().trim().length > 50 ){
               $("#error").html('主题不能超过50个字符').show();
               return;
@@ -13,11 +13,11 @@
 //          }
           memo_content.sync();
           $("#edit_memo").submit();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
           $("#error").html("主题不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
           $("#error").html("内容不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
           $("#error").html("主题和内容不能为空").show();
       }
   }