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

WORK IN PROGRESS, GET THE STABLE SOURCE FROM THE THE DOWNLOADS TABS

Browse Source 
Mega Commit: New controls: tree control, pickers of all sorts, image viewer, media uploader. Removed a zillion iframes. New modal window standard framework. Fixes some bugs. ClientDependency & Examine DLL updates. Lots of JS enhancements, libs and more methods added to ClientTools.

[TFS Changeset #63838]
This commit is contained in:
Shandem
2010-02-08 02:22:42 +00:00
parent 3372da8225
commit 8ac0e2fa54
220 changed files with 4460 additions and 5436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
components/editorControls/macrocontainer/MacroControlFactory.cs
View File

@@ -27,26 +27,15 @@ namespace umbraco.editorControls.macrocontainer
internal static Control GetMacroRenderControlByType(PersistableMacroProperty prop, string uniqueID)
{
Control macroControl;
//Determine the property type
switch (prop.TypeName.ToLower())
Type m = MacroControlTypes.FindLast(delegate(Type macroGuiCcontrol) { return macroGuiCcontrol.ToString() == string.Format("{0}.{1}", prop.AssemblyName, prop.TypeName); });
IMacroGuiRendering typeInstance;
typeInstance = Activator.CreateInstance(m) as IMacroGuiRendering;
if (!string.IsNullOrEmpty(prop.Value))
{
//Use a pagepicker instead of a IMacroGuiRendering control
case "content":
macroControl = new pagePicker(null);
((pagePicker)macroControl).Value = prop.Value;
break;
///Default behaviour
default:
Type m = MacroControlTypes.FindLast(delegate(Type macroGuiCcontrol) { return macroGuiCcontrol.ToString() == string.Format("{0}.{1}", prop.AssemblyName, prop.TypeName); });
IMacroGuiRendering typeInstance;
typeInstance = Activator.CreateInstance(m) as IMacroGuiRendering;
if (!string.IsNullOrEmpty(prop.Value))
{
((IMacroGuiRendering)typeInstance).Value = prop.Value;
}
macroControl = (Control)typeInstance;
break;
((IMacroGuiRendering)typeInstance).Value = prop.Value;
}
macroControl = (Control)typeInstance;
macroControl.ID = uniqueID;
return macroControl;
@@ -59,17 +48,7 @@ namespace umbraco.editorControls.macrocontainer
/// <returns></returns>
internal static string GetValueFromMacroControl(Control macroControl)
{
if (macroControl is pagePicker)
{
//pagePicker Control
return ((pagePicker)macroControl).Value;
}
else
{
///Macro control
return ((IMacroGuiRendering)macroControl).Value;
}
return ((IMacroGuiRendering)macroControl).Value;
}
#endregion
@@ -85,7 +64,7 @@ namespace umbraco.editorControls.macrocontainer
{
//Populate the list with all the types of IMacroGuiRendering
_macroControlTypes = new List<Type>();
_macroControlTypes = TypeFinder.FindClassesOfType<IMacroGuiRendering>(true);
_macroControlTypes = TypeFinder.FindClassesOfType<IMacroGuiRendering>();
}
return _macroControlTypes;