Skip to content
This repository was archived by the owner on Oct 6, 2023. It is now read-only.

Commit 8b3207d

Browse files
author
sowerstl
committed
Update to jQuery 3.4.1; (DOECODE-831)
1 parent 31032fa commit 8b3207d

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

src/main/webapp/WEB-INF/jsp/api.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title>DOE CODE API Documentation</title>
1616

1717
<!-- Flatdoc -->
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1919
<script src='${pageContext.request.contextPath}/js/legacy.js'></script>
20-
<script src='${pageContext.request.contextPath}/js/flatdoc.js'></script>
20+
<script src='${pageContext.request.contextPath}/js/flatdoc-0.90-jq3.js'></script>
2121

2222
<!-- Flatdoc theme -->
2323
<link href="${pageContext.request.contextPath}/css/flatdoc-theme.css" rel="stylesheet">

src/main/webapp/WEB-INF/jsp/metadata.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title>DOE CODE Metadata API Documentation</title>
1616

1717
<!-- Flatdoc -->
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1919
<script src='${pageContext.request.contextPath}/js/legacy.js'></script>
20-
<script src='${pageContext.request.contextPath}/js/flatdoc.js'></script>
20+
<script src='${pageContext.request.contextPath}/js/flatdoc-0.90-jq3.js'></script>
2121

2222
<!-- Flatdoc theme -->
2323
<link href="${pageContext.request.contextPath}/css/flatdoc-theme.css" rel="stylesheet">

src/main/webapp/WEB-INF/jsp/search.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title>DOE CODE Search API Documentation</title>
1616

1717
<!-- Flatdoc -->
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1919
<script src='${pageContext.request.contextPath}/js/legacy.js'></script>
20-
<script src='${pageContext.request.contextPath}/js/flatdoc.js'></script>
20+
<script src='${pageContext.request.contextPath}/js/flatdoc-0.90-jq3.js'></script>
2121

2222
<!-- Flatdoc theme -->
2323
<link href="${pageContext.request.contextPath}/css/flatdoc-theme.css" rel="stylesheet">

src/main/webapp/WEB-INF/jsp/siteservices.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title>DOE CODE Site Services API Documentation</title>
1616

1717
<!-- Flatdoc -->
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1919
<script src='${pageContext.request.contextPath}/js/legacy.js'></script>
20-
<script src='${pageContext.request.contextPath}/js/flatdoc.js'></script>
20+
<script src='${pageContext.request.contextPath}/js/flatdoc-0.90-jq3.js'></script>
2121

2222
<!-- Flatdoc theme -->
2323
<link href="${pageContext.request.contextPath}/css/flatdoc-theme.css" rel="stylesheet">

src/main/webapp/WEB-INF/jsp/types.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title>DOE CODE Types API Documentation</title>
1616

1717
<!-- Flatdoc -->
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1919
<script src='${pageContext.request.contextPath}/js/legacy.js'></script>
20-
<script src='${pageContext.request.contextPath}/js/flatdoc.js'></script>
20+
<script src='${pageContext.request.contextPath}/js/flatdoc-0.90-jq3.js'></script>
2121

2222
<!-- Flatdoc theme -->
2323
<link href="${pageContext.request.contextPath}/css/flatdoc-theme.css" rel="stylesheet">

src/main/webapp/WEB-INF/jsp/userservices.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title>DOE CODE User Services API Documentation</title>
1616

1717
<!-- Flatdoc -->
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1919
<script src='${pageContext.request.contextPath}/js/legacy.js'></script>
20-
<script src='${pageContext.request.contextPath}/js/flatdoc.js'></script>
20+
<script src='${pageContext.request.contextPath}/js/flatdoc-0.90-jq3.js'></script>
2121

2222
<!-- Flatdoc theme -->
2323
<link href="${pageContext.request.contextPath}/css/flatdoc-theme.css" rel="stylesheet">

src/main/webapp/WEB-INF/jsp/validation.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title>DOE CODE Validation API Documentation</title>
1616

1717
<!-- Flatdoc -->
18-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
18+
<script src="//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
1919
<script src='${pageContext.request.contextPath}/js/legacy.js'></script>
20-
<script src='${pageContext.request.contextPath}/js/flatdoc.js'></script>
20+
<script src='${pageContext.request.contextPath}/js/flatdoc-0.90-jq3.js'></script>
2121

2222
<!-- Flatdoc theme -->
2323
<link href="${pageContext.request.contextPath}/css/flatdoc-theme.css" rel="stylesheet">

src/main/webapp/js/flatdoc.js renamed to src/main/webapp/js/flatdoc-0.90-jq3.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,8 @@
502502
// http://stackoverflow.com/questions/298750/how-do-i-select-text-nodes-with-jquery
503503
function getTextNodesIn(el) {
504504
var exclude = 'iframe,pre,code';
505-
return $(el).find(':not('+exclude+')').andSelf().contents().filter(function() {
505+
// changed andSelf() to addBack() for use with JQuery 3.x
506+
return $(el).find(':not('+exclude+')').addBack().contents().filter(function() {
506507
return this.nodeType == 3 && $(this).closest(exclude).length === 0;
507508
});
508509
}

0 commit comments

Comments
 (0)