lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-24 05:42:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Working around an model state / HTML helper issue."

Browse Source 
This reverts commit dca8697767.
This commit is contained in:
Sipke Schoorstra
2015-01-03 14:05:20 +01:00
parent b359dc9f29
commit 287e50b4f7
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard.Web/Modules/Orchard.Layouts/Helpers/ElementStateHelper.cs
View File

@@ -7,10 +7,7 @@ using Orchard.Layouts.Framework.Elements;
namespace Orchard.Layouts.Helpers {
public static class ElementStateHelper {
private static readonly string[] _elementStateBlackList = { "ElementState", "__RequestVerificationToken" };
public static readonly Func<NameValueCollection, string, string> CopyAllValuesStrategy = (col, key) => col[key];
public static readonly Func<NameValueCollection, string, string> CopyFirstValueStrategy = (col, key) => col.GetValues(key).FirstOrDefault();
private static readonly string[] _elementStateBlackList = {"ElementState", "__RequestVerificationToken"};
public static string Get(this StateDictionary state, string key, string defaultValue = null) {
return state != null ? state.ContainsKey(key) ? state[key] : defaultValue : defaultValue;
@@ -22,7 +19,7 @@ namespace Orchard.Layouts.Helpers {
public static StateDictionary Combine(this StateDictionary target, StateDictionary input, bool removeNonExistingItems = false) {
var combined = new StateDictionary(target);
foreach (var item in input) {
combined[item.Key] = item.Value;
}
@@ -60,40 +57,33 @@ namespace Orchard.Layouts.Helpers {
return dictionary;
}
public static StateDictionary ToDictionary(this NameValueCollection nameValues, Func<NameValueCollection, string, string> copyStrategy = null) {
public static StateDictionary ToDictionary(this NameValueCollection nameValues) {
var copy = new NameValueCollection(nameValues);
foreach (var key in _elementStateBlackList) {
copy.Remove(key);
}
var dictionary = new StateDictionary();
if (copyStrategy == null)
copyStrategy = CopyFirstValueStrategy;
foreach (string key in copy) {
dictionary[key] = copyStrategy(copy, key);
dictionary[key] = copy[key];
}
return dictionary;
}
public static IDictionary<string, object> ToTokenDictionary(this NameValueCollection nameValues, Func<NameValueCollection, string, string> copyStrategy = null) {
public static IDictionary<string, object> ToTokenDictionary(this NameValueCollection nameValues) {
var copy = new NameValueCollection(nameValues);
foreach (var key in _elementStateBlackList) {
copy.Remove(key);
}
var dictionary = new Dictionary<string, object>();
if (copyStrategy == null)
copyStrategy = CopyFirstValueStrategy;
foreach (string key in copy) {
dictionary[key] = copyStrategy(copy, key);
dictionary[key] = copy[key];
}
return dictionary;