From c7e564b73677e26764558e7685b626d94ddb9214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 20 Oct 2020 22:06:24 +0300
Subject: [PATCH] Resolved: #5874 Unify Blazor UI Framework JavaScripts

---
 .../wwwroot/abp_theming.js                    | 35 -----------------
 .../WebAssembly}/AbpUtilsService.cs           |  2 +-
 .../WebAssembly}/IAbpUtilsService.cs          |  2 +-
 .../wwwroot/abp.js                            | 38 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 38 deletions(-)
 delete mode 100644 framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/wwwroot/abp_theming.js
 rename framework/src/{Volo.Abp.AspNetCore.Components.WebAssembly.Theming => Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly}/AbpUtilsService.cs (94%)
 rename framework/src/{Volo.Abp.AspNetCore.Components.WebAssembly.Theming => Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly}/IAbpUtilsService.cs (86%)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/wwwroot/abp_theming.js b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/wwwroot/abp_theming.js
deleted file mode 100644
index 9ea2bed132..0000000000
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/wwwroot/abp_theming.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var abp = abp || {};
-(function () {
-    abp.utils = abp.utils || {};
-
-    abp.utils.addClassToTag = function (tagName, className) {
-        var tags = document.getElementsByTagName(tagName);
-        for (var i = 0; i < tags.length; i++) {
-            tags[i].classList.add(className);
-        }
-    };
-
-    abp.utils.removeClassFromTag = function (tagName, className) {
-        var tags = document.getElementsByTagName(tagName);
-        for (var i = 0; i < tags.length; i++) {
-            tags[i].classList.remove(className);
-        }
-    };
-
-    abp.utils.hasClassOnTag = function (tagName, className) {
-        var tags = document.getElementsByTagName(tagName);
-        if (tags.length) {
-            return tags[0].classList.contains(className);
-        }
-
-        return false;
-    };
-
-    abp.utils.replaceLinkHrefById = function (linkId, hrefValue) {
-        var link = document.getElementById(linkId);
-
-        if (link && link.href !== hrefValue) {
-            link.href = hrefValue;
-        }
-    };
-})();
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/AbpUtilsService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpUtilsService.cs
similarity index 94%
rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/AbpUtilsService.cs
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpUtilsService.cs
index 4e4f141655..6af9c2e803 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/AbpUtilsService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpUtilsService.cs
@@ -2,7 +2,7 @@
 using Microsoft.JSInterop;
 using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
 {
     public class AbpUtilsService : IAbpUtilsService, ITransientDependency
     {
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/IAbpUtilsService.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IAbpUtilsService.cs
similarity index 86%
rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/IAbpUtilsService.cs
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IAbpUtilsService.cs
index ecc7b744c1..228c42d1f0 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/IAbpUtilsService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/IAbpUtilsService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
+namespace Volo.Abp.AspNetCore.Components.WebAssembly
 {
     public interface IAbpUtilsService
     {
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/wwwroot/abp.js b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/wwwroot/abp.js
index b945daa56f..b8e8d358e3 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/wwwroot/abp.js
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/wwwroot/abp.js
@@ -1,6 +1,9 @@
 var abp = abp || {};
 (function () {
     abp.utils = abp.utils || {};
+
+    // COOKIES ///////////////////////////////////////////////////////
+
     /**
      * Sets a cookie value for given key.
      * This is a simple implementation created to be used by ABP.
@@ -77,4 +80,37 @@
 
         document.cookie = cookieValue;
     }
-})();
\ No newline at end of file
+
+    // DOM MANIPULATION
+
+    abp.utils.addClassToTag = function (tagName, className) {
+        var tags = document.getElementsByTagName(tagName);
+        for (var i = 0; i < tags.length; i++) {
+            tags[i].classList.add(className);
+        }
+    };
+
+    abp.utils.removeClassFromTag = function (tagName, className) {
+        var tags = document.getElementsByTagName(tagName);
+        for (var i = 0; i < tags.length; i++) {
+            tags[i].classList.remove(className);
+        }
+    };
+
+    abp.utils.hasClassOnTag = function (tagName, className) {
+        var tags = document.getElementsByTagName(tagName);
+        if (tags.length) {
+            return tags[0].classList.contains(className);
+        }
+
+        return false;
+    };
+
+    abp.utils.replaceLinkHrefById = function (linkId, hrefValue) {
+        var link = document.getElementById(linkId);
+
+        if (link && link.href !== hrefValue) {
+            link.href = hrefValue;
+        }
+    };
+})();