From 5e234486187036dde127369030038ea81fe03ffa Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Mon, 18 May 2020 13:34:53 -0400 Subject: [PATCH] use lambas for setting resources --- Oqtane.Client/Modules/HtmlText/Edit.razor | 23 ++++++++----------- Oqtane.Client/Modules/HtmlText/Index.razor | 11 +++------ .../Themes/BlazorTheme/Default.razor | 11 +++------ .../Themes/OqtaneTheme/Default.razor | 14 ++++------- 4 files changed, 20 insertions(+), 39 deletions(-) diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index 442aee36..292706e2 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -24,21 +24,16 @@ public override string Title => "Edit Html/Text"; - public override List Resources + public override List Resources => new List() { - get - { - List resources = new List(); - resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css", Integrity = "", CrossOrigin = "" }); - // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes - resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css", Integrity = "", CrossOrigin = "" }); - resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css", Integrity = "", CrossOrigin = "" }); - resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js", Integrity = "", CrossOrigin = "" }); - resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js", Integrity = "", CrossOrigin = "" }); - resources.Add(new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js", Integrity = "", CrossOrigin = "" }); - return resources; - } - } + new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }, + // the following resources should be declared in the RichTextEditor component however the framework currently only supports resource management for modules and themes + new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.bubble.css" }, + new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" }, + new Resource { ResourceType = ResourceType.Script, Url = "js/quill1.3.6.min.js" }, + new Resource { ResourceType = ResourceType.Script, Url = "js/quill-blot-formatter.min.js" }, + new Resource { ResourceType = ResourceType.Script, Url = "js/quill-interop.js" } + }; private RichTextEditor RichTextEditorHtml; private string _content = null; diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor index 5d18e498..8160c19a 100644 --- a/Oqtane.Client/Modules/HtmlText/Index.razor +++ b/Oqtane.Client/Modules/HtmlText/Index.razor @@ -11,15 +11,10 @@ } @code { - public override List Resources + public override List Resources => new List() { - get - { - List resources = new List(); - resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css", Integrity = "", CrossOrigin = "" }); - return resources; - } - } + new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" } + }; private string content = ""; diff --git a/Oqtane.Client/Themes/BlazorTheme/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Default.razor index a51a130c..14b7df03 100644 --- a/Oqtane.Client/Themes/BlazorTheme/Default.razor +++ b/Oqtane.Client/Themes/BlazorTheme/Default.razor @@ -28,13 +28,8 @@ @code { public override string Panes => "Content"; - public override List Resources + public override List Resources => new List() { - get - { - List resources = new List(); - resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css", Integrity = "", CrossOrigin = "" }); - return resources; - } - } + new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" } + }; } \ No newline at end of file diff --git a/Oqtane.Client/Themes/OqtaneTheme/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Default.razor index 05d90852..a2c9263b 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Default.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Default.razor @@ -19,14 +19,10 @@ @code { public override string Panes => string.Empty; - public override List Resources + public override List Resources => new List() { - get - { - List resources = new List(); - resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" }); - resources.Add(new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css", Integrity = "", CrossOrigin = "" }); - return resources; - } - } + new Resource { ResourceType = ResourceType.Stylesheet, Url = "https://stackpath.bootstrapcdn.com/bootswatch/4.4.1/cyborg/bootstrap.min.css", Integrity = "sha384-l7xaoY0cJM4h9xh1RfazbgJVUZvdtyLWPueWNtLAphf/UbBgOVzqbOTogxPwYLHM", CrossOrigin = "anonymous" }, + new Resource { ResourceType = ResourceType.Stylesheet, Url = ThemePath() + "Theme.css" } + }; + }