Simplify debug switch for Fomantic minified files

aardvark-platform · Feb 15, 2024 · 20845fa · 20845fa
1 parent 0d1893e
commit 20845fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/Aardvark.UI.Primitives/Primitives/SimplePrimitives.fs b/src/Aardvark.UI.Primitives/Primitives/SimplePrimitives.fs
@@ -21,13 +21,8 @@ module SimplePrimitives =
 
         let semui =
             [
-                #if DEBUG
                 { kind = Stylesheet; name = "semui"; url = "./resources/fomantic/semantic.css" }
                 { kind = Script; name = "semui"; url = "./resources/fomantic/semantic.js" }
-                #else
-                { kind = Stylesheet; name = "semui"; url = "./resources/fomantic/semantic.min.css" }
-                { kind = Script; name = "semui"; url = "./resources/fomantic/semantic.min.js" }
-                #endif
                 { kind = Stylesheet; name = "semui-overrides"; url = "./resources/fomantic/semantic-overrides.css" }
                 { kind = Script; name = "essential"; url = "./resources/essentialstuff.js" }
             ]

diff --git a/src/Aardvark.UI/Aardvark.UI.fsproj b/src/Aardvark.UI/Aardvark.UI.fsproj
@@ -29,8 +29,10 @@
     <EmbeddedResource Include="resources\fomantic\themes\default\**">
       <LogicalName>resources\fomantic\themes\default\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="resources\fomantic\semantic.min.js" LogicalName="resources/fomantic/semantic.min.js" />
-    <EmbeddedResource Include="resources\fomantic\semantic.min.css" LogicalName="resources/fomantic/semantic.min.css" />
+    <EmbeddedResource Include="resources\fomantic\semantic.js" LogicalName="resources/fomantic/semantic.js" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
+    <EmbeddedResource Include="resources\fomantic\semantic.css" LogicalName="resources/fomantic/semantic.css" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
+    <EmbeddedResource Include="resources\fomantic\semantic.min.js" LogicalName="resources/fomantic/semantic.js" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
+    <EmbeddedResource Include="resources\fomantic\semantic.min.css" LogicalName="resources/fomantic/semantic.css" Condition="'$(Configuration)|$(Platform)'!='Debug|AnyCPU'" />
     <EmbeddedResource Include="resources\fomantic\semantic-overrides.css" LogicalName="resources/fomantic/semantic-overrides.css" />
     <EmbeddedResource Include="resources\aardvark.js" />
     <EmbeddedResource Include="resources\aardvark.css" />
@@ -47,10 +49,6 @@
 	  <None Include="paket.references" />
 	  <None Include="paket.template" />
   </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <EmbeddedResource Include="resources\fomantic\semantic.js" LogicalName="resources/fomantic/semantic.js" />
-    <EmbeddedResource Include="resources\fomantic\semantic.css" LogicalName="resources/fomantic/semantic.css" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aardvark.Service\Aardvark.Service.fsproj" />
   </ItemGroup>

diff --git a/src/Aardvark.UI/resources/aardvark.js b/src/Aardvark.UI/resources/aardvark.js
@@ -1001,9 +1001,9 @@ if (!aardvark.openFileDialog) {
 
         var refs =
             [
-                { kind: "stylesheet", name: "semui-css", url: "./resources/fomantic/semantic.min.css" },
+                { kind: "stylesheet", name: "semui-css", url: "./resources/fomantic/semantic.css" },
                 { kind: "stylesheet", name: "semui-overrides-css", url: "./resources/fomantic/semantic-overrides.css" },
-                { kind: "script", name: "semui-js", url: "./resources/fomantic/semantic.min.js" },
+                { kind: "script", name: "semui-js", url: "./resources/fomantic/semantic.js" },
                 { kind: "stylesheet", name: "jtree-base", url: "https://cdnjs.cloudflare.com/ajax/libs/jstree/3.1.1/themes/default/style.min.css" },
                 { kind: "stylesheet", name: "jtree-dark", url: "https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.3/themes/default-dark/style.min.css" },
                 { kind: "script", name: "jstree", url: "https://cdnjs.cloudflare.com/ajax/libs/jstree/3.1.1/jstree.min.js" },