From 43646f4ee50e9b6fa21b535a9cc2feb4bbdd8aff Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 24 Mar 2017 20:45:19 +0100 Subject: [PATCH] Merge JS for notifications Removes 2 requests. Signed-off-by: Lukas Reschke --- js/merged.json | 5 +++++ lib/AppInfo/Application.php | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 js/merged.json diff --git a/js/merged.json b/js/merged.json new file mode 100644 index 000000000..a4ce30a5f --- /dev/null +++ b/js/merged.json @@ -0,0 +1,5 @@ +[ + "app.js", + "notification.js", + "richObjectStringParser.js" +] diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index ffd14e95d..c1577a0ac 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -56,9 +56,7 @@ protected function registerUserInterface() { && substr($request->getScriptName(), 0 - strlen('/index.php')) === '/index.php' && substr($request->getPathInfo(), 0, strlen('/s/')) !== '/s/' && substr($request->getPathInfo(), 0, strlen('/login/')) !== '/login/') { - Util::addScript('notifications', 'app'); - Util::addScript('notifications', 'notification'); - Util::addScript('notifications', 'richObjectStringParser'); + Util::addScript('notifications', 'merged'); Util::addStyle('notifications', 'styles'); }