SAK-40704 - WebJars: Update pnotify from 2.1.0-1 to 3.2.1 (sakaiproje…

…ct#6054)
fk-snyk · Sep 28, 2018 · aaef026 · aaef026
1 parent b063ac5
commit aaef026
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/library/pom.xml b/library/pom.xml
@@ -153,7 +153,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>pnotify</artifactId>
-			<version>2.1.0-1</version>
+			<version>3.2.1</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>

diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm
@@ -63,8 +63,8 @@
         <link href="${pageWebjarsPath}jquery-ui/1.12.1/jquery-ui.min.css$!{portalCDNQuery}" rel="stylesheet" />  
         <link href="${pageScriptPath}jquery/cluetip/1.2.10/css/jquery.cluetip.css$!{portalCDNQuery}" rel="stylesheet">
         <link href="${pageWebjarsPath}qtip2/3.0.3/jquery.qtip.min.css$!{portalCDNQuery}" rel="stylesheet">
-        <link href="${pageWebjarsPath}pnotify/2.1.0/pnotify.core.min.css$!{portalCDNQuery}" rel="stylesheet">
-	<link href="${pageWebjarsPath}pnotify/2.1.0/pnotify.buttons.min.css$!{portalCDNQuery}" rel="stylesheet">
+        <link href="${pageWebjarsPath}pnotify/3.2.1/pnotify.css$!{portalCDNQuery}" rel="stylesheet">
+	<link href="${pageWebjarsPath}pnotify/3.2.1/pnotify.buttons.css$!{portalCDNQuery}" rel="stylesheet">
         <link href="${pageWebjarsPath}cropper/4.0.0/dist/cropper.min.css$!{portalCDNQuery}" rel="stylesheet">
         <script src="${pageSkinRepo}/${pageSkin}/js/lib/modernizr.js$!{portalCDNQuery}"></script>
     #if ($useBullhornAlerts)

diff --git a/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm
@@ -139,8 +139,8 @@
         </script>
         <script src="/library/js/jquery/jquery.clearsearch.js$!{portalCDNQuery}"></script>
         <script src="${pageSkinRepo}/${pageSkin}/js/morpheus.scripts.min.js$!{portalCDNQuery}"></script>
-        <script src="${pageWebjarsPath}/pnotify/2.1.0/pnotify.core.min.js$!{portalCDNQuery}"></script>
-        <script src="${pageWebjarsPath}/pnotify/2.1.0/pnotify.buttons.min.js$!{portalCDNQuery}"></script>
+        <script src="${pageWebjarsPath}/pnotify/3.2.1/pnotify.js$!{portalCDNQuery}"></script>
+        <script src="${pageWebjarsPath}/pnotify/3.2.1/pnotify.buttons.js$!{portalCDNQuery}"></script>
         <script src="${pageWebjarsPath}/qtip2/3.0.3/jquery.qtip.min.js$!{portalCDNQuery}"></script>
         <script src="${pageScriptPath}jquery/qtip/tutorial.js$!{portalCDNQuery}"></script>
         <script src="${pageWebjarsPath}cropper/4.0.0/dist/cropper.min.js$!{portalCDNQuery}"></script>
@@ -188,6 +188,8 @@
             ${d}PBJQ.getJSON( "/direct/portal/notify.json", function( data ) {
                 for(i=0; i<data.error.length; i++ ) {
                      ${d}PBJQ(function(){
+                        PNotify.prototype.options.styling = "bootstrap3";
+                        PNotify.prototype.options.styling = "fontawesome";
                         new PNotify({
                             title: '${rloader.getString("pnotify_notice")}',
                             text: data.error[i],