Added non-generic overloads for scripts and styles renderer. This closes

#7.
valdisiljuconoks · Oct 21, 2015 · 20de419 · 20de419
1 parent 55bae54
commit 20de419
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 27 deletions.
diff --git a/FeatureSwitch.Web.Optimization/Properties/AssemblyInfo.cs b/FeatureSwitch.Web.Optimization/Properties/AssemblyInfo.cs
@@ -5,6 +5,6 @@
 [assembly: AssemblyDescription("FeatureSwitch helper library for System.Web.Optimization")]
 [assembly: ComVisible(false)]
 [assembly: Guid("6ea10b61-5500-4dc9-aa18-682c319e7320")]
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
-[assembly: AssemblyInformationalVersion("1.3.1")]
+[assembly: AssemblyVersion("1.3.2.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]
+[assembly: AssemblyInformationalVersion("1.3.2")]
diff --git a/FeatureSwitch.Web.Optimization/Scripts.cs b/FeatureSwitch.Web.Optimization/Scripts.cs
@@ -9,39 +9,43 @@ public static class Scripts
 
         public static string DefaultTagFormat
         {
-            get
-            {
-                return defaultTagFormat;
-            }
-            set
-            {
-                defaultTagFormat = value;
-            }
+            get { return defaultTagFormat; }
+            set { defaultTagFormat = value; }
         }
 
         public static IHtmlString RenderIf<T>(params string[] paths) where T : BaseFeature
         {
             return RenderIfFormat<T>(DefaultTagFormat, paths);
         }
 
-        public static IHtmlString RenderIfFormat<T>(string tagFromat, params string[] paths) where T : BaseFeature
+        public static IHtmlString RenderIfFormat<T>(string tagFormat, params string[] paths) where T : BaseFeature
         {
-            return FeatureContext.IsEnabled(typeof(T)) ? Render(typeof(T), tagFromat, paths) : new HtmlString(string.Empty);
+            return FeatureContext.IsEnabled(typeof (T)) ? Render(typeof (T), tagFormat, paths) : new HtmlString(string.Empty);
         }
 
         public static IHtmlString Render<T>(params string[] paths) where T : BaseFeature
         {
             return RenderFormat<T>(DefaultTagFormat, paths);
         }
 
-        public static IHtmlString RenderFormat<T>(string tagFromat, params string[] paths) where T : BaseFeature
+        public static IHtmlString Render(params string[] paths)
         {
-            return Render(typeof(T), tagFromat, paths);
+            return RenderFormat(DefaultTagFormat, paths);
         }
 
-        private static IHtmlString Render(Type feature, string tagFromat, params string[] paths)
+        public static IHtmlString RenderFormat(string tagFormat, params string[] paths)
         {
-            return !FeatureContext.IsEnabled(feature) ? System.Web.Optimization.Scripts.RenderFormat(tagFromat, paths) : BundleRenderer.Render(paths, tagFromat);
+            return System.Web.Optimization.Scripts.RenderFormat(tagFormat, paths);
+        }
+
+        public static IHtmlString RenderFormat<T>(string tagFormat, params string[] paths) where T : BaseFeature
+        {
+            return Render(typeof (T), tagFormat, paths);
+        }
+
+        private static IHtmlString Render(Type feature, string tagFormat, params string[] paths)
+        {
+            return !FeatureContext.IsEnabled(feature) ? System.Web.Optimization.Scripts.RenderFormat(tagFormat, paths) : BundleRenderer.Render(paths, tagFormat);
         }
     }
 }
diff --git a/FeatureSwitch.Web.Optimization/Styles.cs b/FeatureSwitch.Web.Optimization/Styles.cs
@@ -9,14 +9,8 @@ public static class Styles
 
         public static string DefaultTagFormat
         {
-            get
-            {
-                return defaultTagFormat;
-            }
-            set
-            {
-                defaultTagFormat = value;
-            }
+            get { return defaultTagFormat; }
+            set { defaultTagFormat = value; }
         }
 
         public static IHtmlString RenderIf<T>(params string[] paths) where T : BaseFeature
@@ -26,7 +20,7 @@ public static string DefaultTagFormat
 
         public static IHtmlString RenderIfFormat<T>(string tagFromat, params string[] paths) where T : BaseFeature
         {
-            return FeatureContext.IsEnabled(typeof(T)) ? Render(typeof(T), tagFromat, paths) : new HtmlString(string.Empty);
+            return FeatureContext.IsEnabled(typeof (T)) ? Render(typeof (T), tagFromat, paths) : new HtmlString(string.Empty);
         }
 
         public static IHtmlString Render<T>(params string[] paths) where T : BaseFeature
@@ -36,7 +30,17 @@ public static string DefaultTagFormat
 
         public static IHtmlString RenderFormat<T>(string tagFormat, params string[] paths) where T : BaseFeature
         {
-            return Render(typeof(T), tagFormat, paths);
+            return Render(typeof (T), tagFormat, paths);
+        }
+
+        public static IHtmlString Render(params string[] paths)
+        {
+            return RenderFormat(DefaultTagFormat, paths);
+        }
+
+        public static IHtmlString RenderFormat(string tagFormat, params string[] paths)
+        {
+            return System.Web.Optimization.Styles.RenderFormat(tagFormat, paths);
         }
 
         private static IHtmlString Render(Type feature, string tagFormat, string[] paths)