From 93b7f8aec7d3a5bbcbb5c72ed7796ccc5a246197 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Sun, 24 Sep 2017 18:51:18 +0100
Subject: [PATCH] Remove jQuery scripts that are included by headScripts

---
 .../body/accounts/userAccounts-associateProfilePanel.ftl      | 4 +---
 .../templates/freemarker/body/accounts/userAccounts-edit.ftl  | 4 +---
 .../freemarker/body/imageUpload/imageUpload-cropImage.ftl     | 4 +---
 .../freemarker/body/imageUpload/imageUpload-newImage.ftl      | 4 +---
 .../freemarker/body/imageUpload/imageUpload-replaceImage.ftl  | 4 +---
 .../freemarker/body/manageproxies/manageProxies-list.ftl      | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
index 717c11fe0..5654391ec 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
@@ -85,8 +85,6 @@ var associateProfileFieldsData = {
 };
 </script>
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+${scripts.add('<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/account/accountAssociateProfile.js"></script>')}   
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 3ff611d12..040156296 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -89,8 +89,6 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
+${scripts.add('<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/account/accountExternalAuthFlag.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/account/accountListenerSetup.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
index 3d77b1f5f..8729870fb 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
@@ -2,9 +2,7 @@
 
 <#-- Crop the replacement main image for an Individual, to produce a thumbnail. -->
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jcrop/jquery.Jcrop.js"></script>',
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jcrop/jquery.Jcrop.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/imageUpload/cropImage.js"></script>')}
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />',
diff --git a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index a675e3901..bb4d7346e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -2,9 +2,7 @@
 
 <#-- Upload a replacement main image for an Individual. -->
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />')}
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index 5c7fc2a48..a51f4ab26 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -2,9 +2,7 @@
 
 <#-- Upload a replacement main image for an Individual. -->
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />')}
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
index 93c427fcc..28fe3f776 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
@@ -198,9 +198,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/cust
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/autocomplete.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/proxyUtils.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/account/accountProxyCommon.js"></script>',   
               '<script type="text/javascript" src="${urls.base}/js/account/accountProxyItemsPanel.js"></script>')}