diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-24 15:38:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 15:38:29 -0600 |
| commit | 8aedebff22b99e569735946ea709c6f0c1e4459d (patch) | |
| tree | 4cfe1c29dd8dc06b157fb00ea7bee22008526cf2 /core | |
| parent | 4f73911bab1e8f4614104b751eda0ad4834e7c5e (diff) | |
| parent | 6a4fde11e63f7168b0cceb55f1d805d19e13f56f (diff) | |
| download | nextcloud-server-8aedebff22b99e569735946ea709c6f0c1e4459d.tar.gz nextcloud-server-8aedebff22b99e569735946ea709c6f0c1e4459d.zip | |
Merge pull request #4044 from nextcloud/merge-login-js
Merge login JS
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/merged-login.json | 5 | ||||
| -rw-r--r-- | core/templates/login.php | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/js/merged-login.json b/core/js/merged-login.json new file mode 100644 index 00000000000..5aea3f8e157 --- /dev/null +++ b/core/js/merged-login.json @@ -0,0 +1,5 @@ +[ + "visitortimezone.js", + "lostpassword.js", + "login.js" +] diff --git a/core/templates/login.php b/core/templates/login.php index 352893bd0dc..8545e5d07df 100644 --- 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]--> |