Change include files (#323)

ix-ax · Jul 2, 2024 · 79b4a91 · 79b4a91
1 parent 2119c8f
commit 79b4a91
Show file tree

Hide file tree

Showing 18 changed files with 10,977 additions and 19,539 deletions.
diff --git a/...azor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj b/...azor/src/AXSharp.Presentation.Blazor.Controls/AXSharp.Presentation.Blazor.Controls.csproj
@@ -86,7 +86,6 @@
   </ItemGroup>
 
   <ItemGroup>
-	    <Folder Include="wwwroot\css\" />
 	    <Folder Include="wwwroot\js\" />
   </ItemGroup>
 

diff --git a/...or/src/AXSharp.Presentation.Blazor.Controls/Layouts/TabControlComponents/TabControl.razor b/...or/src/AXSharp.Presentation.Blazor.Controls/Layouts/TabControlComponents/TabControl.razor
@@ -49,9 +49,6 @@
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if(firstRender)
-            await JSRuntime.InvokeAsync<IJSObjectReference>("import", "/_content/AXSharp.Presentation.Blazor.Controls/js/bootstrap.bundle.min.js");
-
         if (_module == null)
             _module = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "/_content/AXSharp.Presentation.Blazor.Controls/js/addToolTipsAndPopOvers.js");
     }

diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/wwwroot/css/ix-bootstrap.css.map b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/wwwroot/css/ix-bootstrap.css.map
diff --git a/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/wwwroot/css/ix-bootstrap.min.css b/src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/wwwroot/css/ix-bootstrap.min.css
diff --git a/...harp.blazor/src/AXSharp.Presentation.Blazor.Controls/wwwroot/css/ix-bootstrap.min.css.map b/...harp.blazor/src/AXSharp.Presentation.Blazor.Controls/wwwroot/css/ix-bootstrap.min.css.map
diff --git a/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/Pages/_Host.cshtml b/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/Pages/_Host.cshtml
@@ -14,7 +14,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>ixBlazor.App</title>
     <base href="~/" />
-    <link rel="stylesheet" href="/_content/AXSharp.Presentation.Blazor.Controls/css/ix-bootstrap.min.css">
+    <link rel="stylesheet" href="~/css/bootstrap/bootstrap.css">
     <link href="css/site.css" rel="stylesheet" />
 
 </head>
@@ -35,6 +35,6 @@
     </div>
 
     <script src="_framework/blazor.server.js"></script>
-    <script src="/_content/AXSharp.AXSharp.Presentation.Controls.Blazor-experimental/js/ix-bootstrap.bundle.min.js"></script>
+    <script src="~/js/bootstrap.bundle.min.js"></script>
 </body>
 </html>
diff --git a/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/Shared/MainLayout.razor b/src/AXSharp.blazor/tests/sandbox/IxBlazor.App/Shared/MainLayout.razor
@@ -1,5 +1,7 @@
 @inherits LayoutComponentBase
 
+@inject IJSRuntime JSRuntime
+
 <div class="sidebar">
     <NavMenu />
 </div>
@@ -10,3 +12,10 @@
     </div>
 </div>
 
+@code {
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        var module = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "/js/addToolTipsAndPopOvers.js");
+        await module.InvokeVoidAsync("addToolTipsAndPopOvers");
+    }
+}