move window onload function into js file luyadev#1481 fix luyadev#1460

dev7ch · Sep 12, 2017 · 8f650f6 · 8f650f6
1 parent 4d7fd6f
commit 8f650f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/modules/admin/src/resources/dist/js/login.js b/modules/admin/src/resources/dist/js/login.js
@@ -88,10 +88,6 @@ var observeLogin = function (form, url, secureUrl) {
     });
 };
 
-$(window).load(function () {
-    $('.login-logo').addClass('login-logo-loaded');
-    $('.login-form').addClass('login-form-loaded');
-});
 
 var checkInputLabels = function () {
     var $loginInput = $('.login-input');
@@ -117,4 +113,10 @@ var checkInputLabels = function () {
     });
 };
 
+$(window).load(function () {
+    $('.login-logo').addClass('login-logo-loaded');
+    $('.login-form').addClass('login-form-loaded');
+    checkInputLabels();
+});
+
 
diff --git a/modules/admin/src/resources/js/login.js b/modules/admin/src/resources/js/login.js
@@ -88,10 +88,6 @@ var observeLogin = function (form, url, secureUrl) {
     });
 };
 
-$(window).load(function () {
-    $('.login-logo').addClass('login-logo-loaded');
-    $('.login-form').addClass('login-form-loaded');
-});
 
 var checkInputLabels = function () {
     var $loginInput = $('.login-input');
@@ -117,4 +113,10 @@ var checkInputLabels = function () {
     });
 };
 
+$(window).load(function () {
+    $('.login-logo').addClass('login-logo-loaded');
+    $('.login-form').addClass('login-form-loaded');
+    checkInputLabels();
+});
+
 
diff --git a/modules/admin/src/views/login/index.php b/modules/admin/src/views/login/index.php
@@ -91,6 +91,4 @@
             <a href="https://twitter.com/luyadev" target="_blank" class="login-link">@luyadev</a>
         </li>
     </ul>
-</div>
-
-<? $this->registerJS('$(window).load(function () { checkInputLabels();});'); ?>
+</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,6 +91,4 @@ @@
                 <a href="https://twitter.com/luyadev" target="_blank" class="login-link">@luyadev</a>
             </li>
         </ul>
-    </div>
-    <? $this->registerJS('$(window).load(function () { checkInputLabels();});'); ?>
+    </div>