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 
ClientDependency fixes and implementation. Tagged some files for removal.

[TFS Changeset #56112]
This commit is contained in:
Shandem
2009-07-07 14:27:03 +00:00
parent 22be4743bc
commit a0e3589502
26 changed files with 489 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ namespace umbraco.presentation.ClientDependency
/// performance on the client side.
/// Though both javascript and css files may have the same group name specified, they will be treated seperately.
/// </remarks>
public string CompositeGroupName { get; set; }
//public string CompositeGroupName { get; set; }
/// <summary>
/// Gets or sets the priority.
@@ -69,6 +69,14 @@ namespace umbraco.presentation.ClientDependency
/// <value>The name of the method.</value>
public string InvokeJavascriptMethodOnLoad { get; set; }
public ClientDependencyAttribute(ClientDependencyType dependencyType, string fullFilePath)
: this(DefaultPriority, dependencyType, fullFilePath, string.Empty, string.Empty)
{ }
public ClientDependencyAttribute(ClientDependencyType dependencyType, string fileName, string pathNameAlias)
: this(DefaultPriority, dependencyType, fileName, pathNameAlias, string.Empty)
{ }
/// <summary>
/// Initializes a new instance of the <see cref="ClientDependencyAttribute"/> class.
/// </summary>
@@ -102,10 +110,6 @@ namespace umbraco.presentation.ClientDependency
/// <param name="appendUmbracoPath">if set to <c>true</c> the current umbraco path will be prefixed to the filePath.</param>
/// <param name="invokeJavascriptMethodOnLoad">The name of the Javascript method to invoke when the dependency is loaded.</param>
public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string fileName, string pathNameAlias, string invokeJavascriptMethodOnLoad)
: this(priority, dependencyType, fileName, pathNameAlias, invokeJavascriptMethodOnLoad, string.Empty)
{ }
public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string fileName, string pathNameAlias, string invokeJavascriptMethodOnLoad, string compositeGroupName)
{
if (String.IsNullOrEmpty(fileName))
throw new ArgumentNullException("fileName");
@@ -115,11 +119,12 @@ namespace umbraco.presentation.ClientDependency
FilePath = fileName;
PathNameAlias = pathNameAlias;
CompositeGroupName = compositeGroupName;
//CompositeGroupName = compositeGroupName;
DependencyType = dependencyType;
InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad ?? string.Empty;
}
}

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

