Eliminating WebForms Controls from MacroContent and migrating the file from Web to Abstractions/Core project

2020-02-25 13:29:03 +01:00
parent 329ad4324e
commit 10563577d9
2 changed files with 20 additions and 53 deletions
@@ -0,0 +1,20 @@
+using System;
+
+namespace Umbraco.Web.Macros
+{
+    // represents the content of a macro
+    public class MacroContent
+    {
+        // gets or sets the text content
+        public string Text { get; set; }
+
+        // gets or sets the date the content was generated
+        public DateTime Date { get; set; } = DateTime.Now;
+
+        // a value indicating whether the content is empty
+        public bool IsEmpty => Text == null;
+
+        // gets an empty macro content
+        public static MacroContent Empty { get; } = new MacroContent();
+    }
+}
@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-using System.Web.UI;
-
-namespace Umbraco.Web.Macros
-{
-    // represents the content of a macro
-    public class MacroContent
-    {
-        // gets or sets the text content
-        public string Text { get; set; }
-
-        // gets or sets the control content
-        public Control Control { get; set; }
-        public string ControlId { get; set; }
-
-        // gets or sets the date the content was generated
-        public DateTime Date { get; set; } = DateTime.Now;
-
-        // a value indicating whether the content is empty
-        public bool IsEmpty => Text == null && Control == null;
-
-        // a value indicating whether the content is pure text (no control)
-        public bool IsText => Control == null;
-
-        // a value indicating whether the content is a control
-        public bool IsControl => Control != null;
-
-        // gets an empty macro content
-        public static MacroContent Empty { get; } = new MacroContent();
-
-        // gets the macro content as a string
-        // ie executes the control if any
-        public string GetAsText()
-        {
-            if (Control == null) return Text ?? string.Empty;
-
-            using (var textWriter = new StringWriter())
-            using (var htmlWriter = new HtmlTextWriter(textWriter))
-            {
-                Control.RenderControl(htmlWriter);
-                return textWriter.ToString();
-            }
-        }
-
-        // gets the macro content as a control
-        // ie wraps the text in a control if needed
-        public Control GetAsControl()
-        {
-            return Control ?? new LiteralControl(Text ?? string.Empty);
-        }
-    }
-}