Merge branch 'dev'

.editorconfig

@@ -0,0 +1,14 @@
+# https://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+max_line_length = 120
+indent_style = space
+indent_size = 4
+
+[*.md]
+indent_size = 2

.prettierrc

@@ -1,7 +1,4 @@
 {
-    "semi" : false,
-    "printWidth" : 120,
-    "requirePragma" : true,
-    "tabWidth": 4,
-    "useTabs" : false
-}
+    "semi": false,
+    "requirePragma": true
+}

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [9.5.3] - 2024-03-11
+
+### Added
+
+- Add content hash to bundle.js to fix caching [#318](https://github.com/spraakbanken/korp-frontend/issues/318)
+- Add relative hits to map view [#52](https://github.com/spraakbanken/korp-frontend/issues/52)
+- Allow static corpus config
+
+### Changed
+
+- Do not say "Results: 0" while loading
+- Switch from PEG.js to its successor Peggy
+
+### Fixed
+
+- Unnecessarily complex query when combining initial/medial/final part [#235](https://github.com/spraakbanken/korp-frontend/issues/235)
+- Disable "Show map" button if no location data is available [#238](https://github.com/spraakbanken/korp-frontend/issues/238)
+- Drop console error when loading page without `cqp` param
+
+### Removed
+
+- Dependency `jquery-deparam`
+- Dependency `jReject`
+
 ## [9.5.2] - 2024-02-21
 
 ### Added
@@ -109,6 +133,8 @@
 - Most bug fixes was related to the refactoring breaking things
 - Lots of bug fixes for the sidebar
 
+[unreleased]: https://github.com/spraakbanken/korp-frontend/compare/master...dev
+[9.5.3]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.5.3
 [9.5.2]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.5.2
 [9.5.1]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.5.1
 [9.5.0]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.5.0

app/config/statistics_config.js

@@ -1,4 +1,5 @@
 /** @format */
+import _ from "lodash"
 
 let customFunctions = {}
 

app/index.html

@@ -26,6 +26,5 @@ <h2>You need JavaScript to run Korp.</h2>
                 <results></results>
             </div>
         </div>
-        <script src="bundle.js"></script>
     </body>
 </html>

app/index.js

@@ -11,7 +11,6 @@ window.jQuery = $;
 window.$ = $;
 
 require("slickgrid/slick.grid.css")
-require("./lib/jquery.reject.css")
 require("./styles/ui_mods.css")
 require("./styles/jquery.tooltip.css")
 require("rickshaw/rickshaw.css")
@@ -27,8 +26,6 @@ require("./styles/tailwind.scss")
 require("./styles/styles.scss")
 require("./styles/textreader.css")
 
-window._ = require("lodash")
-
 require("components-jqueryui/ui/widget.js")
 require("components-jqueryui/ui/widgets/sortable.js")
 require("components-jqueryui/ui/widgets/dialog.js")
@@ -48,15 +45,12 @@ require("angular-ui-bootstrap/src/popover")
 require("angular-spinner")
 require("angular-ui-sortable/src/sortable")
 
-require("jreject")
 require("jquerylocalize")
 require("jqueryhoverintent")
 require("./lib/jquery.format.js")
 
-let deparam = require("jquery-deparam")
-
 window.c = console
-window.currentMode = deparam(window.location.search.slice(1)).mode || "default"
+window.currentMode = new URLSearchParams(window.location.search).get('mode') || "default"
 
 try {
   // modes-files are optional and have customizing code
@@ -66,7 +60,6 @@ try {
 }
 
 require("angular-dynamic-locale/dist/tmhDynamicLocale.js")
-window.Raphael = require("raphael")
 
 require("jquery-flot/jquery.flot.js")
 require("jquery-flot/jquery.flot.stack.js")
@@ -94,8 +87,6 @@ require("angular-filter/index.js")
 
 require("./lib/jquery.tooltip.pack.js")
 
-
-
 require("./scripts/components/sidebar.js")
 
 require("./scripts/statistics.js")