@@ -127,18 +127,22 @@ namespace umbraco.presentation.ClientDependency
service.ProcessDependencies();
}
/// <summary>
/// This class is used to find all dependencies for the current request, d
/// </summary>
internal class ClientDependencyRegistrationService
{
public ClientDependencyRegistrationService(Control control, ClientDependencyPathCollection paths, ClientDependencyProvider provider)
{
m_RenderingControl = control;
m_Paths = paths;
//find all dependencies
m_Dependencies = FindDependencies(m_RenderingControl);
m_Provider = provider;
}
private Control m_RenderingControl;
private List<IClientDependencyFile> m_Dependencies = new List<IClientDependencyFile>();
private ClientDependencyList m_Dependencies = new ClientDependencyList();
private ClientDependencyPathCollection m_Paths;
private ClientDependencyProvider m_Provider;
@@ -147,11 +151,11 @@ namespace umbraco.presentation.ClientDependency
/// </summary>
/// <param name="control"></param>
/// <returns></returns>
private List<IClientDependencyFile> FindDependencies(Control control)
private ClientDependencyList FindDependencies(Control control)
{
// find dependencies
Type controlType = control.GetType();
List<IClientDependencyFile> dependencies = new List<IClientDependencyFile>();
ClientDependencyList dependencies = new ClientDependencyList();
foreach (Attribute attribute in Attribute.GetCustomAttributes(controlType))
{
if (attribute is ClientDependencyAttribute)
@@ -166,12 +170,12 @@ namespace umbraco.presentation.ClientDependency
if (child.GetType().Equals(typeof(ClientDependencyInclude)))
{
ClientDependencyInclude include = (ClientDependencyInclude)child;
//dependencies.Add(new ClientDependencyAttribute(include.Priority, include.DependencyType, include.FilePath, include.PathName, include.InvokeJavascriptMethodOnLoad, include.CompositeGroupName));
dependencies.Add(include);
}
else if (child.HasControls())
else
{
dependencies.AddRange(FindDependencies(child));
//recurse and de-duplicate!
dependencies.UnionWith(FindDependencies(child));
}
}

46
umbraco/presentation.ClientDependency/ClientDependencyList.cs Normal file
View File

@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace umbraco.presentation.ClientDependency
{
/// <summary>
/// Wraps a HashSet object for the client dependency file type and declares a equality operator
/// </summary>
public class ClientDependencyList : HashSet<IClientDependencyFile>
{
public ClientDependencyList() : base(new ClientDependencyComparer()) { }
internal class ClientDependencyComparer : IEqualityComparer<IClientDependencyFile>
{
#region IEqualityComparer<IClientDependencyFile> Members
/// <summary>
/// If the lowercased combination of the file path, dependency type and path name aliases are the same,
/// then they are the same dependency.
/// </summary>
/// <param name="x"></param>
/// <param name="y"></param>
/// <returns></returns>
public bool Equals(IClientDependencyFile x, IClientDependencyFile y)
{
return (x.FilePath.ToLower().Trim() + x.DependencyType.ToString().ToLower() + x.PathNameAlias.ToLower().Trim() ==
y.FilePath.ToLower().Trim() + y.DependencyType.ToString().ToLower() + y.PathNameAlias.ToLower().Trim());
}
public int GetHashCode(IClientDependencyFile obj)
{
return (obj.FilePath.ToLower().Trim() + obj.DependencyType.ToString().ToLower() + obj.PathNameAlias.ToLower().Trim())
.GetHashCode();
}
#endregion
}
}
}

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

@@ -10,7 +10,7 @@ namespace umbraco.presentation.ClientDependency
ClientDependencyType DependencyType { get; set; }
string InvokeJavascriptMethodOnLoad { get; set; }
int Priority { get; set; }
string CompositeGroupName { get; set; }
//string CompositeGroupName { get; set; }
string PathNameAlias { get; set; }
}
}

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

