From d627f3a0b91905522bdd2f1ba1db772d2a2d2f19 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 14 Mar 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'develop' of
 http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

# Conflicts:
#	app/controllers/ecloud_controller.rb
---
 public/javascripts/educoder/edu_account.js | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/public/javascripts/educoder/edu_account.js b/public/javascripts/educoder/edu_account.js
index 89086802..eedc4db5 100644
--- a/public/javascripts/educoder/edu_account.js
+++ b/public/javascripts/educoder/edu_account.js
@@ -1521,22 +1521,24 @@ function my_account_form_submit() {
         }
     }
 
+    if ($("input[name='new_password']").length>0){
+        if($("input[name='new_password']").val().length<8){
+            $("#new_password").focus();
+            $("#new_password_hint").show();
+            return;
+        } else {
+            $("#new_password_hint").hide();
+        }
 
-    if($("input[name='new_password']").val().length<8){
-        $("#new_password").focus();
-        $("#new_password_hint").show();
-        return;
-    } else {
-        $("#new_password_hint").hide();
+        if($("input[name='new_password']").val() !== $("input[name='new_password_confirmation']").val() ){
+            $("#new_password_confirmation").focus();
+            $("#new_password_confirmation_hint").show();
+            return;
+        } else {
+            $("#new_password_confirmation_hint").hide();
+        }
     }
 
-    if($("input[name='new_password']").val() !== $("input[name='new_password_confirmation']").val() ){
-        $("#new_password_confirmation").focus();
-        $("#new_password_confirmation_hint").show();
-        return;
-    } else {
-        $("#new_password_confirmation_hint").hide();
-    }
 
     if ($("#userIdentity").val() == -1) {
         $("#identity_hint").show();