Skip to content

[jsroot] dev 29/04/2025 #18552

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+1,338 −746
Open

[jsroot] dev 29/04/2025 #18552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26ee77f
[webcanv] use getWebsocket methods
linev Apr 29, 2025
45fed6c
[webgui] introduce WebGui.Debug variable
linev Apr 29, 2025
356722f
[jsroot] dev 29/04/2025
linev Apr 29, 2025
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
2 changes: 2 additions & 0 deletions gui/webdisplay/src/RWebWindowWSHandler.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ protected:
more_args.append("winW:"s + std::to_string(fWindow.GetWidth()) + ",winH:"s + std::to_string(fWindow.GetHeight()) + ","s);
if ((fWindow.GetX() >= 0) && (fWindow.GetY() >= 0))
more_args.append("winX:"s + std::to_string(fWindow.GetX()) + ",winY:"s + std::to_string(fWindow.GetY()) + ","s);
if (GetBoolEnv("WebGui.Debug") == 1)
more_args.append("debug: true,");
auto user_args = fWindow.GetUserArgs();
if (!user_args.empty())
more_args.append("user_args: "s + user_args + ","s);
Expand Down
1 change: 1 addition & 0 deletions gui/webdisplay/src/RWebWindowsManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,7 @@ std::string RWebWindowsManager::GetUrl(RWebWindow &win, bool remote, std::string
/// WebGui.JsonComp: compression factor for JSON conversion, if not specified - each widget uses own default values
/// WebGui.ForceHttp: "no" (default), "yes" - always create real http server to run web window
/// WebGui.Console: -1 - output only console.error(), 0 - add console.warn(), 1 - add console.log() output
/// WebGui.Debug: "no" (default), "yes" - enable more debug output on JSROOT side
/// WebGui.ConnCredits: 10 - number of packets which can be send by server or client without acknowledge from receiving side
/// WebGui.openui5src: alternative location for openui5 like https://openui5.hana.ondemand.com/1.128.0/
/// WebGui.openui5libs: list of pre-loaded ui5 libs like sap.m, sap.ui.layout, sap.ui.unified
Expand Down
2 changes: 1 addition & 1 deletion js/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright � 2013-2024 JavaScript ROOT authors
Copyright � 2013-2025 JavaScript ROOT authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading
Loading