From 97df6736091e7d0cccfa6079eba2fed7926ade1c Mon Sep 17 00:00:00 2001
From: Jim Spillane <james.a.spillane@gmail.com>
Date: Sun, 24 May 2020 23:04:55 -0400
Subject: [PATCH] Change JavaScript namespace from interop to Oqtane

---
 .../Modules/Controls/RichTextEditorInterop.cs | 14 +++++------
 Oqtane.Client/UI/Interop.cs                   | 24 +++++++++----------
 Oqtane.Server/wwwroot/js/interop.js           |  4 +++-
 Oqtane.Server/wwwroot/js/quill-interop.js     |  4 +++-
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs b/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs
index c9b442d4..a5bd4ffa 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs
+++ b/Oqtane.Client/Modules/Controls/RichTextEditorInterop.cs
@@ -24,7 +24,7 @@ namespace Oqtane.Modules.Controls
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.createQuill",
+                    "Oqtane.RichTextEditor.createQuill",
                     quillElement, toolbar, readOnly,
                     placeholder, theme, debugLevel);
                 return Task.CompletedTask;
@@ -40,7 +40,7 @@ namespace Oqtane.Modules.Controls
             try
             {
                 return _jsRuntime.InvokeAsync<string>(
-                    "interop.getQuillText",
+                    "Oqtane.RichTextEditor.getQuillText",
                     quillElement);
             }
             catch
@@ -54,7 +54,7 @@ namespace Oqtane.Modules.Controls
             try
             {
                 return _jsRuntime.InvokeAsync<string>(
-                    "interop.getQuillHTML",
+                    "Oqtane.RichTextEditor.getQuillHTML",
                     quillElement);
             }
             catch
@@ -68,7 +68,7 @@ namespace Oqtane.Modules.Controls
             try
             {
                 return _jsRuntime.InvokeAsync<string>(
-                    "interop.getQuillContent",
+                    "Oqtane.RichTextEditor.getQuillContent",
                     quillElement);
             }
             catch
@@ -82,7 +82,7 @@ namespace Oqtane.Modules.Controls
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.loadQuillContent",
+                    "Oqtane.RichTextEditor.loadQuillContent",
                     quillElement, content);
                 return Task.CompletedTask;
             }
@@ -97,7 +97,7 @@ namespace Oqtane.Modules.Controls
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.enableQuillEditor", quillElement, mode);
+                    "Oqtane.RichTextEditor.enableQuillEditor", quillElement, mode);
                 return Task.CompletedTask;
             }
             catch
@@ -111,7 +111,7 @@ namespace Oqtane.Modules.Controls
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.insertQuillImage",
+                    "Oqtane.RichTextEditor.insertQuillImage",
                     quillElement, imageUrl);
                 return Task.CompletedTask;
             }
diff --git a/Oqtane.Client/UI/Interop.cs b/Oqtane.Client/UI/Interop.cs
index 5c95ade6..c098ad34 100644
--- a/Oqtane.Client/UI/Interop.cs
+++ b/Oqtane.Client/UI/Interop.cs
@@ -17,7 +17,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                "interop.setCookie",
+                "Oqtane.Interop.setCookie",
                 name, value, days);
                 return Task.CompletedTask;
             }
@@ -32,7 +32,7 @@ namespace Oqtane.UI
             try
             {
                 return _jsRuntime.InvokeAsync<string>(
-                    "interop.getCookie",
+                    "Oqtane.Interop.getCookie",
                     name);
             }
             catch
@@ -46,7 +46,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.updateTitle",
+                    "Oqtane.Interop.updateTitle",
                     title);
                 return Task.CompletedTask;
             }
@@ -61,7 +61,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.includeMeta",
+                    "Oqtane.Interop.includeMeta",
                     id, attribute, name, content);
                 return Task.CompletedTask;
             }
@@ -76,7 +76,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.includeLink",
+                    "Oqtane.Interop.includeLink",
                     id, rel, url, type, integrity, crossorigin);
                 return Task.CompletedTask;
             }
@@ -91,7 +91,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.includeScript",
+                    "Oqtane.Interop.includeScript",
                     id, src, content, location, integrity, crossorigin);
                 return Task.CompletedTask;
             }
@@ -106,7 +106,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.includeLink",
+                    "Oqtane.Interop.includeLink",
                     id, "stylesheet", url, "text/css");
                 return Task.CompletedTask;
             }
@@ -121,7 +121,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                    "interop.removeElementsById",
+                    "Oqtane.Interop.removeElementsById",
                     prefix, first, last);
                 return Task.CompletedTask;
             }
@@ -137,7 +137,7 @@ namespace Oqtane.UI
             try
             {
                 return _jsRuntime.InvokeAsync<string>(
-                    "interop.getElementByName",
+                    "Oqtane.Interop.getElementByName",
                     name);
             }
             catch
@@ -151,7 +151,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                "interop.submitForm",
+                "Oqtane.Interop.submitForm",
                 path, fields);
                 return Task.CompletedTask;
             }
@@ -166,7 +166,7 @@ namespace Oqtane.UI
             try
             {
                 return _jsRuntime.InvokeAsync<string[]>(
-                    "interop.getFiles",
+                    "Oqtane.Interop.getFiles",
                     id);
             }
             catch
@@ -180,7 +180,7 @@ namespace Oqtane.UI
             try
             {
                 _jsRuntime.InvokeAsync<object>(
-                "interop.uploadFiles",
+                "Oqtane.Interop.uploadFiles",
                 posturl, folder, id);
                 return Task.CompletedTask;
             }
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index 01762d32..4317b07f 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -1,4 +1,6 @@
-window.interop = {
+var Oqtane = Oqtane || {};
+
+Oqtane.Interop = {
     setCookie: function (name, value, days) {
         var d = new Date();
         d.setTime(d.getTime() + (days * 24 * 60 * 60 * 1000));
diff --git a/Oqtane.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
index 4d34231d..abb1b35f 100644
--- a/Oqtane.Server/wwwroot/js/quill-interop.js
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -1,4 +1,6 @@
-window.interop = {
+var Oqtane = Oqtane || {};
+
+Oqtane.RichTextEditor = {
     createQuill: function (
         quillElement, toolBar, readOnly,
         placeholder, theme, debugLevel) {