diff --git a/app/views/bootstrap/layout.scala.html b/app/views/bootstrap/layout.scala.html index 6a88de0b9..f10315daa 100755 --- a/app/views/bootstrap/layout.scala.html +++ b/app/views/bootstrap/layout.scala.html @@ -32,7 +32,7 @@ <meta name="theme-color" content="#333"> @if(scripts) { - <script type="text/javascript" src="@routes.Assets.at("lib/jquery/jquery.min.js")"></script> + <script type="text/javascript" src="@routes.Assets.at("lib/jquery/dist/jquery.min.js")"></script> } </head> <body class="site"> @@ -52,7 +52,7 @@ <script type="text/javascript" src="@routes.Assets.at("lib/moment/min/moment.min.js")"></script> <script type="text/javascript" src="@routes.Assets.at("bootstrap/js/bootstrap.min.js")"></script> <script type="text/javascript" src="@routes.Assets.at("lib/filesize/lib/filesize.js")"></script> - <script type="text/javascript" src="@routes.Assets.at("lib/clipboard/clipboard.min.js")"></script> + <script type="text/javascript" src="@routes.Assets.at("lib/clipboard/dist/clipboard.min.js")"></script> <script type="text/javascript" src="@routes.Assets.at("highlight/highlight.pack.js")"></script> <script type="text/javascript" src="@routes.Assets.at("javascripts/main.js")"></script> <script type="text/javascript" src="@routes.Assets.at("javascripts/svg.js")"></script> diff --git a/app/views/users/admin/stats.scala.html b/app/views/users/admin/stats.scala.html index 39d3e4ac2..ffb6aff85 100644 --- a/app/views/users/admin/stats.scala.html +++ b/app/views/users/admin/stats.scala.html @@ -39,7 +39,7 @@ <h4 class="panel-title pull-left">Flags</h4> </div> </div> </div> - <script nonce="@nonce" src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.min.js"></script> + <script nonce="@nonce" type="text/javascript" src="@routes.Assets.at("lib/chart.js/dist/Chart.min.js")"></script> <script nonce="@nonce"> $(function(){ var domChartReview = document.getElementById("chart-reviews"); diff --git a/build.sbt b/build.sbt index 4aea15d40..f9be5d6b9 100755 --- a/build.sbt +++ b/build.sbt @@ -35,11 +35,12 @@ libraryDependencies ++= Seq( "com.vladsch.flexmark" % "flexmark-ext-typographic" % "0.34.0", "com.vladsch.flexmark" % "flexmark-ext-wikilink" % "0.34.0", - "org.webjars" % "jquery" % "2.2.4", - "org.webjars" % "font-awesome" % "4.7.0", + "org.webjars.npm" % "jquery" % "2.2.4", + "org.webjars.npm" % "font-awesome" % "4.7.0", "org.webjars.npm" % "filesize" % "3.6.1", "org.webjars.npm" % "moment" % "2.22.2", - "org.webjars.bowergithub.zenorocha" % "clipboard.js" % "2.0.1" + "org.webjars.npm" % "clipboard" % "2.0.1", + "org.webjars.npm" % "chart.js" % "2.7.2" ) unmanagedResourceDirectories in Test += (baseDirectory.value / "target/web/public/test")