SAK-40699 - WebJars: Upgrade datatables from 1.10.16 to 1.10.16 (saka…

…iproject#6050)
JackyCheungBoy · Sep 27, 2018 · e2cea62 · e2cea62
1 parent fc1382e
commit e2cea62
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/library/pom.xml b/library/pom.xml
@@ -200,7 +200,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>datatables</artifactId>
-			<version>1.10.16</version>
+			<version>1.10.19</version>
 			<scope>runtime</scope>
 		</dependency>
   		<dependency>

diff --git a/library/src/webapp/js/headscripts.js b/library/src/webapp/js/headscripts.js
@@ -788,6 +788,9 @@ function includeWebjarLibrary(library) {
 		libraryVersion = "4.0.5";
 		document.write('\x3Cscript type="text/javascript" src="' + webjars + 'select2/' + libraryVersion + '/js/select2.full.min.js' + ver + '">' + '\x3C/script>');
 		document.write('\x3Clink rel="stylesheet" href="' + webjars + 'select2/' + libraryVersion + '/css/select2.min.css' + ver + '"/>');
+	} else if (library == 'datatables') {
+		libraryVersion = "1.10.19";
+		document.write('\x3Cscript type="text/javascript" src="' + webjars + 'datatables/' + libraryVersion + '/js/jquery.dataTables.min.js' + ver + '">' + '\x3C/script>');
 	} else {
 		if (library.endsWith(".js")) {
 			document.write('\x3Cscript type="text/javascript" src="' + webjars + library + ver + '">' + '\x3C/script>');

diff --git a/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp b/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp
@@ -36,7 +36,7 @@
 <body onload="<%= request.getAttribute("html.body.onload") %>">
     <div class="portletBody container-fluid">
 
-    <script src="/library/webjars/datatables/1.10.16/js/jquery.dataTables.min.js"></script>
+    <script type="text/JavaScript">includeWebjarLibrary('datatables');</script>
     <script type="text/JavaScript">includeWebjarLibrary('bootstrap-multiselect');</script>
     <script type="text/javascript" src="/samigo-app/js/info.js"></script>
     <script type="text/javascript" src="/samigo-app/js/naturalSort.js"></script>

diff --git a/samigo/samigo-app/src/webapp/jsf/author/createAssessment_title.jsp b/samigo/samigo-app/src/webapp/jsf/author/createAssessment_title.jsp
@@ -39,7 +39,7 @@
     <h:form id="authorIndexForm">
         <!-- HEADINGS -->
         <%@ include file="/jsf/author/editAssessmentHeadings.jsp" %>
-        <script src="/library/webjars/datatables/1.10.16/js/jquery.dataTables.min.js"></script>
+        <script type="text/JavaScript">includeWebjarLibrary('datatables');</script>
         <script type="text/javascript" src="/samigo-app/js/info.js"></script>
 
         <div class="samigo-container">

diff --git a/samigo/samigo-app/src/webapp/jsf/select/selectIndex_content.jsp b/samigo/samigo-app/src/webapp/jsf/select/selectIndex_content.jsp
@@ -36,7 +36,7 @@
     <h:outputText  value="#{select.secureDeliveryHTMLFragments}" escape="false" />
 
     <!--JAVASCRIPT -->
-    <script src="/library/webjars/datatables/1.10.16/js/jquery.dataTables.min.js"></script>
+    <script type="text/JavaScript">includeWebjarLibrary('datatables');</script>
     <script type="text/javascript" src="/samigo-app/js/naturalSort.js"></script>
     <script type="text/JavaScript">
         $(document).ready(function() {