Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve order of script/stylesheet includes #47

Merged
merged 1 commit into from
Jan 7, 2024
Merged

Preserve order of script/stylesheet includes #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions mesa_viz_tornado/ModularVisualization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ def get(self):
port=self.application.port,
model_name=self.application.model_name,
description=self.application.description,
package_js_includes=self.application.package_js_includes,
package_css_includes=self.application.package_css_includes,
local_js_includes=self.application.local_js_includes,
local_css_includes=self.application.local_css_includes,
package_js_includes=list(self.application.package_js_includes.keys()),
package_css_includes=list(self.application.package_css_includes.keys()),
local_js_includes=list(self.application.local_js_includes.keys()),
local_css_includes=list(self.application.local_css_includes.keys()),
scripts=self.application.js_code,
)

Expand Down Expand Up @@ -314,17 +314,18 @@ def __init__(
self.visualization_elements = self._auto_convert_functions_to_TextElements(
visualization_elements
)
self.package_js_includes = set()
self.package_css_includes = set()
self.local_js_includes = set()
self.local_css_includes = set()
# Ensure uniqueness and preverse order with dicts
self.package_js_includes = {}
self.package_css_includes = {}
self.local_js_includes = {}
self.local_css_includes = {}
self.js_code = []
for element in self.visualization_elements:
for include_file in element.package_includes:
if self._is_stylesheet(include_file):
self.package_css_includes.add(include_file)
self.package_css_includes[include_file] = None
else:
self.package_js_includes.add(include_file)
self.package_js_includes[include_file] = None
if element.local_includes:
mapped_local_dir = element.__class__.__name__
element_file_handler = (
Expand All @@ -336,9 +337,9 @@ def __init__(
for include_file in element.local_includes:
include_file_path = f"{mapped_local_dir}/{include_file}"
if self._is_stylesheet(include_file):
self.local_css_includes.add(include_file_path)
self.local_css_includes[include_file_path] = None
else:
self.local_js_includes.add(include_file_path)
self.local_js_includes[include_file_path] = None
self.js_code.append(element.js_code)

# Initializing the model
Expand Down