Merge pull request #4044 from nextcloud/merge-login-js

Merge login JS
2017-03-24 15:38:29 -06:00 · 2017-03-24 15:38:29 -06:00 · 8aedebff22
parent 4f73911bab 6a4fde11e6
commit 8aedebff22
2 changed files with 6 additions and 5 deletions
--- a/core/js/merged-login.json
+++ b/core/js/merged-login.json
@ -0,0 +1,5 @@
+[
+  "visitortimezone.js",
+  "lostpassword.js",
+  "login.js"
+]
--- a/core/templates/login.php
+++ b/core/templates/login.php
@ -1,11 +1,7 @@
 <?php /** @var $l \OCP\IL10N */ ?>
 <?php
 vendor_script('jsTimezoneDetect/jstz');
-script('core', [
-	'visitortimezone',
-	'lostpassword',
-	'login'
-]);
+script('core', 'merged-login');
 ?>

 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->