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

Merge with 6.1.2

Browse Source
This commit is contained in:
Shannon Deminick
2013-06-03 13:36:40 -10:00
parent edfffad122 932115585e
commit 76bbdcd32c
31 changed files with 260 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/umbraco.editorControls/MultiNodeTreePicker/FilteredContentTree.cs
View File

@@ -36,6 +36,14 @@ namespace umbraco.editorControls.MultiNodeTreePicker
/// </summary>
private int? m_DeterminedStartNodeId = null;
protected override bool LoadMinimalDocument
{
get
{
return false;
}
}
/// <summary>
/// Returns the Document object of the starting node for the current User. This ensures
/// that the Document object is only instantiated once.

10
src/umbraco.editorControls/imagecropper/ImageManipulation.cs
View File

@@ -74,15 +74,19 @@ namespace umbraco.editorControls.imagecropper
private static Image CropImage(Image img, Rectangle cropArea)
{
var bmpImage = new Bitmap(img);
if (cropArea.Right > img.Width)
cropArea.Width -= (cropArea.Right - img.Width);
if (cropArea.Bottom > img.Height)
cropArea.Height -= (cropArea.Bottom - img.Height);
var bmpCrop = bmpImage.Clone(cropArea, bmpImage.PixelFormat);
var bmpCrop = new Bitmap(cropArea.Width, cropArea.Height);
using (var graphics = Graphics.FromImage(bmpCrop))
{
graphics.DrawImage(img, new Rectangle(0, 0, bmpCrop.Width, bmpCrop.Height), cropArea, GraphicsUnit.Pixel);
}
return bmpCrop;
}

2
src/umbraco.editorControls/packages.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.7.0.1" targetFramework="net40" />
<package id="ClientDependency" version="1.7.0.2" targetFramework="net40" />
</packages>

4
src/umbraco.editorControls/umbraco.editorControls.csproj
View File

@@ -114,9 +114,9 @@
<Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
<Name>Umbraco.Web</Name>
</ProjectReference>
<Reference Include="ClientDependency.Core, Version=1.7.0.1, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ClientDependency.Core, Version=1.7.0.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll</HintPath>
<HintPath>..\packages\ClientDependency.1.7.0.2\lib\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>