]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge login JS 4044/head
authorLukas Reschke <lukas@statuscode.ch>
Fri, 24 Mar 2017 20:18:24 +0000 (21:18 +0100)
committerLukas Reschke <lukas@statuscode.ch>
Fri, 24 Mar 2017 20:18:24 +0000 (21:18 +0100)
Removes 2 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
core/js/merged-login.json [new file with mode: 0644]
core/templates/login.php

diff --git a/core/js/merged-login.json b/core/js/merged-login.json
new file mode 100644 (file)
index 0000000..5aea3f8
--- /dev/null
@@ -0,0 +1,5 @@
+[
+  "visitortimezone.js",
+  "lostpassword.js",
+  "login.js"
+]
index 352893bd0dc43da0e8a97cb15036d1a6d50ff1d2..8545e5d07df08070a679024b3a8fd9b5177a7384 100644 (file)
@@ -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]-->