From 461edf0c20c2dc5055714608abbcc8b6511317c0 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Wed, 9 Aug 2017 14:26:47 +0100
Subject: [PATCH] Javascript loading improvements

---
 .../individual--foaf-person-2column.ftl       | 16 ++++++----
 .../individual--foaf-person-quickview.ftl     | 16 ++++++----
 .../individual/individual--foaf-person.ftl    |  4 +--
 .../freemarker/body/individual/individual.ftl |  6 ++--
 .../individual-dept-active-grants.ftl         |  2 +-
 .../individual/individual--foaf-person.ftl    | 32 ++++++++++++-------
 .../tenderfoot/templates/page/page-home.ftl   |  2 +-
 .../templates/individual--foaf-person.ftl     |  4 +--
 .../themes/wilma/templates/page-home.ftl      |  2 +-
 9 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
index 37012404..0cff8120 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
@@ -198,13 +198,15 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/
                   '<script type="text/javascript" src="${urls.base}/js/json2.js"></script>',
                   '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js?vers=1.5.1"></script>',
-			  '<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js?vers=1.5.1"></script>',
+			  '<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
+              '<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
+              '<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
 
 <script type="text/javascript">
     i18n_confirmDelete = "${i18n().confirm_delete}";
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
index 8791ded6..9ce4ab57 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
@@ -259,13 +259,15 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/
                   '<script type="text/javascript" src="${urls.base}/js/json2.js"></script>',
                   '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/individual/individualProfilePageType.js"></script>',
+              '<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
+              '<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
+              '<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
 
 <script type="text/javascript">
     i18n_confirmDelete = "${i18n().confirm_delete}";
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
index f697e2b1..bc0a91bb 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -21,8 +21,8 @@
 
 <#include "individual-setup.ftl">
 
-${scripts.add('<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}
-${scripts.add('<script type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
 
 <#-- 
     First, check to see if profile page types are enabled. If not, get the 2 column template:
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
index 2634a056..6e0d410e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
@@ -43,6 +43,6 @@ var i18nStrings = {
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />')}
 
 ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>')}
-${scripts.add('<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}
-${scripts.add('<script type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
index 971aba16..872e318c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl
@@ -35,5 +35,5 @@
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/pageList.css" />')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
+${scripts.add('<script async type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
 
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
index 9b212dcf..145748bb 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
@@ -162,17 +162,25 @@
     };
 </script>
 
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
-'<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
-'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
-'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
+${stylesheets.add(
+	'<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
+	'<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
+	'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
+	'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />'
+)}
 
-${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
-'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',
-'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
+${headScripts.add(
+	'<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
+	'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',
+	'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>'
+)}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
-'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
-'<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
-'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
-'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+${scripts.add(
+	'<script async type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
+	'<script async type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
+	'<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
+	'<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>'
+)}
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
index 6d1dda9c..5b8e920b 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
@@ -21,7 +21,7 @@
         <#if geoFocusMapsEnabled >
             <#include "geoFocusMapScripts.ftl">
         </#if>
-        <script type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
+        <script async type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
     </head>
     
     <body class="${bodyClasses!}" onload="${bodyOnload!}">
diff --git a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
index 20ceb298..b01c531d 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
@@ -176,8 +176,8 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/in
 			  '<script type="text/javascript" src="${urls.base}/js/individual/moreLessController.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
-              '<script type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
-              '<script type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
+              '<script async type="text/javascript" src="https://d1bxh8uas1mnw7.cloudfront.net/assets/embed.js"></script>',
+              '<script async type="text/javascript" src="//cdn.plu.mx/widget-popup.js"></script>')}
 
 <script type="text/javascript">
     i18n_confirmDelete = "${i18n().confirm_delete}";
diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
index 282ac983..74e2aa36 100644
--- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
+++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl
@@ -21,7 +21,7 @@
         <#if geoFocusMapsEnabled >
             <#include "geoFocusMapScripts.ftl">
         </#if>
-        <script type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
+        <script async type="text/javascript" src="${urls.base}/js/homePageUtils.js?version=x"></script>
     </head>
     
     <body class="${bodyClasses!}" onload="${bodyOnload!}">