Skip to content

Make third-party JS paths configurable #91

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

Closed
darshan-Jahagirdar wants to merge 1 commit into from
Closed

Make third-party JS paths configurable #91

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions html5-client/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ assemble-html: createdirs
perl -pe 's|##PCAP-BUTTON##|`cat $(PCAP_BUTTON_PART)`|ge' -i ${TPL}
perl -pe 's|##PCAP-DISABLED-MODAL##|`cat $(PCAP_DISABLED_MODAL_PART)`|ge' -i ${TPL}
perl -pe 's|##PRODUCT-BRANDING##|${PRODUCT_BRANDING}|ge' -i ${TPL}
perl -pe 's|##JQUERY-JS##|${JQUERY_JS}|g' -i ${TPL}
perl -pe 's|##MUSTACHE-JS##|${MUSTACHE_JS}|g' -i ${TPL}
perl -pe 's|##CBUFFER-JS##|${CBUFFER_JS}|g' -i ${TPL}
perl -pe 's|##BOOTSTRAP-BUNDLE-JS##|${BOOTSTRAP_BUNDLE_JS}|g' -i ${TPL}
perl -pe 's|##D3-JS##|${D3_JS}|g' -i ${TPL}
perl -pe 's|##PAKO-JS##|${PAKO_JS}|g' -i ${TPL}

install:
install -d ${DESTDIR}/var/lib/jittertrap/
Expand Down
12 changes: 6 additions & 6 deletions html5-client/src/html/index.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

<link rel="icon" href="favicon.svg" type="image/svg+xml">

<script type="text/javascript" src="js/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="js/mustache.min.js"></script>
<script type="text/javascript" src="js/cbuffer.js"></script>
<script type="text/javascript" src="js/bootstrap.bundle.min.js"></script>
<script type="text/javascript" src="js/d3.v7.min.js"></script>
<script type="text/javascript" src="js/pako.min.js"></script>
<script type="text/javascript" src="##JQUERY-JS##"></script>
<script type="text/javascript" src="##MUSTACHE-JS##"></script>
<script type="text/javascript" src="##CBUFFER-JS##"></script>
<script type="text/javascript" src="##BOOTSTRAP-BUNDLE-JS##"></script>
<script type="text/javascript" src="##D3-JS##"></script>
<script type="text/javascript" src="##PAKO-JS##"></script>
<script type="text/javascript" src="js/jittertrap-concat.js"></script>

</head>
Expand Down
30 changes: 30 additions & 0 deletions make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,36 @@ ifndef WEB_SERVER_DOCUMENT_ROOT
WEB_SERVER_DOCUMENT_ROOT = /var/lib/jittertrap
endif

# ------------------------------------------------------------------------------
# HTML Client Asset Locations
# ------------------------------------------------------------------------------

# Override these at build time when distribution packages serve JavaScript
# libraries from system-wide paths instead of JitterTrap's bundled web assets.
ifndef JQUERY_JS
JQUERY_JS = js/jquery-3.7.1.min.js
endif

ifndef MUSTACHE_JS
MUSTACHE_JS = js/mustache.min.js
endif

ifndef CBUFFER_JS
CBUFFER_JS = js/cbuffer.js
endif

ifndef BOOTSTRAP_BUNDLE_JS
BOOTSTRAP_BUNDLE_JS = js/bootstrap.bundle.min.js
endif

ifndef D3_JS
D3_JS = js/d3.v7.min.js
endif

ifndef PAKO_JS
PAKO_JS = js/pako.min.js
endif

# ------------------------------------------------------------------------------
# Performance Tuning
# ------------------------------------------------------------------------------
Expand Down