yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB

Browse Source 
More ClientDependency work...converting script and link tags slowly, debug is now off so compression is working.

[TFS Changeset #56602]
This commit is contained in:
Shandem
2009-07-16 14:24:37 +00:00
parent a5ba5ef1db
commit 7455e8f05a
36 changed files with 673 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
umbraco/presentation.ClientDependency/ClientDependencyHelper.cs
View File

@@ -7,6 +7,7 @@ using umbraco.presentation.ClientDependency.Providers;
using System.Web.Configuration;
using System.Configuration.Provider;
using umbraco.presentation.ClientDependency.Config;
using umbraco.presentation.ClientDependency.Controls;
namespace umbraco.presentation.ClientDependency
{
@@ -106,11 +107,12 @@ namespace umbraco.presentation.ClientDependency
}
// add child dependencies
Type iClientDependency = typeof(IClientDependencyFile);
foreach (Control child in control.Controls)
{
if (child.GetType().Equals(typeof(ClientDependencyInclude)))
if (iClientDependency.IsAssignableFrom(child.GetType()))
{
ClientDependencyInclude include = (ClientDependencyInclude)child;
IClientDependencyFile include = (IClientDependencyFile)child;
dependencies.Add(include);
}
else

267
umbraco/presentation.ClientDependency/CompositeDependencyHandler.cs
View File

@@ -16,12 +16,14 @@ namespace umbraco.presentation.ClientDependency
static CompositeDependencyHandler()
{
HandlerFileName = DefaultHandlerFileName;
MaxHandlerUrlLength = DefaultMaxHandlerUrlLength;
//MaxHandlerUrlLength = DefaultMaxHandlerUrlLength;
}
private static readonly string _versionNo = string.Empty;
private const string DefaultHandlerFileName = "DependencyHandler.axd";
private const int DefaultMaxHandlerUrlLength = 2000;
//private const int DefaultMaxHandlerUrlLength = 2000;
private object m_Lock = new object();
/// <summary>
/// The handler file name, by default this is DependencyHandler.axd.
@@ -66,34 +68,54 @@ namespace umbraco.presentation.ClientDependency
if (string.IsNullOrEmpty(fileset))
throw new ArgumentException("Must specify a fileset in the request");
string compositeFileName;
byte[] outputBytes;
CompositeFileMap map = CompositeFileXmlMapper.Instance.GetCompositeFile(fileset);
if (map == null || !map.HasFileBytes)
string compositeFileName = "";
byte[] outputBytes = null;
//get the map to the composite file for this file set, if it exists.
CompositeFileMap map = CompositeFileXmlMapper.Instance.GetCompositeFile(fileset);
if (map != null && map.HasFileBytes)
{
//get the file list
string[] strFiles = DecodeFrom64(fileset).Split(';');
//combine files
byte[] fileBytes = CombineFiles(strFiles, context, type);
//compress data
CompressionType cType = CompressBytes(context, fileBytes, out outputBytes);
SetContentEncodingHeaders(context, cType);
//save combined file
compositeFileName = SaveCompositeFile(outputBytes, type);
//Update the XML file map
CompositeFileXmlMapper.Instance.CreateMap(fileset, cType.ToString(),
strFiles.Select(x => new FileInfo(context.Server.MapPath(x))).ToList(),
compositeFileName);
ProcessFromFile(context, map, out compositeFileName, out outputBytes);
}
else
{
//the saved file's bytes are already compressed.
outputBytes = map.GetCompositeFileBytes();
compositeFileName = map.CompositeFileName;
CompressionType cType = (CompressionType)Enum.Parse(typeof(CompressionType), map.CompressionType);
SetContentEncodingHeaders(context, cType);
bool fromFile = false;
lock (m_Lock)
{
//check again...
if (map == null || !map.HasFileBytes)
{
//need to do the combining, etc... and save the file map
//get the file list
string[] strFiles = DecodeFrom64(fileset).Split(';');
//combine files
byte[] fileBytes = CompositeFileProcessor.CombineFiles(strFiles, context, type);
//compress data
CompressionType cType = GetCompression(context);
outputBytes = CompositeFileProcessor.CompressBytes(cType, fileBytes);
SetContentEncodingHeaders(context, cType);
//save combined file
compositeFileName = CompositeFileProcessor.SaveCompositeFile(outputBytes, type);
//Update the XML file map
CompositeFileXmlMapper.Instance.CreateMap(fileset, cType.ToString(),
strFiles.Select(x => new FileInfo(context.Server.MapPath(x))).ToList(),
compositeFileName);
}
else
{
//files are there now, process from file.
fromFile = true;
}
}
if (fromFile)
{
ProcessFromFile(context, map, out compositeFileName, out outputBytes);
}
}
SetCaching(context, compositeFileName);
@@ -102,168 +124,13 @@ namespace umbraco.presentation.ClientDependency
context.Response.OutputStream.Write(outputBytes, 0, outputBytes.Length);
}
private enum CompressionType
private void ProcessFromFile(HttpContext context, CompositeFileMap map, out string compositeFileName, out byte[] outputBytes)
{
deflate, gzip, none
}
/// <summary>
/// Saves the file's bytes to disk with a hash of the byte array
/// </summary>
/// <param name="fileContents"></param>
/// <param name="type"></param>
/// <returns>The new file path</returns>
/// <remarks>
/// the extension will be: .cdj for JavaScript and .cdc for CSS
/// </remarks>
private string SaveCompositeFile(byte[] fileContents, ClientDependencyType type)
{
if (!ClientDependencySettings.Instance.CompositeFilePath.Exists)
ClientDependencySettings.Instance.CompositeFilePath.Create();
FileInfo fi = new FileInfo(
Path.Combine(ClientDependencySettings.Instance.CompositeFilePath.FullName,
fileContents.GetHashCode().ToString() + ".cd" + type.ToString().Substring(0, 1).ToLower()));
if (fi.Exists)
fi.Delete();
FileStream fs = fi.Create();
fs.Write(fileContents, 0, fileContents.Length);
fs.Close();
return fi.FullName;
}
/// <summary>
/// combines all files to a byte array
/// </summary>
/// <param name="fileList"></param>
/// <param name="context"></param>
/// <returns></returns>
private byte[] CombineFiles(string[] strFiles, HttpContext context, ClientDependencyType type)
{
MemoryStream ms = new MemoryStream(5000);
StreamWriter sw = new StreamWriter(ms);
foreach (string s in strFiles)
{
if (!string.IsNullOrEmpty(s))
{
try
{
FileInfo fi = new FileInfo(context.Server.MapPath(s));
if (ClientDependencySettings.Instance.FileBasedDependencyExtensionList.Contains(fi.Extension.ToLower().Replace(".", "")))
{
//if the file doesn't exist, then we'll assume it is a URI external request
if (!fi.Exists)
{
WriteRequestToStream(ref sw, s);
}
else
{
//if it is a file based dependency then read it
string fileContents = File.ReadAllText(fi.FullName);
sw.WriteLine(fileContents);
}
}
else
{
//if it's not a file based dependency, try to get the request output.
WriteRequestToStream(ref sw, s);
}
}
catch (Exception ex)
{
Type exType = ex.GetType();
if (exType.Equals(typeof(NotSupportedException)) || exType.Equals(typeof(ArgumentException)))
{
//could not parse the string into a fileinfo, so we assume it is a URI
WriteRequestToStream(ref sw, s);
}
else
{
//if this fails, log the exception in trace, but continue
HttpContext.Current.Trace.Warn("ClientDependency", "Could not load file contents from " + s, ex);
System.Diagnostics.Debug.Assert(false, "Could not load file contents from " + s, ex.Message);
}
}
}
if (type == ClientDependencyType.Javascript)
{
sw.Write(";;;"); //write semicolons in case the js isn't formatted correctly. This also helps for debugging.
}
}
sw.Flush();
byte[] outputBytes = ms.ToArray();
sw.Close();
ms.Close();
return outputBytes;
}
/// <summary>
/// Writes the output of an external request to the stream. Returns true/false if succesful or not.
/// </summary>
/// <param name="sw"></param>
/// <param name="url"></param>
/// <returns></returns>
private bool WriteRequestToStream(ref StreamWriter sw, string url)
{
string requestOutput;
bool rVal = false;
rVal = TryReadUri(url, out requestOutput);
if (rVal)
{
//write the contents of the external request.
sw.WriteLine(requestOutput);
}
return rVal;
}
/// <summary>
/// Tries to convert the url to a uri, then read the request into a string and return it.
/// This takes into account relative vs absolute URI's
/// </summary>
/// <param name="url"></param>
/// <param name="requestContents"></param>
/// <returns></returns>
private bool TryReadUri(string url, out string requestContents)
{
Uri uri;
if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out uri))
{
if (uri.IsAbsoluteUri)
{
WebClient client = new WebClient();
try
{
requestContents = client.DownloadString(uri.AbsoluteUri);
return true;
}
catch (Exception ex)
{
HttpContext.Current.Trace.Warn("ClientDependency", "Could not load file contents from " + url, ex);
System.Diagnostics.Debug.Assert(false, "Could not load file contents from " + url, ex.Message);
}
}
else
{
//its a relative path so use the execute method
StringWriter sw = new StringWriter();
try
{
HttpContext.Current.Server.Execute(url, sw);
requestContents = sw.ToString();
sw.Close();
return true;
}
catch (Exception ex)
{
HttpContext.Current.Trace.Warn("ClientDependency", "Could not load file contents from " + url, ex);
System.Diagnostics.Debug.Assert(false, "Could not load file contents from " + url, ex.Message);
}
}
}
requestContents = "";
return false;
//the saved file's bytes are already compressed.
outputBytes = map.GetCompositeFileBytes();
compositeFileName = map.CompositeFileName;
CompressionType cType = (CompressionType)Enum.Parse(typeof(CompressionType), map.CompressionType);
SetContentEncodingHeaders(context, cType);
}
/// <summary>
@@ -315,42 +182,24 @@ namespace umbraco.presentation.ClientDependency
}
/// <summary>
/// Compresses the bytes if the browser supports it
/// Check what kind of compression to use
/// </summary>
private CompressionType CompressBytes(HttpContext context, byte[] fileBytes, out byte[] outputBytes)
private CompressionType GetCompression(HttpContext context)
{
CompressionType type = CompressionType.none;
string acceptEncoding = context.Request.Headers["Accept-Encoding"];
//not compressed initially
outputBytes = fileBytes;
if (!string.IsNullOrEmpty(acceptEncoding))
{
MemoryStream ms = new MemoryStream();
Stream compressedStream = null;
acceptEncoding = acceptEncoding.ToLowerInvariant();
{
//deflate is faster in .Net according to Mads Kristensen (blogengine.net)
if (acceptEncoding.Contains("deflate"))
{
compressedStream = new DeflateStream(ms, CompressionMode.Compress, true);
{
type = CompressionType.deflate;
}
else if (acceptEncoding.Contains("gzip"))
{
compressedStream = new GZipStream(ms, CompressionMode.Compress, true);
type = CompressionType.gzip;
}
if (type != CompressionType.none)
{
//write the bytes to the compressed stream
compressedStream.Write(fileBytes, 0, fileBytes.Length);
compressedStream.Close();
byte[] output = ms.ToArray();
ms.Close();
outputBytes = output;
}
}
return type;

267
umbraco/presentation.ClientDependency/CompositeFileProcessor.cs Normal file
View File

@@ -0,0 +1,267 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using umbraco.presentation.ClientDependency.Config;
using System.IO;
using System.Web;
using System.Net;
using System.IO.Compression;
namespace umbraco.presentation.ClientDependency
{
public enum CompressionType
{
deflate, gzip, none
}
/// <summary>
/// A utility class for combining, compressing and saving composite scripts/css files
/// </summary>
public static class CompositeFileProcessor
{
/// <summary>
/// Saves the file's bytes to disk with a hash of the byte array
/// </summary>
/// <param name="fileContents"></param>
/// <param name="type"></param>
/// <returns>The new file path</returns>
/// <remarks>
/// the extension will be: .cdj for JavaScript and .cdc for CSS
/// </remarks>
public static string SaveCompositeFile(byte[] fileContents, ClientDependencyType type)
{
if (!ClientDependencySettings.Instance.CompositeFilePath.Exists)
ClientDependencySettings.Instance.CompositeFilePath.Create();
FileInfo fi = new FileInfo(
Path.Combine(ClientDependencySettings.Instance.CompositeFilePath.FullName,
fileContents.GetHashCode().ToString() + ".cd" + type.ToString().Substring(0, 1).ToLower()));
if (fi.Exists)
fi.Delete();
FileStream fs = fi.Create();
fs.Write(fileContents, 0, fileContents.Length);
fs.Close();
return fi.FullName;
}
/// <summary>
/// combines all files to a byte array
/// </summary>
/// <param name="fileList"></param>
/// <param name="context"></param>
/// <returns></returns>
public static byte[] CombineFiles(string[] strFiles, HttpContext context, ClientDependencyType type)
{
MemoryStream ms = new MemoryStream(5000);
StreamWriter sw = new StreamWriter(ms);
foreach (string s in strFiles)
{
if (!string.IsNullOrEmpty(s))
{
try
{
FileInfo fi = new FileInfo(context.Server.MapPath(s));
if (ClientDependencySettings.Instance.FileBasedDependencyExtensionList.Contains(fi.Extension.ToLower().Replace(".", "")))
{
//if the file doesn't exist, then we'll assume it is a URI external request
if (!fi.Exists)
{
WriteFileToStream(ref sw, s, type);
}
else
{
WriteFileToStream(ref sw, fi, type, s);
}
}
else
{
//if it's not a file based dependency, try to get the request output.
WriteFileToStream(ref sw, s, type);
}
}
catch (Exception ex)
{
Type exType = ex.GetType();
if (exType.Equals(typeof(NotSupportedException)) || exType.Equals(typeof(ArgumentException)))
{
//could not parse the string into a fileinfo, so we assume it is a URI
WriteFileToStream(ref sw, s, type);
}
else
{
//if this fails, log the exception in trace, but continue
HttpContext.Current.Trace.Warn("ClientDependency", "Could not load file contents from " + s, ex);
System.Diagnostics.Debug.Assert(false, "Could not load file contents from " + s, ex.Message);
}
}
}
if (type == ClientDependencyType.Javascript)
{
sw.Write(";;;"); //write semicolons in case the js isn't formatted correctly. This also helps for debugging.
}
}
sw.Flush();
byte[] outputBytes = ms.ToArray();
sw.Close();
ms.Close();
return outputBytes;
}
/// <summary>
/// Writes the output of an external request to the stream. Returns true/false if succesful or not.
/// </summary>
/// <param name="sw"></param>
/// <param name="url"></param>
/// <returns></returns>
private static bool WriteFileToStream(ref StreamWriter sw, string url, ClientDependencyType type)
{
string requestOutput;
bool rVal = false;
rVal = TryReadUri(url, out requestOutput);
if (rVal)
{
//write the contents of the external request.
sw.WriteLine(ParseFileContents(requestOutput, type, url));
}
return rVal;
}
private static bool WriteFileToStream(ref StreamWriter sw, FileInfo fi, ClientDependencyType type, string origUrl)
{
try
{
//if it is a file based dependency then read it
string fileContents = File.ReadAllText(fi.FullName);
sw.WriteLine(ParseFileContents(fileContents, type, origUrl));
return true;
}
catch (Exception ex)
{
HttpContext.Current.Trace.Warn("ClientDependency", "Could not write file " + fi.FullName + " contents to stream", ex);
System.Diagnostics.Debug.Assert(false, "Could not write file " + fi.FullName + " contents to stream", ex.Message);
return false;
}
}
/// <summary>
/// Currently this only parses CSS files, but potentially could have other uses.
/// This is the final process before writing to the stream.
/// </summary>
/// <param name="fileContents"></param>
/// <param name="type"></param>
/// <returns></returns>
private static string ParseFileContents(string fileContents, ClientDependencyType type, string url)
{
//if it is a CSS file we need to parse the URLs
if (type == ClientDependencyType.Css)
{
fileContents = CssFileUrlFormatter.TransformCssFile(fileContents, MakeUri(url));
}
return fileContents;
}
/// <summary>
/// Checks if the url is a local/relative uri, if it is, it makes it absolute based on the
/// current request uri.
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
private static Uri MakeUri(string url)
{
Uri uri = new Uri(url, UriKind.RelativeOrAbsolute);
if (!uri.IsAbsoluteUri)
{
string http = HttpContext.Current.Request.Url.GetLeftPart(UriPartial.Authority);
Uri absoluteUrl = new Uri(new Uri(http), uri);
return absoluteUrl;
}
return uri;
}
/// <summary>
/// Tries to convert the url to a uri, then read the request into a string and return it.
/// This takes into account relative vs absolute URI's
/// </summary>
/// <param name="url"></param>
/// <param name="requestContents"></param>
/// <returns></returns>
private static bool TryReadUri(string url, out string requestContents)
{
Uri uri;
if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out uri))
{
if (uri.IsAbsoluteUri)
{
WebClient client = new WebClient();
try
{
requestContents = client.DownloadString(uri.AbsoluteUri);
return true;
}
catch (Exception ex)
{
HttpContext.Current.Trace.Warn("ClientDependency", "Could not load file contents from " + url, ex);
System.Diagnostics.Debug.Assert(false, "Could not load file contents from " + url, ex.Message);
}
}
else
{
//its a relative path so use the execute method
StringWriter sw = new StringWriter();
try
{
HttpContext.Current.Server.Execute(url, sw);
requestContents = sw.ToString();
sw.Close();
return true;
}
catch (Exception ex)
{
HttpContext.Current.Trace.Warn("ClientDependency", "Could not load file contents from " + url, ex);
System.Diagnostics.Debug.Assert(false, "Could not load file contents from " + url, ex.Message);
}
}
}
requestContents = "";
return false;
}
/// <summary>
/// Compresses the bytes if the browser supports it
/// </summary>
public static byte[] CompressBytes(CompressionType type, byte[] fileBytes)
{
MemoryStream ms = new MemoryStream();
Stream compressedStream = null;
//deflate is faster in .Net according to Mads Kristensen (blogengine.net)
if (type == CompressionType.deflate)
{
compressedStream = new DeflateStream(ms, CompressionMode.Compress, true);
}
else if (type == CompressionType.gzip)
{
compressedStream = new GZipStream(ms, CompressionMode.Compress, true);
}
if (type != CompressionType.none)
{
//write the bytes to the compressed stream
compressedStream.Write(fileBytes, 0, fileBytes.Length);
compressedStream.Close();
byte[] output = ms.ToArray();
ms.Close();
return output;
}
//not compressed
return fileBytes;
}
}
}

17
umbraco/presentation.ClientDependency/CompositeFileXmlMapper.cs
View File

@@ -50,7 +50,6 @@ namespace umbraco.presentation.ClientDependency
/// </summary>
private void Initialize()
{
m_XmlFile = new FileInfo(
Path.Combine(ClientDependencySettings.Instance.CompositeFilePath.FullName, MapFileName));
@@ -90,6 +89,8 @@ namespace umbraco.presentation.ClientDependency
//double check
if (!m_XmlFile.Exists)
{
if (!ClientDependencySettings.Instance.CompositeFilePath.Exists)
ClientDependencySettings.Instance.CompositeFilePath.Create();
CreateNewXmlFile();
}
}
@@ -105,19 +106,19 @@ namespace umbraco.presentation.ClientDependency
public CompositeFileMap GetCompositeFile(string base64Key)
{
XElement x = FindItem(base64Key);
//try
//{
try
{
return (x == null ? null : new CompositeFileMap(base64Key,
x.Attribute("compression").Value,
x.Attribute("file").Value,
x.Descendants("file")
.Select(f => new FileInfo(f.Attribute("name").Value))
.ToList()));
//}
//catch
//{
// return null;
//}
}
catch
{
return null;
}
}
/// <summary>

10
umbraco/presentation.ClientDependency/ClientDependencyInclude.cs → umbraco/presentation.ClientDependency/Controls/ClientDependencyInclude.cs
View File

@@ -3,14 +3,13 @@ using System.Collections.Generic;
using System.Text;
using System.Web.UI;
namespace umbraco.presentation.ClientDependency
namespace umbraco.presentation.ClientDependency.Controls
{
public class ClientDependencyInclude : Control, IClientDependencyFile
public abstract class ClientDependencyInclude : Control, IClientDependencyFile
{
public ClientDependencyInclude()
{
DependencyType = ClientDependencyType.Javascript;
{
Priority = DefaultPriority;
DoNotOptimize = false;
}
@@ -34,7 +33,8 @@ namespace umbraco.presentation.ClientDependency
/// </remarks>
public bool DoNotOptimize { get; set; }
public ClientDependencyType DependencyType { get; set; }
public ClientDependencyType DependencyType { get; internal set; }
public string FilePath { get; set; }
public string PathNameAlias { get; set; }
public string CompositeGroupName { get; set; }

2
umbraco/presentation.ClientDependency/ClientDependencyLoader.cs → umbraco/presentation.ClientDependency/Controls/ClientDependencyLoader.cs
View File

@@ -6,7 +6,7 @@ using System.Web;
using umbraco.presentation.ClientDependency.Providers;
using umbraco.presentation.ClientDependency.Config;
namespace umbraco.presentation.ClientDependency
namespace umbraco.presentation.ClientDependency.Controls
{
[ParseChildren(typeof(ClientDependencyPath), ChildrenAsProperties = true)]
public class ClientDependencyLoader : Control

2
umbraco/presentation.ClientDependency/ClientDependencyPath.cs → umbraco/presentation.ClientDependency/Controls/ClientDependencyPath.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.Web.UI;
namespace umbraco.presentation.ClientDependency
namespace umbraco.presentation.ClientDependency.Controls
{
/// <summary>

2
umbraco/presentation.ClientDependency/ClientDependencyPathCollection.cs → umbraco/presentation.ClientDependency/Controls/ClientDependencyPathCollection.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace umbraco.presentation.ClientDependency
namespace umbraco.presentation.ClientDependency.Controls
{
public class ClientDependencyPathCollection : List<ClientDependencyPath>
{

16
umbraco/presentation.ClientDependency/Controls/CssInclude.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace umbraco.presentation.ClientDependency.Controls
{
public class CssInclude : ClientDependencyInclude
{
public CssInclude()
{
DependencyType = ClientDependencyType.Css;
}
}
}

17
umbraco/presentation.ClientDependency/Controls/JsInclude.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace umbraco.presentation.ClientDependency.Controls
{
public class JsInclude : ClientDependencyInclude
{
public JsInclude()
{
DependencyType = ClientDependencyType.Javascript;
}
}
}

40
umbraco/presentation.ClientDependency/CssFileUrlFormatter.cs Normal file
View File

@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
namespace umbraco.presentation.ClientDependency
{
public class CssFileUrlFormatter
{
/// <summary>
/// Returns the CSS file with all of the url's formatted to be absolute locations
/// </summary>
/// <param name="fileContent">content of the css file</param>
/// <param name="cssLocation">the uri location of the css file</param>
/// <returns></returns>
public static string TransformCssFile(string fileContent, Uri cssLocation)
{
string str = Regex.Replace(
fileContent,
@"url\((.+)\)",
new MatchEvaluator(
delegate(Match m)
{
if (m.Groups.Count == 2)
{
string match = m.Groups[1].Value.Trim('\'', '"');
return string.Format(@"url(""{0}"")",
match.StartsWith("http") ? match : new Uri(cssLocation, match).ToString());
}
return m.Value;
})
);
return str;
}
}
}

2
umbraco/presentation.ClientDependency/IClientDependencyFile.cs
View File

@@ -7,7 +7,7 @@ namespace umbraco.presentation.ClientDependency
public interface IClientDependencyFile
{
string FilePath { get; set; }
ClientDependencyType DependencyType { get; set; }
ClientDependencyType DependencyType { get; }
string InvokeJavascriptMethodOnLoad { get; set; }
int Priority { get; set; }
//string CompositeGroupName { get; set; }

1
umbraco/presentation.ClientDependency/Providers/ClientDependencyProvider.cs
View File

@@ -5,6 +5,7 @@ using System.Web.UI;
using System.Configuration.Provider;
using System.Web;
using System.Linq;
using umbraco.presentation.ClientDependency.Controls;
namespace umbraco.presentation.ClientDependency.Providers
{

12
umbraco/presentation.ClientDependency/umbraco.presentation.ClientDependency.csproj
View File

@@ -51,21 +51,25 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ClientDependencyInclude.cs" />
<Compile Include="Controls\ClientDependencyInclude.cs" />
<Compile Include="ClientDependencyList.cs" />
<Compile Include="ClientDependencyType.cs" />
<Compile Include="CompositeFileMap.cs" />
<Compile Include="CompositeFileProcessor.cs" />
<Compile Include="CompositeFileXmlMapper.cs" />
<Compile Include="Config\ClientDependencySettings.cs" />
<Compile Include="Controls\CssInclude.cs" />
<Compile Include="Controls\JsInclude.cs" />
<Compile Include="CssFileUrlFormatter.cs" />
<Compile Include="IClientDependencyFile.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Providers\ClientDependencyProvider.cs" />
<Compile Include="ClientDependencyAttribute.cs" />
<Compile Include="ClientDependencyEmbedType.cs" />
<Compile Include="ClientDependencyHelper.cs" />
<Compile Include="ClientDependencyLoader.cs" />
<Compile Include="ClientDependencyPath.cs" />
<Compile Include="ClientDependencyPathCollection.cs" />
<Compile Include="Controls\ClientDependencyLoader.cs" />
<Compile Include="Controls\ClientDependencyPath.cs" />
<Compile Include="Controls\ClientDependencyPathCollection.cs" />
<Compile Include="Providers\ClientDependencyProviderCollection.cs" />
<Compile Include="Config\ClientDependencySection.cs" />
<Compile Include="Providers\ClientSideRegistrationProvider.cs" />

4
umbraco/presentation/umbraco/ClientDependencyTest.aspx
View File

@@ -1,5 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ClientDependencyTest.aspx.cs" Inherits="umbraco.presentation.umbraco.ClientDependencyTest" Trace="true" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency" Assembly="umbraco.presentation.ClientDependency" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >
@@ -14,7 +14,7 @@
</Paths>
</umb:ClientDependencyLoader>
<umb:ClientDependencyInclude runat="server" id="Dependency1" Type="Css" File='<%#umbraco.GlobalSettings.Path + "/css/permissionsEditor.css"%>' />
<umb:CssInclude ID="CssInclude1" runat="server" File='<%#umbraco.GlobalSettings.Path + "/css/permissionsEditor.css"%>' />
<form id="form1" runat="server">
<div>

13
umbraco/presentation/umbraco/ClientDependencyTest.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -20,16 +20,7 @@ namespace umbraco.presentation.umbraco {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyLoader ClientLoader;
/// <summary>
/// Dependency1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude Dependency1;
protected global::umbraco.presentation.ClientDependency.Controls.ClientDependencyLoader ClientLoader;
/// <summary>
/// form1 control.

13
umbraco/presentation/umbraco/controls/ContentPicker.cs
View File

@@ -13,14 +13,6 @@ using umbraco.presentation.ClientDependency;
namespace umbraco.controls
{
//"<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/webservices/ajax.js\"></script>");
//"<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/xmlextras.js\"></script>"
//"<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/xmlRequest.js\"></script>");
//"<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/submodal/common.js\"></script>
//"<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/submodal/subModal.js\"></script>
//"<link href=\"" + GlobalSettings.Path + "/js/submodal/subModal.css\" type=\"text/css\" rel=\"stylesheet\"></link>");
[ClientDependency(ClientDependencyType.Javascript, "js/xmlextras.js", "UmbracoRoot")]
[ClientDependency(ClientDependencyType.Javascript, "js/xmlRequest.js", "UmbracoRoot")]
[ClientDependency(ClientDependencyType.Javascript, "webservices/ajax.js", "UmbracoRoot")]
@@ -86,10 +78,7 @@ namespace umbraco.controls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
//base.Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "ajax", "<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/webservices/ajax.js\"></script>");
//base.Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "ajax1", "<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/xmlextras.js\"></script><script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/xmlRequest.js\"></script>");
//base.Page.ClientScript.RegisterClientScriptBlock(GetType(), "subModal", "<script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/submodal/common.js\"></script><script type=\"text/javascript\" src=\"" + GlobalSettings.Path + "/js/submodal/subModal.js\"></script><link href=\"" + GlobalSettings.Path + "/js/submodal/subModal.css\" type=\"text/css\" rel=\"stylesheet\"></link>");
// We need to make sure we have a reference to the legacy ajax calls in the scriptmanager
presentation.webservices.ajaxHelpers.EnsureLegacyCalls(base.Page);
}

24
umbraco/presentation/umbraco/controls/TreeControl.ascx
View File

@@ -1,18 +1,18 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="TreeControl.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.TreeControl" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency" Assembly="umbraco.presentation.ClientDependency" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude7" DependencyType="Css" FilePath="Tree/Themes/tree_component.css" PathNameAlias="UmbracoClient" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="Tree/Themes/tree_component.css" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude8" DependencyType="Javascript" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude13" DependencyType="Javascript" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude11" DependencyType="Javascript" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude12" DependencyType="Javascript" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude6" DependencyType="Javascript" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude1" DependencyType="Javascript" FilePath="Application/JQuery/jquery.metadata.min.js" PathNameAlias="UmbracoClient" Priority="10" />
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude2" DependencyType="Javascript" FilePath="Tree/css.js" PathNameAlias="UmbracoClient" Priority="10" />
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude5" DependencyType="Javascript" FilePath="Tree/tree_component.min.js" PathNameAlias="UmbracoClient" Priority="11" />
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude3" DependencyType="Javascript" FilePath="Tree/NodeDefinition.js" PathNameAlias="UmbracoClient" Priority="12" />
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude4" DependencyType="Javascript" FilePath="Tree/UmbracoTree.min.js" PathNameAlias="UmbracoClient" Priority="13" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" />
<umb:JsInclude ID="JsInclude3" runat="server" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" />
<umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" />
<umb:JsInclude ID="JsInclude5" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/JQuery/jquery.metadata.min.js" PathNameAlias="UmbracoClient" Priority="10" />
<umb:JsInclude ID="JsInclude7" runat="server" FilePath="Tree/css.js" PathNameAlias="UmbracoClient" Priority="10" />
<umb:JsInclude ID="JsInclude8" runat="server" FilePath="Tree/tree_component.min.js" PathNameAlias="UmbracoClient" Priority="11" />
<umb:JsInclude ID="JsInclude9" runat="server" FilePath="Tree/NodeDefinition.js" PathNameAlias="UmbracoClient" Priority="12" />
<umb:JsInclude ID="JsInclude10" runat="server" FilePath="Tree/UmbracoTree.min.js" PathNameAlias="UmbracoClient" Priority="13" />
<script type="text/javascript">

46
umbraco/presentation/umbraco/controls/TreeControl.ascx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -14,102 +14,102 @@ namespace umbraco.presentation.umbraco.controls {
public partial class TreeControl {
/// <summary>
/// ClientDependencyInclude7 control.
/// CssInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude7;
protected global::umbraco.presentation.ClientDependency.Controls.CssInclude CssInclude1;
/// <summary>
/// ClientDependencyInclude8 control.
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude8;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// ClientDependencyInclude13 control.
/// JsInclude2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude13;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude2;
/// <summary>
/// ClientDependencyInclude11 control.
/// JsInclude3 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude11;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude3;
/// <summary>
/// ClientDependencyInclude12 control.
/// JsInclude4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude12;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude4;
/// <summary>
/// ClientDependencyInclude6 control.
/// JsInclude5 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude6;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude5;
/// <summary>
/// ClientDependencyInclude1 control.
/// JsInclude6 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude1;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude6;
/// <summary>
/// ClientDependencyInclude2 control.
/// JsInclude7 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude2;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude7;
/// <summary>
/// ClientDependencyInclude5 control.
/// JsInclude8 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude5;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude8;
/// <summary>
/// ClientDependencyInclude3 control.
/// JsInclude9 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude3;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude9;
/// <summary>
/// ClientDependencyInclude4 control.
/// JsInclude10 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude4;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude10;
}
}

10
umbraco/presentation/umbraco/dashboard/quickEdit.ascx
View File

@@ -1,9 +1,9 @@
<%@ Control Language="c#" AutoEventWireup="True" Codebehind="quickEdit.ascx.cs" Inherits="umbraco.presentation.dashboard.quickEdit" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency" Assembly="umbraco.presentation.ClientDependency" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude3" DependencyType="Javascript" FilePath="js/autocomplete/jquery.autocomplete.js" PathNameAlias="UmbracoRoot" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/autocomplete/jquery.autocomplete.js" PathNameAlias="UmbracoRoot" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="js/quickedit.js" PathNameAlias="UmbracoRoot" />
<div class="umbracoSearchHolder">
<input type="text" id="umbSearchField" accesskey="s" name="umbSearch" value="<%=umbraco.ui.Text("general", "typeToSearch")%>" />
<script type="text/javascript" src="js/quickedit.js"></script>
</div>
<input type="text" id="umbSearchField" accesskey="s" name="umbSearch" value="<%=umbraco.ui.Text("general", "typeToSearch")%>" />
</div>

15
umbraco/presentation/umbraco/dashboard/quickEdit.ascx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -14,12 +14,21 @@ namespace umbraco.presentation.dashboard {
public partial class quickEdit {
/// <summary>
/// ClientDependencyInclude3 control.
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude3;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// JsInclude2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude2;
}
}

3
umbraco/presentation/umbraco/developer/Xslt/editXslt.aspx
View File

@@ -3,6 +3,7 @@
Inherits="umbraco.cms.presentation.developer.editXslt" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<asp:Content ContentPlaceHolderID="head" runat="server" ID="cp2">
<style type="text/css">
#errorDiv
@@ -58,7 +59,7 @@
</script>
<script type="text/javascript" src="../../js/jquery-fieldselection.js"></script>
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/jquery-fieldselection.js" PathNameAlias="UmbracoRoot" />
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server" ID="cp1">

11
umbraco/presentation/umbraco/developer/Xslt/editXslt.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3074
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -13,6 +13,15 @@ namespace umbraco.cms.presentation.developer {
public partial class editXslt {
/// <summary>
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// UmbracoPanel1 control.
/// </summary>

3
umbraco/presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
View File

@@ -1,5 +1,6 @@
<%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Codebehind="xsltInsertValueOf.aspx.cs" AutoEventWireup="True" Inherits="umbraco.developer.xsltInsertValueOf" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
@@ -33,7 +34,7 @@
this.focus();
</script>
<script type="text/javascript" src="../js/umbracoCheckKeys.js"></script>
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot" />
<style type="text/css">
body{margin: 0px; padding: 0px;}

11
umbraco/presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.1433
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -13,6 +13,15 @@ namespace umbraco.developer {
public partial class xsltInsertValueOf {
/// <summary>
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// valueOf control.
/// </summary>

3
umbraco/presentation/umbraco/editContent.aspx
View File

@@ -1,6 +1,7 @@
<%@ Page Title="Edit content" Language="c#" MasterPageFile="masterpages/umbracoPage.Master" CodeBehind="editContent.aspx.cs" ValidateRequest="false" AutoEventWireup="True" Inherits="umbraco.cms.presentation.editContent" Trace="false" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
@@ -32,7 +33,7 @@
}
</script>
<script src="js/umbracoCheckKeys.js" type="text/javascript"></script>
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot" />
</asp:Content>
<asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">

11
umbraco/presentation/umbraco/editContent.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.1433
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -13,6 +13,15 @@ namespace umbraco.cms.presentation {
public partial class editContent {
/// <summary>
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// plc control.
/// </summary>

20
umbraco/presentation/umbraco/masterpages/umbracoDialog.Master
View File

@@ -1,21 +1,29 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="umbracoDialog.master.cs" Inherits="umbraco.presentation.umbraco.masterpages.umbracoDialog" %>
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="umbracoDialog.master.cs" Inherits="umbraco.presentation.umbraco.masterpages.umbracoDialog" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" >
<head id="Head1" runat="server">
<title></title>
<!-- Default script and style -->
<link rel="Stylesheet" href="/umbraco_client/ui/default.css" type="text/css" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
<script src="/umbraco_client/Application/NamespaceManager.js" type="text/javascript"></script>
<script src="/umbraco_client/ui/default.js" type="text/javascript"></script>
<script src="/umbraco_client/ui/jquery.js" type="text/javascript"></script>
<script src="/umbraco_client/Application/UmbracoClientManager.js" type="text/javascript"></script>
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="1" />
<umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" Priority="2" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="5" />
<asp:ContentPlaceHolder ID="head" runat="server"></asp:ContentPlaceHolder>
</head>
<body class="umbracoDialog" style="margin: 15px 10px 0px 10px;">
<umb:ClientDependencyLoader runat="server" id="ClientLoader" EmbedType="Header" IsDebugMode="false" >
<Paths>
<umb:ClientDependencyPath Name="UmbracoClient" Path="~/umbraco_client" />
<umb:ClientDependencyPath Name="UmbracoRoot" Path='<%#umbraco.GlobalSettings.Path%>' />
</Paths>
</umb:ClientDependencyLoader>
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server"></asp:ScriptManager>
<asp:ContentPlaceHolder ID="body" runat="server">

7
umbraco/presentation/umbraco/masterpages/umbracoDialog.Master.cs
View File

@@ -9,8 +9,9 @@ namespace umbraco.presentation.umbraco.masterpages {
public bool reportModalSize { get; set; }
protected void Page_Load(object sender, EventArgs e) {
}
protected void Page_Load(object sender, EventArgs e)
{
ClientLoader.DataBind();
}
}
}

56
umbraco/presentation/umbraco/masterpages/umbracoDialog.Master.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.1433
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -22,6 +22,51 @@ namespace umbraco.presentation.umbraco.masterpages {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// CssInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.CssInclude CssInclude1;
/// <summary>
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// JsInclude3 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude3;
/// <summary>
/// JsInclude4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude4;
/// <summary>
/// JsInclude2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude2;
/// <summary>
/// head control.
/// </summary>
@@ -31,6 +76,15 @@ namespace umbraco.presentation.umbraco.masterpages {
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder head;
/// <summary>
/// ClientLoader control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.Controls.ClientDependencyLoader ClientLoader;
/// <summary>
/// form1 control.
/// </summary>

20
umbraco/presentation/umbraco/masterpages/umbracoPage.Master
View File

@@ -1,5 +1,5 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="umbracoPage.master.cs" Inherits="umbraco.presentation.umbraco.masterpages.umbracoPage" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency" Assembly="umbraco.presentation.ClientDependency" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -10,21 +10,23 @@
</head>
<body class="umbracoPage">
<umb:ClientDependencyLoader runat="server" id="ClientLoader" EmbedType="Header" IsDebugMode="true" >
<umb:ClientDependencyLoader runat="server" id="ClientLoader" EmbedType="Header" IsDebugMode="false" >
<Paths>
<umb:ClientDependencyPath Name="UmbracoClient" Path="~/umbraco_client" />
<umb:ClientDependencyPath Name="UmbracoRoot" Path='<%#umbraco.GlobalSettings.Path%>' />
</Paths>
</umb:ClientDependencyLoader>
<umb:ClientDependencyInclude ID="ClientDependencyInclude1" runat="server" DependencyType="Css" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="ui/default.css" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude8" DependencyType="Javascript" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude6" DependencyType="Javascript" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude2" DependencyType="Javascript" FilePath="ui/default.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude11" DependencyType="Javascript" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude12" DependencyType="Javascript" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude13" DependencyType="Javascript" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:JsInclude ID="JsInclude4" runat="server" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" Priority="2" />
<umb:JsInclude ID="JsInclude5" runat="server" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" Priority="2" />
<umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" Priority="3" />
<umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="10" />
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server"></asp:ScriptManager>

32
umbraco/presentation/umbraco/masterpages/umbracoPage.Master.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -29,70 +29,70 @@ namespace umbraco.presentation.umbraco.masterpages {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyLoader ClientLoader;
protected global::umbraco.presentation.ClientDependency.Controls.ClientDependencyLoader ClientLoader;
/// <summary>
/// ClientDependencyInclude1 control.
/// CssInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude1;
protected global::umbraco.presentation.ClientDependency.Controls.CssInclude CssInclude1;
/// <summary>
/// ClientDependencyInclude8 control.
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude8;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// ClientDependencyInclude6 control.
/// JsInclude2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude6;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude2;
/// <summary>
/// ClientDependencyInclude2 control.
/// JsInclude4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude2;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude4;
/// <summary>
/// ClientDependencyInclude11 control.
/// JsInclude5 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude11;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude5;
/// <summary>
/// ClientDependencyInclude12 control.
/// JsInclude6 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude12;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude6;
/// <summary>
/// ClientDependencyInclude13 control.
/// JsInclude3 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude13;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude3;
/// <summary>
/// form1 control.

4
umbraco/presentation/umbraco/treeInit.aspx
View File

@@ -1,6 +1,6 @@
<%@ Page Language="c#" CodeBehind="treeInit.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.TreeInit" %>
<%@ Register Src="~/umbraco/controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency" Assembly="umbraco.presentation.ClientDependency" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -31,7 +31,7 @@
</Paths>
</umb:ClientDependencyLoader>
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude3" DependencyType="Css" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server" EnablePartialRendering="true" LoadScriptsBeforeUI="true">

8
umbraco/presentation/umbraco/treeInit.aspx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.3053
// Runtime Version:2.0.50727.3082
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -29,16 +29,16 @@ namespace umbraco.cms.presentation {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyLoader ClientLoader;
protected global::umbraco.presentation.ClientDependency.Controls.ClientDependencyLoader ClientLoader;
/// <summary>
/// ClientDependencyInclude3 control.
/// CssInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude3;
protected global::umbraco.presentation.ClientDependency.Controls.CssInclude CssInclude1;
/// <summary>
/// form1 control.

33
umbraco/presentation/umbraco/umbraco.aspx
View File

@@ -3,7 +3,7 @@
<%@ Register Src="~/umbraco/controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="uc1" TagName="quickEdit" Src="dashboard/quickEdit.ascx" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency" Assembly="umbraco.presentation.ClientDependency" %>
<%@ Register TagPrefix="umb" Namespace="umbraco.presentation.ClientDependency.Controls" Assembly="umbraco.presentation.ClientDependency" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -17,26 +17,29 @@
</head>
<body id="umbracoMainPageBody">
<umb:ClientDependencyLoader runat="server" id="ClientLoader" EmbedType="Header" IsDebugMode="true" >
<umb:ClientDependencyLoader runat="server" id="ClientLoader" EmbedType="Header" IsDebugMode="false" >
<Paths>
<umb:ClientDependencyPath Name="UmbracoClient" Path="~/umbraco_client" />
<umb:ClientDependencyPath Name="UmbracoRoot" Path='<%#umbraco.GlobalSettings.Path%>' />
</Paths>
</umb:ClientDependencyLoader>
<umb:ClientDependencyInclude runat="server" ID="ClientDependencyInclude3" DependencyType="Css" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude1" DependencyType="Css" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude4" DependencyType="Javascript" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude5" DependencyType="Javascript" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude6" DependencyType="Javascript" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient" Priority="1" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude7" DependencyType="Javascript" FilePath="modal/modal.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude11" DependencyType="Javascript" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude12" DependencyType="Javascript" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude13" DependencyType="Javascript" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude14" DependencyType="Javascript" FilePath="ui/default.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude15" DependencyType="Javascript" FilePath="ui/jQueryWresize.js" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude9" DependencyType="Javascript" FilePath="js/guiFunctions.js" PathNameAlias="UmbracoRoot" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude10" DependencyType="Javascript" FilePath="js/language.aspx" PathNameAlias="UmbracoRoot" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
<umb:CssInclude ID="CssInclude2" runat="server" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/NamespaceManager.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" />
<umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient" Priority="1" />
<umb:JsInclude ID="JsInclude5" runat="server" FilePath="Application/UmbracoApplicationActions.js" PathNameAlias="UmbracoClient" Priority="2" />
<umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" Priority="2" />
<umb:JsInclude ID="JsInclude7" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" Priority="3" />
<umb:JsInclude ID="JsInclude8" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="4" />
<umb:JsInclude ID="JsInclude9" runat="server" FilePath="ui/jQueryWresize.js" PathNameAlias="UmbracoClient" />
<umb:JsInclude ID="JsInclude10" runat="server" FilePath="js/guiFunctions.js" PathNameAlias="UmbracoRoot" />
<umb:JsInclude ID="JsInclude11" runat="server" FilePath="js/language.aspx" PathNameAlias="UmbracoRoot" />
<umb:JsInclude ID="JsInclude4" runat="server" FilePath="modal/modal.js" PathNameAlias="UmbracoClient" Priority="10" />

54
umbraco/presentation/umbraco/umbraco.aspx.designer.cs generated
View File

@@ -29,124 +29,124 @@ namespace umbraco.cms.presentation {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyLoader ClientLoader;
protected global::umbraco.presentation.ClientDependency.Controls.ClientDependencyLoader ClientLoader;
/// <summary>
/// ClientDependencyInclude3 control.
/// CssInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude3;
protected global::umbraco.presentation.ClientDependency.Controls.CssInclude CssInclude1;
/// <summary>
/// ClientDependencyInclude1 control.
/// CssInclude2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude1;
protected global::umbraco.presentation.ClientDependency.Controls.CssInclude CssInclude2;
/// <summary>
/// ClientDependencyInclude4 control.
/// JsInclude1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude4;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude1;
/// <summary>
/// ClientDependencyInclude5 control.
/// JsInclude2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude5;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude2;
/// <summary>
/// ClientDependencyInclude6 control.
/// JsInclude3 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude6;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude3;
/// <summary>
/// ClientDependencyInclude7 control.
/// JsInclude5 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude7;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude5;
/// <summary>
/// ClientDependencyInclude11 control.
/// JsInclude6 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude11;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude6;
/// <summary>
/// ClientDependencyInclude12 control.
/// JsInclude7 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude12;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude7;
/// <summary>
/// ClientDependencyInclude13 control.
/// JsInclude8 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude13;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude8;
/// <summary>
/// ClientDependencyInclude14 control.
/// JsInclude9 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude14;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude9;
/// <summary>
/// ClientDependencyInclude15 control.
/// JsInclude10 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude15;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude10;
/// <summary>
/// ClientDependencyInclude9 control.
/// JsInclude11 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude9;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude11;
/// <summary>
/// ClientDependencyInclude10 control.
/// JsInclude4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude10;
protected global::umbraco.presentation.ClientDependency.Controls.JsInclude JsInclude4;
/// <summary>
/// Form1 control.