lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Dropped optional parameters, promoted TagRenderMode so links and scripts render ideally.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2010-09-17 12:46:00 -07:00
parent c3f8dfa36a
commit e3be58604c
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -117,7 +117,7 @@ namespace Orchard.Core.Shapes {
foreach (var context in requiredResources.Where(r => foreach (var context in requiredResources.Where(r =>
(includeLocation.HasValue ? r.Settings.Location == includeLocation.Value : true) && (includeLocation.HasValue ? r.Settings.Location == includeLocation.Value : true) &&
(excludeLocation.HasValue ? r.Settings.Location != excludeLocation.Value : true))) { (excludeLocation.HasValue ? r.Settings.Location != excludeLocation.Value : true))) {
html.ViewContext.Writer.WriteLine(context.GetTagBuilder(defaultSettings, appPath).ToString()); html.ViewContext.Writer.WriteLine(context.GetTagBuilder(defaultSettings, appPath).ToString(context.Resource.TagRenderMode));
} }
} }

20
src/Orchard/UI/Resources/ResourceDefinition.cs
View File

@@ -29,7 +29,6 @@ namespace Orchard.UI.Resources {
}; };
private string _basePath; private string _basePath;
private readonly TagRenderMode _tagRenderMode;
private readonly Dictionary<RequireSettings, string> _urlResolveCache = new Dictionary<RequireSettings, string>(); private readonly Dictionary<RequireSettings, string> _urlResolveCache = new Dictionary<RequireSettings, string>();
public ResourceDefinition(ResourceManifest manifest, string type, string name) { public ResourceDefinition(ResourceManifest manifest, string type, string name) {
@@ -37,7 +36,7 @@ namespace Orchard.UI.Resources {
Type = type; Type = type;
Name = name; Name = name;
TagBuilder = new TagBuilder(_resourceTypeTagNames.ContainsKey(type) ? _resourceTypeTagNames[type] : "meta"); TagBuilder = new TagBuilder(_resourceTypeTagNames.ContainsKey(type) ? _resourceTypeTagNames[type] : "meta");
_tagRenderMode = _fileTagRenderModes.ContainsKey(TagBuilder.TagName) ? _fileTagRenderModes[TagBuilder.TagName] : TagRenderMode.Normal; TagRenderMode = _fileTagRenderModes.ContainsKey(TagBuilder.TagName) ? _fileTagRenderModes[TagBuilder.TagName] : TagRenderMode.Normal;
Dictionary<string, string> attributes; Dictionary<string, string> attributes;
if (_resourceAttributes.TryGetValue(type, out attributes)) { if (_resourceAttributes.TryGetValue(type, out attributes)) {
foreach(var pair in attributes) { foreach(var pair in attributes) {
@@ -78,6 +77,7 @@ namespace Orchard.UI.Resources {
public string TagName { public string TagName {
get { return TagBuilder.TagName; } get { return TagBuilder.TagName; }
} }
public TagRenderMode TagRenderMode { get; private set; }
public string Name { get; private set; } public string Name { get; private set; }
public string Type { get; private set; } public string Type { get; private set; }
public string Version { get; private set; } public string Version { get; private set; }
@@ -118,7 +118,11 @@ namespace Orchard.UI.Resources {
return this; return this;
} }
public ResourceDefinition SetUrl(string url, string urlDebug = null) { public ResourceDefinition SetUrl(string url) {
return SetUrl(url, null);
}
public ResourceDefinition SetUrl(string url, string urlDebug) {
if (String.IsNullOrEmpty(url)) { if (String.IsNullOrEmpty(url)) {
throw new ArgumentNullException("url"); throw new ArgumentNullException("url");
} }
@@ -129,7 +133,15 @@ namespace Orchard.UI.Resources {
return this; return this;
} }
public ResourceDefinition SetCdn(string cdnUrl, string cdnUrlDebug = null, bool? cdnSupportsSsl = null) { public ResourceDefinition SetCdn(string cdnUrl) {
return SetCdn(cdnUrl, null, null);
}
public ResourceDefinition SetCdn(string cdnUrl, string cdnUrlDebug) {
return SetCdn(cdnUrl, cdnUrlDebug, null);
}
public ResourceDefinition SetCdn(string cdnUrl, string cdnUrlDebug, bool? cdnSupportsSsl) {
if (String.IsNullOrEmpty(cdnUrl)) { if (String.IsNullOrEmpty(cdnUrl)) {
throw new ArgumentNullException("cdnUrl"); throw new ArgumentNullException("cdnUrl");
} }