yusuketk 6 лет назад
Родитель
Сommit
9b30f1ca5e
2 измененных файлов с 20 добавлено и 20 удалено
  1. 3 20
      src/client/js/components/LoginForm.jsx
  2. 17 0
      src/server/views/login.html

+ 3 - 20
src/client/js/components/LoginForm.jsx

@@ -70,24 +70,6 @@ class LoginForm extends React.Component {
     );
     );
   }
   }
 
 
-  // [TODO][GW-1865]
-  // onHoverCollapseOnMobile() {
-  // if (isExternalAuthCollapsible) {
-  //   const isMobile = /iphone|ipad|android/.test(window.navigator.userAgent.toLowerCase());
-
-  //   if (!isMobile) {
-  //     $(".collapse-anchor").hover(
-  //       function () {
-  //         $('.collapse-external-auth').collapse('show');
-  //       },
-  //       function () {
-  //         $('.collapse-external-auth').collapse('hide');
-  //       }
-  //     );
-  //   }
-  // }
-  // }
-
   renderExternalAuthLoginForm() {
   renderExternalAuthLoginForm() {
     const { isLocalStrategySetup, isLdapStrategySetup, objOfIsExternalAuthEnableds } = this.props;
     const { isLocalStrategySetup, isLdapStrategySetup, objOfIsExternalAuthEnableds } = this.props;
     const isExternalAuthCollapsible = isLocalStrategySetup || isLdapStrategySetup;
     const isExternalAuthCollapsible = isLocalStrategySetup || isLdapStrategySetup;
@@ -136,7 +118,7 @@ class LoginForm extends React.Component {
 
 
     const isLocalOrLdapStrategiesEnabled = isLocalStrategySetup || isLdapStrategySetup;
     const isLocalOrLdapStrategiesEnabled = isLocalStrategySetup || isLdapStrategySetup;
     const registerFormClass = isRegistrationEnabled ? 'to-flip' : '';
     const registerFormClass = isRegistrationEnabled ? 'to-flip' : '';
-    const isExternalAuthEnabled = Object.values(objOfIsExternalAuthEnableds).some(elem => elem);
+    const isSomeExternalAuthEnabled = Object.values(objOfIsExternalAuthEnableds).some(elem => elem);
 
 
     return (
     return (
       <div className={`login-dialog mx-auto flipper ${registerFormClass}`} id="login-dialog">
       <div className={`login-dialog mx-auto flipper ${registerFormClass}`} id="login-dialog">
@@ -144,8 +126,9 @@ class LoginForm extends React.Component {
           <div className="col-12">
           <div className="col-12">
             <div className="front">
             <div className="front">
               { isLocalOrLdapStrategiesEnabled && this.renderLocalOrLdapLoginForm() }
               { isLocalOrLdapStrategiesEnabled && this.renderLocalOrLdapLoginForm() }
-              { isExternalAuthEnabled && this.renderExternalAuthLoginForm() }
+              { isSomeExternalAuthEnabled && this.renderExternalAuthLoginForm() }
             </div>
             </div>
+            {/* [TODO][GW-1863] render register form here */}
           </div>
           </div>
         </div>
         </div>
         {isRegistrationEnabled && (
         {isRegistrationEnabled && (

+ 17 - 0
src/server/views/login.html

@@ -212,6 +212,23 @@
 
 
 
 
 {% block body_end %}
 {% block body_end %}
+<!-- [TODO][GW-1865] -->
+{% if isExternalAuthCollapsible %}
+<script>
+  const isMobile = /iphone|ipad|android/.test(window.navigator.userAgent.toLowerCase());
+
+  if (!isMobile) {
+    $(".collapse-anchor").hover(
+      function() {
+        $('.collapse-external-auth').collapse('show');
+      },
+      function() {
+        $('.collapse-external-auth').collapse('hide');
+      }
+    );
+  }
+</script>
+{% endif %}
 <script>
 <script>
   // login
   // login
   $('#register').on('click', function() {
   $('#register').on('click', function() {