Remove Duplicate Event Listener Code (#3987)

* Remove duplicate event listener code * Ensure that js files are not cached
Azure · Aug 23, 2022 · 8c95aef · 8c95aef
1 parent f429646
commit 8c95aef
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 20 deletions.
diff --git a/src/dotnet/APIView/APIViewWeb/Client/src/api.ts b/src/dotnet/APIView/APIViewWeb/Client/src/api.ts
diff --git a/src/dotnet/APIView/APIViewWeb/Client/src/main.ts b/src/dotnet/APIView/APIViewWeb/Client/src/main.ts
diff --git a/src/dotnet/APIView/APIViewWeb/Client/src/navbar.ts b/src/dotnet/APIView/APIViewWeb/Client/src/navbar.ts
@@ -1,12 +1,5 @@
-import Split from "split.js";
 import { updatePageSettings } from "./helpers";
 
-addEventListener("load", () => {
-    $(".nav-list-toggle").click(function () {
-        $(this).parents(".nav-list-group").first().toggleClass("nav-list-collapsed");
-    });
-});
-
 $(() => {
     const themeSelector = $( '#theme-selector' );
 

diff --git a/src/dotnet/APIView/APIViewWeb/Client/src/review.ts b/src/dotnet/APIView/APIViewWeb/Client/src/review.ts
@@ -44,10 +44,9 @@ $(() => {
 
   /* ADD EVENT LISTENER FOR TOGGLING LEFT NAVIGATION
   --------------------------------------------------------------------------------------------------------------------------------------------------------*/
-  addEventListener("load", () => {
-    $(".nav-list-toggle").click(function () {
-      $(this).parents(".nav-list-group").first().toggleClass("nav-list-collapsed");
-    });
+  $(".nav-list-toggle").on('click', function (e) {
+    $(this).parents(".nav-list-group").first().toggleClass("nav-list-collapsed");
+    console.log(e);
   });
 
   /* SPLIT REVIEW PAGE CONTENT

diff --git a/src/dotnet/APIView/APIViewWeb/Client/webpack.config.js b/src/dotnet/APIView/APIViewWeb/Client/webpack.config.js
@@ -11,8 +11,6 @@ module.exports = {
     navbar: './src/navbar.ts',
     review: './src/review.ts',
     reviews: './src/reviews.ts',
-    main: './src/main.ts',
-    api: './src/api.ts',
     site: './css/site.scss'
   },
   devtool: 'source-map',
@@ -57,4 +55,4 @@ module.exports = {
     filename: '[name].js',
     path: path.resolve(__dirname, '../wwwroot'),
   },
-}
+}
diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Index.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/Index.cshtml
@@ -11,7 +11,8 @@
 }
 @section Scripts
 {
-   <script  type="text/javascript" src="@Url.Content("~/reviews.js")"></script>
+    <script type="text/javascript" src="@Url.Content("~/reviews.js")" asp-append-version="true"></script>
+    <script type="text/javascript" src="@Url.Content("~/fileInput.js")" asp-append-version="true"></script>
 }
 <nav class="navbar-light shadow-sm bg-light sticky-top">
     <div class="container-fluid">

diff --git a/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/ReviewLayout.cshtml b/src/dotnet/APIView/APIViewWeb/Pages/Assemblies/ReviewLayout.cshtml
@@ -1,10 +1,10 @@
 @section Scripts
 {
-   <script  type="text/javascript" src="@Url.Content("~/review.js")"></script>
-   <script  type="text/javascript" src="@Url.Content("~/comments.js")"></script>
-   <script  type="text/javascript" src="@Url.Content("~/api.js")"></script>
-   <script  type="text/javascript" src="@Url.Content("~/fileInput.js")"></script>
-   <script  type="text/javascript" src="@Url.Content("~/revisions.js")"></script>
+    <script type="text/javascript" src="@Url.Content("~/review.js")" asp-append-version="true"></script>
+    <script type="text/javascript" src="@Url.Content("~/comments.js")" asp-append-version="true"></script>
+    <script type="text/javascript" src="@Url.Content("~/api.js")" asp-append-version="true"></script>
+    <script type="text/javascript" src="@Url.Content("~/fileInput.js")" asp-append-version="true"></script>
+    <script type="text/javascript" src="@Url.Content("~/revisions.js")" asp-append-version="true"></script>
 }
 @{
     Layout = "Shared/_Layout";