@@ -34,10 +34,10 @@ namespace umbraco.presentation.ClientDependency.Providers
base.Initialize(name, config);
}
public void RegisterDependencies(Control dependantControl, List<IClientDependencyFile> dependencies, ClientDependencyPathCollection paths)
public void RegisterDependencies(Control dependantControl, ClientDependencyList dependencies, ClientDependencyPathCollection paths)
{
DependantControl = dependantControl;
AllDependencies = dependencies;
AllDependencies = new List<IClientDependencyFile>(dependencies);
FolderPaths = paths;
UpdateFilePaths();
@@ -46,18 +46,18 @@ namespace umbraco.presentation.ClientDependency.Providers
List<IClientDependencyFile> jsDependencies = AllDependencies.FindAll(
delegate(IClientDependencyFile a)
{
if (!IsDebugMode)
return a.DependencyType == ClientDependencyType.Javascript && string.IsNullOrEmpty(a.CompositeGroupName);
else
//if (!IsDebugMode)
// return a.DependencyType == ClientDependencyType.Javascript && string.IsNullOrEmpty(a.CompositeGroupName);
//else
return a.DependencyType == ClientDependencyType.Javascript;
}
);
List<IClientDependencyFile> cssDependencies = AllDependencies.FindAll(
delegate(IClientDependencyFile a)
{
if (!IsDebugMode)
return a.DependencyType == ClientDependencyType.Css && string.IsNullOrEmpty(a.CompositeGroupName);
else
//if (!IsDebugMode)
// return a.DependencyType == ClientDependencyType.Css && string.IsNullOrEmpty(a.CompositeGroupName);
//else
return a.DependencyType == ClientDependencyType.Css;
}
);
@@ -66,36 +66,36 @@ namespace umbraco.presentation.ClientDependency.Providers
jsDependencies.Sort((a, b) => a.Priority.CompareTo(b.Priority));
cssDependencies.Sort((a, b) => a.Priority.CompareTo(b.Priority));
if (!IsDebugMode) RegisterCssFiles(ProcessCompositeGroups(ClientDependencyType.Css));
//if (!IsDebugMode) RegisterCssFiles(ProcessCompositeGroups(ClientDependencyType.Css));
RegisterCssFiles(cssDependencies.ConvertAll<IClientDependencyFile>(a => { return (IClientDependencyFile)a; }));
if (!IsDebugMode) RegisterJsFiles(ProcessCompositeGroups(ClientDependencyType.Javascript));
//if (!IsDebugMode) RegisterJsFiles(ProcessCompositeGroups(ClientDependencyType.Javascript));
RegisterJsFiles(jsDependencies.ConvertAll<IClientDependencyFile>(a => { return (IClientDependencyFile)a; }));
}
private List<IClientDependencyFile> ProcessCompositeGroups(ClientDependencyType type)
{
List<IClientDependencyFile> dependencies = AllDependencies.FindAll(
delegate(IClientDependencyFile a)
{
return a.DependencyType == type && !string.IsNullOrEmpty(a.CompositeGroupName);
}
);
//private List<IClientDependencyFile> ProcessCompositeGroups(ClientDependencyType type)
//{
// List<IClientDependencyFile> dependencies = AllDependencies.FindAll(
// delegate(IClientDependencyFile a)
// {
// return a.DependencyType == type && !string.IsNullOrEmpty(a.CompositeGroupName);
// }
// );
List<string> groups = new List<string>();
List<IClientDependencyFile> files = new List<IClientDependencyFile>();
foreach (IClientDependencyFile a in dependencies)
{
if (!groups.Contains(a.CompositeGroupName))
{
string url = ProcessCompositeGroup(dependencies, a.CompositeGroupName, type);
groups.Add(a.CompositeGroupName);
files.Add(new SimpleDependencyFile(url, type));
DependantControl.Page.Trace.Write("ClientDependency", "Composite group " + a.CompositeGroupName + " URL: " + url);
}
}
return files;
}
// List<string> groups = new List<string>();
// List<IClientDependencyFile> files = new List<IClientDependencyFile>();
// foreach (IClientDependencyFile a in dependencies)
// {
// if (!groups.Contains(a.CompositeGroupName))
// {
// string url = ProcessCompositeGroup(dependencies, a.CompositeGroupName, type);
// groups.Add(a.CompositeGroupName);
// files.Add(new SimpleDependencyFile(url, type));
// DependantControl.Page.Trace.Write("ClientDependency", "Composite group " + a.CompositeGroupName + " URL: " + url);
// }
// }
// return files;
//}
/// <summary>
/// Returns a full url with the encoded query strings for the handler which will process the composite group.
@@ -103,26 +103,26 @@ namespace umbraco.presentation.ClientDependency.Providers
/// <param name="dependencies"></param>
/// <param name="groupName"></param>
/// <returns></returns>
private string ProcessCompositeGroup(List<IClientDependencyFile> dependencies, string groupName, ClientDependencyType type)
{
string handler = "{0}?s={1}&t={2}";
StringBuilder files = new StringBuilder();
List<IClientDependencyFile> byGroup = dependencies.FindAll(
delegate(IClientDependencyFile a)
{
return a.CompositeGroupName == groupName;
}
);
byGroup.Sort((a, b) => a.Priority.CompareTo(b.Priority));
foreach (IClientDependencyFile a in byGroup)
{
files.Append(a.FilePath + ";");
}
string url = string.Format(handler, CompositeDependencyHandler.HandlerFileName, HttpContext.Current.Server.UrlEncode(EncodeTo64(files.ToString())), type.ToString());
if (url.Length > CompositeDependencyHandler.MaxHandlerUrlLength)
throw new ArgumentOutOfRangeException("The number of files in the composite group " + groupName + " creates a url handler address that exceeds the CompositeDependencyHandler MaxHandlerUrlLength. Reducing the amount of files in this composite group should fix the issue");
return url;
}
//private string ProcessCompositeGroup(List<IClientDependencyFile> dependencies, string groupName, ClientDependencyType type)
//{
// string handler = "{0}?s={1}&t={2}";
// StringBuilder files = new StringBuilder();
// List<IClientDependencyFile> byGroup = dependencies.FindAll(
// delegate(IClientDependencyFile a)
// {
// return a.CompositeGroupName == groupName;
// }
// );
// byGroup.Sort((a, b) => a.Priority.CompareTo(b.Priority));
// foreach (IClientDependencyFile a in byGroup)
// {
// files.Append(a.FilePath + ";");
// }
// string url = string.Format(handler, CompositeDependencyHandler.HandlerFileName, HttpContext.Current.Server.UrlEncode(EncodeTo64(files.ToString())), type.ToString());
// if (url.Length > CompositeDependencyHandler.MaxHandlerUrlLength)
// throw new ArgumentOutOfRangeException("The number of files in the composite group " + groupName + " creates a url handler address that exceeds the CompositeDependencyHandler MaxHandlerUrlLength. Reducing the amount of files in this composite group should fix the issue");
// return url;
//}
private string EncodeTo64(string toEncode)
{
@@ -176,7 +176,7 @@ namespace umbraco.presentation.ClientDependency.Providers
public ClientDependencyType DependencyType { get; set; }
public string InvokeJavascriptMethodOnLoad { get; set; }
public int Priority { get; set; }
public string CompositeGroupName { get; set; }
//public string CompositeGroupName { get; set; }
public string PathNameAlias { get; set; }
}

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

