From fe4da60b15d7c10c21319e96bf0803b6e86ff35c Mon Sep 17 00:00:00 2001 From: mattbrailsford Date: Fri, 18 Apr 2014 15:43:36 +0100 Subject: [PATCH 1/5] Added check to rte controller so as not to reload tinymce script if it's already loaded (we don't check the CSS, but I figure this is ok) [This is temp bandaid for #U4-4724] --- .../src/views/propertyeditors/rte/rte.controller.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index daf058f313..e4cc237556 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/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 (!tinymce) { // 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){ From d66998a3e30dcf9d9b499be3cbfd25d899b37ea4 Mon Sep 17 00:00:00 2001 From: mattbrailsford Date: Fri, 18 Apr 2014 15:52:26 +0100 Subject: [PATCH 2/5] A better test (checks to see if it's even defined) --- .../src/views/propertyeditors/rte/rte.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index e4cc237556..fbcb11a234 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -30,7 +30,7 @@ angular.module("umbraco") var await = []; //queue file loading - if (!tinymce) { // Don't reload tinymce if already loaded + if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope)); } From 44fbc29541604973df5311af9898fc4ceaad583d Mon Sep 17 00:00:00 2001 From: Jwheuvel Date: Thu, 24 Apr 2014 20:34:57 +0200 Subject: [PATCH 3/5] Update web.config with .woff mime support Bootstrap icons aren't visible on Windows Phone because it uses the .woff variant but the mimetype isn't available. Updated the web.config and added .woff to the staticContent section of system.webServer. --- src/Umbraco.Web.UI/web.Template.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index ced455efe9..1599ebd7b6 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -193,6 +193,8 @@ + + From 7aa618cbfba6568a057d53eacc0aab20fbe85cfa Mon Sep 17 00:00:00 2001 From: Jeavon Leopold Date: Sun, 27 Apr 2014 22:06:48 +0100 Subject: [PATCH 4/5] Fixes U4-4767 and adds a Test for it --- src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs | 10 ++++++++++ src/Umbraco.Web/ImageCropperTemplateExtensions.cs | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs index 3f4fc91ed4..b6660b6880 100644 --- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs +++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs @@ -92,5 +92,15 @@ 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); } + + /// + /// Test that if Crop mode is specified as anything other than Crop the image doesn't use the crop + /// + [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); + } } } \ No newline at end of file diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs index 1359517643..8c7b06a3b6 100644 --- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs +++ b/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) From 5f0b09544adce6a05d69f4ebd7dbc078171c96cb Mon Sep 17 00:00:00 2001 From: Jeavon Leopold Date: Sun, 27 Apr 2014 22:17:24 +0100 Subject: [PATCH 5/5] Added Test for getting a crop on a Upload property type instead of a Cropper --- src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs index b6660b6880..c0135dff36 100644 --- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs +++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs @@ -102,5 +102,15 @@ namespace Umbraco.Tests.PropertyEditors var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 300, height: 150, imageCropMode:ImageCropMode.Max); Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlString); } + + /// + /// Test for upload property type + /// + [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); + } } } \ No newline at end of file