Fix #640 WebJars: Update jQuery 3.1.0 to 3.1.1

Author: ngocdaothanh

CHANGELOG.rst

@@ -10,6 +10,8 @@
   Update JSON4S from 3.4.0 to 3.4.1
 * `#639 <https://github.com/xitrum-framework/xitrum/issues/639>`_
   Update metrics-scala from 3.5.4_a2.3 to 3.5.5_a2.3
+* `#640 <https://github.com/xitrum-framework/xitrum/issues/640>`_
+  WebJars: Update jQuery 3.1.0 to 3.1.1
 
 3.28.0:
 

build.sbt

@@ -96,7 +96,7 @@ libraryDependencies <+= scalaVersion { sv => "org.scala-lang" % "scalap" % sv }
 
 // WebJars ---------------------------------------------------------------------
 
-libraryDependencies += "org.webjars.bower" % "jquery" % "3.1.0"
+libraryDependencies += "org.webjars.bower" % "jquery" % "3.1.1"
 libraryDependencies += "org.webjars.bower" % "jquery-validation" % "1.15.1"
 libraryDependencies += "org.webjars.bower" % "sockjs-client" % "1.1.1"
 libraryDependencies += "org.webjars.bower" % "swagger-ui" % "2.1.8-M1"

src/main/scala/xitrum/action/Url.scala

@@ -7,7 +7,7 @@ import xitrum.etag.Etag
 
 object Url {
   /**
-    * Ex: publicUrl("jquery/3.1.0/dist/jquery.js")
+    * Ex: publicUrl("jquery/3.1.1/dist/jquery.js")
     *
     * @param path Relative to the "public" directory, without leading "/"
     */
@@ -24,7 +24,7 @@ object Url {
   }
 
   /**
-    * Ex: publicUrl("jquery/3.1.0/dist/jquery.js", "jquery/3.1.0/dist/jquery.min.js")
+    * Ex: publicUrl("jquery/3.1.1/dist/jquery.js", "jquery/3.1.1/dist/jquery.min.js")
     *
     * @param devPath File path to use in development mode, relative to the "public" directory, without leading "/"
     * @param prodPath File path to use in production mode, relative to the "public" directory, without leading "/"
@@ -35,7 +35,7 @@ object Url {
   }
 
   /**
-    * Ex: publicUrl("jquery/3.1.0/dist", "jquery.js", "jquery.min.js")
+    * Ex: publicUrl("jquery/3.1.1/dist", "jquery.js", "jquery.min.js")
     *
     * @param directory Relative to the "public" directory, without leading "/"
     * @param devFile File in the directory to use in development mode
@@ -58,7 +58,7 @@ object Url {
   }
 
   /**
-    * Ex: webJarsUrl("jquery/3.1.0/dist/jquery.js", "jquery/3.1.0/dist/jquery.min.js")
+    * Ex: webJarsUrl("jquery/3.1.1/dist/jquery.js", "jquery/3.1.1/dist/jquery.min.js")
     *
     * @param devPath File path to use in development mode
     * @param prodPath File path to use in production mode
@@ -69,7 +69,7 @@ object Url {
   }
 
   /**
-    * Ex: webJarsUrl("jquery/3.1.0/dist", "jquery.js", "jquery.min.js")
+    * Ex: webJarsUrl("jquery/3.1.1/dist", "jquery.js", "jquery.min.js")
     *
     * @param devFile File in the directory to use in development mode
     * @param prodFile File in the directory to use in production mode
@@ -120,22 +120,22 @@ trait Url {
   //----------------------------------------------------------------------------
 
   /**
-    * Ex: publicUrl("jquery/3.1.0/dist/jquery.js")
+    * Ex: publicUrl("jquery/3.1.1/dist/jquery.js")
     *
     * @param path Relative to the "public" directory, without leading "/"
     */
   def publicUrl(path: String) = Url.publicUrl(path)
 
   /**
-    * Ex: publicUrl("jquery/3.1.0/dist/jquery.js", "jquery/3.1.0/dist/jquery.min.js")
+    * Ex: publicUrl("jquery/3.1.1/dist/jquery.js", "jquery/3.1.1/dist/jquery.min.js")
     *
     * @param devPath File path to use in development mode, relative to the "public" directory, without leading "/"
     * @param prodPath File path to use in production mode, relative to the "public" directory, without leading "/"
     */
   def publicUrl(devPath: String, prodPath: String) = Url.publicUrl(devPath, prodPath)
 
   /**
-    * Ex: publicUrl("jquery/3.1.0/dist", "jquery.js", "jquery.min.js")
+    * Ex: publicUrl("jquery/3.1.1/dist", "jquery.js", "jquery.min.js")
     *
     * @param directory Relative to the "public" directory, without leading "/"
     * @param devFile File in the directory to use in development mode
@@ -147,15 +147,15 @@ trait Url {
   def webJarsUrl(path: String) = Url.webJarsUrl(path)
 
   /**
-    * Ex: webJarsUrl("jquery/3.1.0/dist/jquery.js", "jquery/3.1.0/dist/jquery.min.js")
+    * Ex: webJarsUrl("jquery/3.1.1/dist/jquery.js", "jquery/3.1.1/dist/jquery.min.js")
     *
     * @param devPath File path to use in development mode
     * @param prodPath File path to use in production mode
     */
   def webJarsUrl(devPath: String, prodPath: String) = Url.webJarsUrl(devPath, prodPath)
 
   /**
-    * Ex: webJarsUrl("jquery/3.1.0/dist", "jquery.js", "jquery.min.js")
+    * Ex: webJarsUrl("jquery/3.1.1/dist", "jquery.js", "jquery.min.js")
     *
     * @param devFile File in the directory to use in development mode
     * @param prodFile File in the directory to use in production mode

src/main/scala/xitrum/view/Js.scala

@@ -33,7 +33,7 @@ trait JsRenderer {
     val validateI18n = if (locale.getLanguage == "en") "" else (<script type="text/javascript" src={webJarsUrl(s"jquery-validation/1.15.1/src/localization/messages_${locale.toString}.js")}></script>)
 
     <xml:group>
-      <script type="text/javascript" src={webJarsUrl("jquery/3.1.0/dist",             "jquery.js",             "jquery.min.js")}></script>
+      <script type="text/javascript" src={webJarsUrl("jquery/3.1.1/dist",             "jquery.js",             "jquery.min.js")}></script>
       <script type="text/javascript" src={webJarsUrl("jquery-validation/1.15.1/dist", "jquery.validate.js",    "jquery.validate.min.js")}></script>
       <script type="text/javascript" src={webJarsUrl("jquery-validation/1.15.1/dist", "additional-methods.js", "additional-methods.min.js")}></script>
       {validateI18n}