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

Merge with 4.11.8

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-05-01 05:33:19 -02:00
parent 7d448d0959 bcb90d64a5
commit 2423bdd623
2 changed files with 58 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/umbraco.editorControls/mediapicker/MediaPickerDataType.cs
View File

@@ -2,60 +2,40 @@ using System;
namespace umbraco.editorControls.mediapicker
{
/// <summary>
/// Summary description for MemberPickerDataType.
/// </summary>
public class MemberPickerDataType : cms.businesslogic.datatype.BaseDataType,interfaces.IDataType
{
private interfaces.IDataEditor _Editor;
private interfaces.IData _baseData;
private interfaces.IDataPrevalue _prevalueeditor;
//TODO: Properly rename this for a major release
public class MediaPickerDataType : MemberPickerDataType
{ }
public override interfaces.IDataEditor DataEditor
{
get
{
if (_Editor == null)
_Editor = new mediaChooser(Data,
((MediaPickerPrevalueEditor)PrevalueEditor).ShowPreview,
((MediaPickerPrevalueEditor)PrevalueEditor).ShowAdvancedDialog);
return _Editor;
}
}
[Obsolete("Renamed to MediaPickerDataType because.. that is what it was all along")]
public class MemberPickerDataType : cms.businesslogic.datatype.BaseDataType, interfaces.IDataType
{
private interfaces.IDataEditor _editor;
private interfaces.IData _baseData;
private interfaces.IDataPrevalue _prevalueeditor;
public override interfaces.IData Data
{
get
{
if (_baseData == null)
_baseData = new cms.businesslogic.datatype.DefaultData(this);
return _baseData;
}
}
public override interfaces.IDataEditor DataEditor
{
get { return _editor ?? (_editor = new mediaChooser(Data, ((MediaPickerPrevalueEditor)PrevalueEditor).ShowPreview, ((MediaPickerPrevalueEditor)PrevalueEditor).ShowAdvancedDialog)); }
}
public override interfaces.IData Data
{
get { return _baseData ?? (_baseData = new cms.businesslogic.datatype.DefaultData(this)); }
}
public override Guid Id
{
get
{
return new Guid ("EAD69342-F06D-4253-83AC-28000225583B");
}
}
public override string DataTypeName
{
get
{
return "Media Picker";
}
}
public override interfaces.IDataPrevalue PrevalueEditor
{
get
{
if (_prevalueeditor == null)
_prevalueeditor = new MediaPickerPrevalueEditor(this);
return _prevalueeditor;
}
}
}
public override Guid Id
{
get { return new Guid("EAD69342-F06D-4253-83AC-28000225583B"); }
}
public override string DataTypeName
{
get { return "Media Picker"; }
}
public override interfaces.IDataPrevalue PrevalueEditor
{
get { return _prevalueeditor ?? (_prevalueeditor = new MediaPickerPrevalueEditor(this)); }
}
}
}

70
src/umbraco.editorControls/memberpicker/MemberPickerDataType.cs
View File

@@ -2,52 +2,34 @@ using System;
namespace umbraco.editorControls.memberpicker
{
/// <summary>
/// Summary description for MemberPickerDataType.
/// </summary>
public class MemberPickerDataType : cms.businesslogic.datatype.BaseDataType,interfaces.IDataType
{
private interfaces.IDataEditor _Editor;
private interfaces.IData _baseData;
private interfaces.IDataPrevalue _prevalueeditor;
public class MemberPickerDataType : cms.businesslogic.datatype.BaseDataType, interfaces.IDataType
{
private interfaces.IDataEditor _editor;
private interfaces.IData _baseData;
private interfaces.IDataPrevalue _prevalueeditor;
public override interfaces.IDataEditor DataEditor
{
get
{
if (_Editor == null)
_Editor = new memberPicker(Data);
return _Editor;
}
}
public override interfaces.IDataEditor DataEditor
{
get { return _editor ?? (_editor = new memberPicker(Data)); }
}
public override interfaces.IData Data
{
get
{
if (_baseData == null)
_baseData = new cms.businesslogic.datatype.DefaultData(this);
return _baseData;
}
}
public override string DataTypeName
{
get {return "Member Picker";}
}
public override interfaces.IData Data
{
get { return _baseData ?? (_baseData = new cms.businesslogic.datatype.DefaultData(this)); }
}
public override string DataTypeName
{
get { return "Member Picker"; }
}
public override Guid Id
{
get {return new Guid("39F533E4-0551-4505-A64B-E0425C5CE775");}
}
public override Guid Id
{
get { return new Guid("39F533E4-0551-4505-A64B-E0425C5CE775"); }
}
public override interfaces.IDataPrevalue PrevalueEditor
{
get
{
if (_prevalueeditor == null)
_prevalueeditor = new DefaultPrevalueEditor(this,false);
return _prevalueeditor;
}
}
}
public override interfaces.IDataPrevalue PrevalueEditor
{
get { return _prevalueeditor ?? (_prevalueeditor = new DefaultPrevalueEditor(this, false)); }
}
}
}