Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Fix loading of inline <script> in base.html.erb

Alexander Brandon Coles89d61afe4c7d
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index e7d71456141..b0e250982d0 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -177,35 +177,36 @@ See COPYRIGHT and LICENSE files for more details.
</div>
<%# Properly decides main menu expanded state and width before its drawn. Fixes flickering side menu
where menu is first expanded, then being collapsed in angular. %>
-<%= nonced_javascript_tag defer: true do %>
- // execute these lines to prevent flickering when page loads:
-
- window.addEventListener('turbo:load', () => {
- (function($) {
- var wrapper = $('#wrapper');
- var savedMainMenuWidth = window.OpenProject.guardedLocalStorage("openProject-mainMenuWidth");
- var mainMenuCollapsed = window.OpenProject.guardedLocalStorage("openProject-mainMenuCollapsed");
-
- if (window.innerWidth < 1012) {
- // force hide on load for small desktops
- $('.can-hide-navigation').addClass('hidden-navigation');
- }
-
- if (mainMenuCollapsed === 'true') {
- savedMainMenuWidth = 0;
- }
-
- if (savedMainMenuWidth || savedMainMenuWidth === 0) {
- document.documentElement.style.setProperty("--main-menu-width", savedMainMenuWidth + 'px');
- }
-
- wrapper.show();
-
- // Wrapper for page-specific JS from deprecated inline functions
- // no longer available with CSP.
- <%= content_for :additional_js_dom_ready %>
- }(jQuery));
- });
+<%= nonced_javascript_tag type: "module" do %>
+ (function($) {
+ // execute these lines to prevent flickering when page loads:
+ var wrapper = $('#wrapper');
+ var savedMainMenuWidth = window.OpenProject.guardedLocalStorage("openProject-mainMenuWidth");
+ var mainMenuCollapsed = window.OpenProject.guardedLocalStorage("openProject-mainMenuCollapsed");
+
+ if (window.innerWidth < 1012) {
+ // force hide on load for small desktops
+ $('.can-hide-navigation').addClass('hidden-navigation');
+ }
+
+ if (mainMenuCollapsed === 'true') {
+ savedMainMenuWidth = 0;
+ }
+
+ if (savedMainMenuWidth || savedMainMenuWidth === 0) {
+ document.documentElement.style.setProperty("--main-menu-width", savedMainMenuWidth + 'px');
+ }
+
+ wrapper.show();
+ }(jQuery));
+<% end %>
+
+<%= nonced_javascript_tag do %>
+ (function($) {
+ // Wrapper for page-specific JS from deprecated inline functions
+ // no longer available with CSP.
+ <%= content_for :additional_js_dom_ready %>
+ }(jQuery));
<% end %>
<div class="op-wide-autocomplete-wrapper"></div>
<%= call_hook :view_layouts_base_body_bottom %>