Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2

src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs

@@ -92,5 +92,25 @@ namespace Umbraco.Tests.PropertyEditors
             var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 300, height: 150, ratioMode: ImageCropRatioMode.Width);
             Assert.AreEqual(mediaPath + "?center=0.80827067669172936,0.96&mode=crop&height=150&widthratio=2", urlString);
         }
+
+        /// <summary>
+        /// Test that if Crop mode is specified as anything other than Crop the image doesn't use the crop
+        /// </summary>
+        [Test]
+        public void GetCropUrl_SpecifiedCropModeTest()
+        {
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 300, height: 150, imageCropMode:ImageCropMode.Max);
+            Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlString);
+        }
+
+        /// <summary>
+        /// Test for upload property type
+        /// </summary>
+        [Test]
+        public void GetCropUrl_UploadTypeTest()
+        {
+            var urlString = mediaPath.GetCropUrl(width: 100, height: 270, imageCropMode: ImageCropMode.Crop, imageCropAnchor: ImageCropAnchor.Center);
+            Assert.AreEqual(mediaPath + "?mode=crop&anchor=center&width=100&height=270", urlString);
+        }
     }
 }

src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js

@@ -30,7 +30,9 @@ angular.module("umbraco")
             var await = [];
 
             //queue file loading
-            await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
+            if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded
+                await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
+            }
 
             //queue rules loading
             angular.forEach(editorConfig.stylesheets, function(val, key){

src/Umbraco.Web.UI/web.Template.config

@@ -193,6 +193,8 @@
       <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
       <remove fileExtension=".svg" />
       <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
+      <remove fileExtension=".woff"/>
+      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
     </staticContent>
 
     <!-- Ensure the powered by header is not returned -->

src/Umbraco.Web/ImageCropperTemplateExtensions.cs

@@ -215,7 +215,7 @@ namespace Umbraco.Web
             {
                 var imageResizerUrl = new StringBuilder();
 
-                if (string.IsNullOrEmpty(imageCropperValue) == false && imageCropperValue.DetectIsJson())
+                if (string.IsNullOrEmpty(imageCropperValue) == false && imageCropperValue.DetectIsJson() && (imageCropMode == ImageCropMode.Crop || imageCropMode == null))
                 {
                     var cropDataSet = imageCropperValue.SerializeToCropDataSet();
                     if (cropDataSet != null)