@@ -49,6 +49,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ClientDependencyInclude.cs" />
<Compile Include="ClientDependencyList.cs" />
<Compile Include="ClientDependencyType.cs" />
<Compile Include="IClientDependencyFile.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

16
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -415,14 +415,14 @@
<Compile Include="umbraco\ClientDependencyTest.aspx.designer.cs">
<DependentUpon>ClientDependencyTest.aspx</DependentUpon>
</Compile>
<Compile Include="umbraco\ContentItem\edit.aspx.cs">
<DependentUpon>edit.aspx</DependentUpon>
<Compile Include="umbraco\__TODELETE__ContentItem\__TODELETE__edit.aspx.cs">
<DependentUpon>__TODELETE__edit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="umbraco\ContentItem\edit.aspx.designer.cs">
<DependentUpon>edit.aspx</DependentUpon>
<Compile Include="umbraco\__TODELETE__ContentItem\__TODELETE__edit.aspx.designer.cs">
<DependentUpon>__TODELETE__edit.aspx</DependentUpon>
</Compile>
<Compile Include="umbraco\controls\CheckboxTree.cs" />
<Compile Include="umbraco\controls\__TODELETE__CheckboxTree.cs" />
<Compile Include="umbraco\controls\ContentControl.cs">
<SubType>Code</SubType>
</Compile>
@@ -2032,7 +2032,7 @@
<Content Include="umbraco\translation\preview.aspx" />
<Content Include="umbraco\translation\translationTasks.dtd" />
<Content Include="umbraco\translation\xml.aspx" />
<Content Include="umbraco\ContentItem\edit.aspx" />
<Content Include="umbraco\__TODELETE__ContentItem\__TODELETE__edit.aspx" />
<Content Include="umbraco\controls\ContentTypeControlNew.ascx" />
<Content Include="umbraco\controls\GenericProperties\GenericProperty.ascx">
<SubType>UserControl</SubType>
@@ -3514,8 +3514,8 @@
<DependentUpon>cacheBrowser.aspx.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="umbraco\ContentItem\edit.aspx.resx">
<DependentUpon>edit.aspx.cs</DependentUpon>
<EmbeddedResource Include="umbraco\__TODELETE__ContentItem\__TODELETE__edit.aspx.resx">
<DependentUpon>__TODELETE__edit.aspx.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="umbraco\controls\ContentTypeControlNew.ascx.resx">

10
umbraco/presentation/umbraco/ClientDependencyTest.aspx.cs
View File

@@ -10,11 +10,11 @@ namespace umbraco.presentation.umbraco
[ClientDependency(1, ClientDependencyType.Javascript, "Application/NamespaceManager.js", "UmbracoClient")]
[ClientDependency(0, ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient")]
[ClientDependency(0, ClientDependencyType.Css, "css/umbracoGui.css", "UmbracoRoot", CompositeGroupName = "CSSFiles")]
[ClientDependency(0, ClientDependencyType.Css, "css/treeIcons.css", "UmbracoRoot", CompositeGroupName = "CSSFiles")]
[ClientDependency(0, ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient", CompositeGroupName = "JQueryUI")]
[ClientDependency(1, ClientDependencyType.Javascript, "ui/accordian.js", "UmbracoClient", CompositeGroupName = "JQueryUI")]
[ClientDependency(2, ClientDependencyType.Javascript, "ui/jQueryWresize.js", "UmbracoClient", CompositeGroupName = "JQueryUI")]
[ClientDependency(0, ClientDependencyType.Css, "css/umbracoGui.css", "UmbracoRoot" )]
[ClientDependency(0, ClientDependencyType.Css, "css/treeIcons.css", "UmbracoRoot")]
[ClientDependency(0, ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient")]
[ClientDependency(1, ClientDependencyType.Javascript, "ui/accordian.js", "UmbracoClient")]
[ClientDependency(2, ClientDependencyType.Javascript, "ui/jQueryWresize.js", "UmbracoClient")]
public partial class ClientDependencyTest : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)

4
umbraco/presentation/umbraco/Trees/loadContent.cs
View File

@@ -131,6 +131,10 @@ namespace umbraco
}
/// <summary>
/// If the user is an admin, always return entire tree structure, otherwise
/// return the user's start node id.
/// </summary>
public override int StartNodeID
{
get

21
umbraco/presentation/umbraco/Trees/loadMedia.cs
View File

@@ -51,6 +51,20 @@ namespace umbraco
}
private User m_user;
/// <summary>
/// Returns the current User. This ensures that we don't instantiate a new User object
/// each time.
/// </summary>
protected User CurrentUser
{
get
{
return (m_user == null ? (m_user = UmbracoEnsuredPage.CurrentUser) : m_user);
}
}
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
//TODO: SD: Find out what openMedia does!?
@@ -81,12 +95,15 @@ namespace umbraco
actions.Add(ActionRefresh.Instance);
}
/// <summary>
/// If the user is an admin, always return entire tree structure, otherwise
/// return the user's start node id.
/// </summary>
public override int StartNodeID
{
get
{
UmbracoEnsuredPage page = new UmbracoEnsuredPage();
return page.getUser().StartMediaId;
return CurrentUser.StartMediaId;
}
}

2
umbraco/presentation/umbraco/__TODELETE__ContentItem/edit.aspx → umbraco/presentation/umbraco/__TODELETE__ContentItem/__TODELETE__edit.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page language="c#" Codebehind="edit.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.edit" %>
<%@ Page language="c#" Codebehind="__TODELETE__edit.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.edit" %>
<HTML>
<HEAD>
<script>

0
umbraco/presentation/umbraco/__TODELETE__ContentItem/edit.aspx.cs → umbraco/presentation/umbraco/__TODELETE__ContentItem/__TODELETE__edit.aspx.cs
View File

0
umbraco/presentation/umbraco/__TODELETE__ContentItem/edit.aspx.designer.cs → umbraco/presentation/umbraco/__TODELETE__ContentItem/__TODELETE__edit.aspx.designer.cs generated
View File

0
umbraco/presentation/umbraco/__TODELETE__ContentItem/edit.aspx.resx → umbraco/presentation/umbraco/__TODELETE__ContentItem/__TODELETE__edit.aspx.resx
View File

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

@@ -8,9 +8,25 @@ using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using umbraco.cms.presentation.Trees;
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")]
[ClientDependency(ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")]
[ClientDependency(ClientDependencyType.Javascript, "js/submodal/subModal.js", "UmbracoRoot")]
[ClientDependency(ClientDependencyType.Css, "js/submodal/subModal.css", "UmbracoRoot")]
public class ContentPicker : System.Web.UI.WebControls.WebControl
{
@@ -70,9 +86,9 @@ 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>");
//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);

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

@@ -1,15 +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" %>
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude7" DependencyType="Css" FilePath="Tree/Themes/tree_component.css" PathNameAlias="UmbracoClient" />
<umb:ClientDependencyInclude ID="ClientDependencyInclude1" runat="server" DependencyType="Javascript" FilePath="Application/JQuery/jquery.metadata.min.js" PathNameAlias="UmbracoClient" Priority="10" CompositeGroupName="UmbTree" />
<umb:ClientDependencyInclude ID="ClientDependencyInclude6" runat="server" DependencyType="Javascript" FilePath="Application/JQuery/jquery.cookie.js" PathNameAlias="UmbracoClient" Priority="10" CompositeGroupName="UmbTree" />
<umb:ClientDependencyInclude ID="ClientDependencyInclude2" runat="server" DependencyType="Javascript" FilePath="Tree/css.js" PathNameAlias="UmbracoClient" Priority="10" CompositeGroupName="UmbTree" />
<umb:ClientDependencyInclude ID="ClientDependencyInclude5" runat="server" DependencyType="Javascript" FilePath="Tree/tree_component.min.js" PathNameAlias="UmbracoClient" Priority="11" CompositeGroupName="UmbTree" />
<umb:ClientDependencyInclude ID="ClientDependencyInclude3" runat="server" DependencyType="Javascript" FilePath="Tree/NodeDefinition.js" PathNameAlias="UmbracoClient" Priority="12" CompositeGroupName="UmbTree" />
<umb:ClientDependencyInclude ID="ClientDependencyInclude4" runat="server" DependencyType="Javascript" FilePath="Tree/UmbracoTree.js" PathNameAlias="UmbracoClient" Priority="13" CompositeGroupName="UmbTree" />
<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.js" PathNameAlias="UmbracoClient" Priority="13" />
<script type="text/javascript">

42
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.3074
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -23,13 +23,40 @@ namespace umbraco.presentation.umbraco.controls {
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude7;
/// <summary>
/// ClientDependencyInclude1 control.
/// ClientDependencyInclude8 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.ClientDependencyInclude ClientDependencyInclude8;
/// <summary>
/// ClientDependencyInclude13 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;
/// <summary>
/// ClientDependencyInclude11 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;
/// <summary>
/// ClientDependencyInclude12 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;
/// <summary>
/// ClientDependencyInclude6 control.
@@ -40,6 +67,15 @@ namespace umbraco.presentation.umbraco.controls {
/// </remarks>
protected global::umbraco.presentation.ClientDependency.ClientDependencyInclude ClientDependencyInclude6;
/// <summary>
/// ClientDependencyInclude1 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;
/// <summary>
/// ClientDependencyInclude2 control.
/// </summary>

0
umbraco/presentation/umbraco/controls/CheckboxTree.cs → umbraco/presentation/umbraco/controls/__TODELETE__CheckboxTree.cs
View File

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

@@ -1,23 +1,31 @@
<%@ 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" %>
<!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 runat="server">
<title></title>
<!-- Default script and style -->
<link rel="Stylesheet" href="/umbraco_client/ui/default.css" type="text/css" />
<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/UmbracoApplicationActions.js" type="text/javascript"></script>
<script type="text/javascript" src="/umbraco_client/Application/UmbracoUtils.js"></script>
<script src="/umbraco_client/Application/UmbracoClientManager.js" type="text/javascript"></script>
<asp:ContentPlaceHolder ID="head" runat="server"></asp:ContentPlaceHolder>
</head>
<body class="umbracoPage">
<umb:ClientDependencyLoader runat="server" id="ClientLoader" EmbedType="Header" IsDebugMode="true" >
<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: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" />
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" EnablePartialRendering="true" runat="server"></asp:ScriptManager>
<asp:ContentPlaceHolder ID="body" runat="server">

11
umbraco/presentation/umbraco/masterpages/umbracoPage.Master.cs
View File

@@ -4,10 +4,13 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace umbraco.presentation.umbraco.masterpages {
public partial class umbracoPage : System.Web.UI.MasterPage {
protected void Page_Load(object sender, EventArgs e) {
namespace umbraco.presentation.umbraco.masterpages
{
public partial class umbracoPage : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
ClientLoader.DataBind();
}
}
}

74
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.1433
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -22,6 +22,78 @@ 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.ClientDependencyLoader ClientLoader;
/// <summary>
/// ClientDependencyInclude1 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;
/// <summary>
/// ClientDependencyInclude8 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;
/// <summary>
/// ClientDependencyInclude6 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;
/// <summary>
/// ClientDependencyInclude2 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;
/// <summary>
/// ClientDependencyInclude11 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;
/// <summary>
/// ClientDependencyInclude12 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;
/// <summary>
/// ClientDependencyInclude13 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;
/// <summary>
/// form1 control.
/// </summary>

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

@@ -1,13 +1,12 @@
<%@ 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" %>
<!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>
<link rel="stylesheet" type="text/css" href="/umbraco_client/Tree/Themes/tree_component.css" />
<link rel="stylesheet" type="text/css" href="/umbraco/css/umbracoGui.css" />
<style type="text/css">
body
{
@@ -25,16 +24,17 @@
<![endif]-->
</head>
<body>
<umb:ClientDependencyLoader runat="server" id="ClientLoader" EmbedType="Header" IsDebugMode="true" >
<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" />
<form id="form1" runat="server">
<asp:ScriptManager ID="ScriptManager1" runat="server" EnablePartialRendering="true" LoadScriptsBeforeUI="true">
<Scripts>
<asp:ScriptReference Path="~/umbraco_client/Application/NamespaceManager.js" />
<asp:ScriptReference Path="~/umbraco_client/ui/jquery.js" />
<asp:ScriptReference Path="~/umbraco_client/Application/JQuery/jquery.metadata.min.js" />
<asp:ScriptReference Path="~/umbraco_client/Application/UmbracoApplicationActions.js" />
<asp:ScriptReference Path="~/umbraco_client/Application/UmbracoUtils.js" />
<asp:ScriptReference Path="~/umbraco_client/Application/UmbracoClientManager.js" />
</Scripts>
</asp:ScriptManager>
<div>
<umbraco:TreeControl runat="server" ID="JTree"></umbraco:TreeControl>

5
umbraco/presentation/umbraco/treeInit.aspx.cs
View File

@@ -22,6 +22,11 @@ namespace umbraco.cms.presentation
public partial class TreeInit : UmbracoEnsuredPage
{
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
ClientLoader.DataBind();
}
}
}

20
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.1433
// Runtime Version:2.0.50727.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -22,6 +22,24 @@ namespace umbraco.cms.presentation {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <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.ClientDependencyLoader ClientLoader;
/// <summary>
/// ClientDependencyInclude3 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;
/// <summary>
/// form1 control.
/// </summary>

21
umbraco/presentation/umbraco/umbraco.aspx
View File

@@ -26,19 +26,16 @@
<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" CompositeGroupName="JSCore" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude5" DependencyType="Javascript" FilePath="ui/jquery.js" PathNameAlias="UmbracoClient" Priority="0" CompositeGroupName="JSCore" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude6" DependencyType="Javascript" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient" Priority="1" CompositeGroupName="JSAddons" />
<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" CompositeGroupName="UmbApp" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude12" DependencyType="Javascript" FilePath="Application/UmbracoUtils.js" PathNameAlias="UmbracoClient" CompositeGroupName="UmbApp" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude13" DependencyType="Javascript" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient" CompositeGroupName="UmbApp" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude14" DependencyType="Javascript" FilePath="ui/default.js" PathNameAlias="UmbracoClient" CompositeGroupName="UmbApp" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude15" DependencyType="Javascript" FilePath="ui/jQueryWresize.js" PathNameAlias="UmbracoClient" CompositeGroupName="UmbApp" />
<umb:ClientDependencyInclude runat="server" id="ClientDependencyInclude9" DependencyType="Javascript" FilePath="js/guiFunctions.js" PathNameAlias="UmbracoRoot" CompositeGroupName="UmbApp" />
<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" />

2
umbraco/presentation/umbraco/umbraco.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.3053
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.