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

37
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>
@@ -101,25 +109,22 @@ namespace umbraco.presentation.ClientDependency
/// <param name="filePath">The file path to the dependency.</param>
/// <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)
{
if (String.IsNullOrEmpty(fileName))
throw new ArgumentNullException("fileName");
public ClientDependencyAttribute(int priority, ClientDependencyType dependencyType, string fileName, string pathNameAlias, string invokeJavascriptMethodOnLoad, string compositeGroupName)
{
if (String.IsNullOrEmpty(fileName))
throw new ArgumentNullException("fileName");
Priority = priority;
Priority = priority;
FilePath = fileName;
PathNameAlias = pathNameAlias;
CompositeGroupName = compositeGroupName;
FilePath = fileName;
PathNameAlias = pathNameAlias;
//CompositeGroupName = compositeGroupName;
DependencyType = dependencyType;
InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad ?? string.Empty;
}
DependencyType = dependencyType;
InvokeJavascriptMethodOnLoad = invokeJavascriptMethodOnLoad ?? string.Empty;
}
}