Skip to content

issue204942/javascript_module_support #1155

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

Merged
claudiamurialdo merged 1 commit into from
Jun 24, 2025
Merged

issue204942/javascript_module_support #1155

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
9 changes: 7 additions & 2 deletions dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ public interface IGxContext

void AddJavascriptSource(string jsSrc, string urlBuildNumber);
void AddJavascriptSource(string jsSrc, string urlBuildNumber, bool userDefined, bool inlined);
void AddJavascriptSource(string jsSrc, string urlBuildNumber, bool userDefined, bool inlined, bool isModule);
void AddDeferredJavascriptSource(string jsSrc, string urlBuildNumber);
void AddStyleSheetFile(string styleSheet);
void AddWebAppManifest();
Expand Down Expand Up @@ -922,7 +923,11 @@ public void AddDeferredFrags()
}
}

public void AddJavascriptSource(string jsSrc, string urlBuildNumber, bool userDefined, bool isInlined)
public void AddJavascriptSource(string jsSrc, string urlBuildNumber, bool userDefined, bool isInlined) {
AddJavascriptSource(jsSrc, urlBuildNumber, userDefined, isInlined, false);
}

public void AddJavascriptSource(string jsSrc, string urlBuildNumber, bool userDefined, bool isInlined, bool isModule)
{
if (!string.IsNullOrWhiteSpace(jsSrc) && !JavascriptSourceAdded(jsSrc))
{
Expand All @@ -934,7 +939,7 @@ public void AddJavascriptSource(string jsSrc, string urlBuildNumber, bool userDe
queryString = "";
attributes = "data-gx-external-script";
}
string fragment = "<script type=\"text/javascript\" src=\"" + GetCompleteURL(jsSrc) + queryString + "\" " + attributes + "></script>";
string fragment = "<script type=\""+ (isModule ? "module" : "text/javascript") + "\" src=\"" + GetCompleteURL(jsSrc) + queryString + "\" " + attributes + "></script>";
if (isAjaxRequest() || isInlined || jsSrc == "jquery.js" || jsSrc == "gxcore.js")
{
WriteHtmlText(fragment);
Expand Down
Loading