From bf5f8cb71311649c18511f797e5081ba7c9952f6 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 17 May 2019 20:13:12 +0000 Subject: [PATCH] Factorize scripts-2.0.js into utils.js No need to include two different and super-small javascript "utils" files. --- .../webapp/WEB-INF/jsp/advancedSettings.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/albumMain.jsp | 1 - .../main/webapp/WEB-INF/jsp/artistMain.jsp | 1 - .../main/webapp/WEB-INF/jsp/dlnaSettings.jsp | 2 +- .../webapp/WEB-INF/jsp/generalSettings.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/help.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/left.jsp | 6 +-- .../webapp/WEB-INF/jsp/personalSettings.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/playQueue.jsp | 2 +- .../webapp/WEB-INF/jsp/playerSettings.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/right.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/starred.jsp | 6 +-- .../main/webapp/WEB-INF/jsp/userSettings.jsp | 2 +- .../src/main/webapp/script/scripts-2.0.js | 41 ------------------- airsonic-main/src/main/webapp/script/util.js | 38 +++++++++++++++-- 15 files changed, 50 insertions(+), 61 deletions(-) delete mode 100644 airsonic-main/src/main/webapp/script/scripts-2.0.js diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp index c027b0fa..ac38b74c 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp @@ -4,7 +4,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp index bc6a5979..b84a8228 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp @@ -24,7 +24,6 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp index 4cc78e33..ce6d17b3 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp @@ -21,7 +21,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp index 13301e4e..48e38e10 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp @@ -4,7 +4,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp index 3cb4686b..512d43b7 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp @@ -3,7 +3,7 @@ <%@ include file="head.jsp" %> - + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp index 2b97c022..22adce6a 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp @@ -3,7 +3,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp index f546293e..290081e7 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp @@ -4,7 +4,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp index 63e87ed4..48a14d4d 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp @@ -7,7 +7,7 @@ - + + @@ -143,10 +143,10 @@
- +
- +
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp index 3f4d8443..539a5983 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp @@ -4,7 +4,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - +