merge

2013-11-07 17:16:22 +01:00
parent 937bda9c16 2b3a9a0b8f
commit 7440855c72
573 changed files with 45060 additions and 45047 deletions
--- a/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs
+++ b/src/Umbraco.Web/UI/JavaScript/CssInitialization.cs
@@ -1,51 +1,51 @@
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.IO;
-using Umbraco.Core.Manifest;
-
-namespace Umbraco.Web.UI.JavaScript
-{
-    internal class CssInitialization
-    {
-        private readonly ManifestParser _parser;
-
-        public CssInitialization(ManifestParser parser)
-        {
-            _parser = parser;
-        }
-
-        /// <summary>
-        /// Processes all found manifest files and outputs yepnope.injectcss calls for all css files found in all manifests
-        /// </summary>
-        public string GetStylesheetInitialization()
-        {
-            var merged = new JArray();    
-            foreach (var m in _parser.GetManifests())
-            {
-                ManifestParser.MergeJArrays(merged, m.StylesheetInitialize);
-            }
-
-            return ParseMain(merged);
-        }
-
-       
-        /// <summary>
-        /// Parses the CssResources.Main and returns a yepnop.injectCss format
-        /// </summary>
-        /// <param name="files"></param>
-        /// <returns></returns>
-        internal static string ParseMain(JArray files)
-        {
-            var sb = new StringBuilder();
-            foreach (var file in files)
-                sb.AppendFormat("{0}yepnope.injectCss('{1}');", Environment.NewLine, file);
-
-            return sb.ToString();
-        }
-
-    }
-}
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.IO;
+using Umbraco.Core.Manifest;
+
+namespace Umbraco.Web.UI.JavaScript
+{
+    internal class CssInitialization
+    {
+        private readonly ManifestParser _parser;
+
+        public CssInitialization(ManifestParser parser)
+        {
+            _parser = parser;
+        }
+
+        /// <summary>
+        /// Processes all found manifest files and outputs yepnope.injectcss calls for all css files found in all manifests
+        /// </summary>
+        public string GetStylesheetInitialization()
+        {
+            var merged = new JArray();    
+            foreach (var m in _parser.GetManifests())
+            {
+                ManifestParser.MergeJArrays(merged, m.StylesheetInitialize);
+            }
+
+            return ParseMain(merged);
+        }
+
+       
+        /// <summary>
+        /// Parses the CssResources.Main and returns a yepnop.injectCss format
+        /// </summary>
+        /// <param name="files"></param>
+        /// <returns></returns>
+        internal static string ParseMain(JArray files)
+        {
+            var sb = new StringBuilder();
+            foreach (var file in files)
+                sb.AppendFormat("{0}yepnope.injectCss('{1}');", Environment.NewLine, file);
+
+            return sb.ToString();
+        }
+
+    }
+}