From 59b8b397b730daf5d3bda671ea67de8862f76761 Mon Sep 17 00:00:00 2001 From: Shane Marsden Date: Thu, 3 Nov 2016 11:33:00 +0000 Subject: [PATCH 01/12] Renamed SerializeToCropDataSet to DeserializeToCropDataSet --- .../PropertyEditors/ImageCropperTest.cs | 18 +++++++++--------- src/Umbraco.Web/ImageCropperBaseExtensions.cs | 2 +- .../ImageCropperTemplateExtensions.cs | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs index c8372e70ac..345b9479f6 100644 --- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs +++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs @@ -29,7 +29,7 @@ namespace Umbraco.Tests.PropertyEditors [Test] public void ImageCropData_Properties_As_Dynamic() { - var sourceObj = cropperJson1.SerializeToCropDataSet(); + var sourceObj = cropperJson1.DeserializeToCropDataSet(); dynamic d = sourceObj; var index = 0; @@ -62,7 +62,7 @@ namespace Umbraco.Tests.PropertyEditors [Test] public void ImageCropFocalPoint_Properties_As_Dynamic() { - var sourceObj = cropperJson1.SerializeToCropDataSet(); + var sourceObj = cropperJson1.DeserializeToCropDataSet(); dynamic d = sourceObj; Assert.AreEqual(sourceObj.FocalPoint.Left, d.FocalPoint.Left); @@ -75,7 +75,7 @@ namespace Umbraco.Tests.PropertyEditors [Test] public void ImageCropDataSet_Properties_As_Dynamic() { - var sourceObj = cropperJson1.SerializeToCropDataSet(); + var sourceObj = cropperJson1.DeserializeToCropDataSet(); dynamic d = sourceObj; Assert.AreEqual(sourceObj.Src, d.Src); @@ -91,7 +91,7 @@ namespace Umbraco.Tests.PropertyEditors [Test] public void ImageCropDataSet_Methods_As_Dynamic() { - var sourceObj = cropperJson1.SerializeToCropDataSet(); + var sourceObj = cropperJson1.DeserializeToCropDataSet(); dynamic d = sourceObj; Assert.AreEqual(sourceObj.HasCrop("thumb"), d.HasCrop("thumb")); @@ -108,7 +108,7 @@ namespace Umbraco.Tests.PropertyEditors public void CanConvertImageCropperDataSetSrcToString() { //cropperJson3 - has not crops - var sourceObj = cropperJson3.SerializeToCropDataSet(); + var sourceObj = cropperJson3.DeserializeToCropDataSet(); var destObj = sourceObj.TryConvertTo(); Assert.IsTrue(destObj.Success); Assert.AreEqual(destObj.Result, "/media/1005/img_0672.jpg"); @@ -118,7 +118,7 @@ namespace Umbraco.Tests.PropertyEditors public void CanConvertImageCropperDataSetJObject() { //cropperJson3 - has not crops - var sourceObj = cropperJson3.SerializeToCropDataSet(); + var sourceObj = cropperJson3.DeserializeToCropDataSet(); var destObj = sourceObj.TryConvertTo(); Assert.IsTrue(destObj.Success); Assert.AreEqual(sourceObj, destObj.Result.ToObject()); @@ -127,7 +127,7 @@ namespace Umbraco.Tests.PropertyEditors [Test] public void CanConvertImageCropperDataSetJsonToString() { - var sourceObj = cropperJson1.SerializeToCropDataSet(); + var sourceObj = cropperJson1.DeserializeToCropDataSet(); var destObj = sourceObj.TryConvertTo(); Assert.IsTrue(destObj.Success); Assert.IsTrue(destObj.Result.DetectIsJson()); @@ -150,7 +150,7 @@ namespace Umbraco.Tests.PropertyEditors var converter = new Umbraco.Web.PropertyEditors.ValueConverters.ImageCropperValueConverter(dataTypeService.Object); var result = converter.ConvertDataToSource(new PublishedPropertyType("test", 0, "test"), val1, false); // does not use type for conversion - var resultShouldMatch = val2.SerializeToCropDataSet(); + var resultShouldMatch = val2.DeserializeToCropDataSet(); if (expected) { Assert.AreEqual(resultShouldMatch, result); @@ -220,7 +220,7 @@ namespace Umbraco.Tests.PropertyEditors [Test] public void GetBaseCropUrlFromModelTest() { - var cropDataSet = cropperJson1.SerializeToCropDataSet(); + var cropDataSet = cropperJson1.DeserializeToCropDataSet(); var urlString = cropDataSet.GetCropUrl("thumb"); Assert.AreEqual("?crop=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&cropmode=percentage&width=100&height=100", urlString); } diff --git a/src/Umbraco.Web/ImageCropperBaseExtensions.cs b/src/Umbraco.Web/ImageCropperBaseExtensions.cs index e993559f1e..f30437705e 100644 --- a/src/Umbraco.Web/ImageCropperBaseExtensions.cs +++ b/src/Umbraco.Web/ImageCropperBaseExtensions.cs @@ -13,7 +13,7 @@ namespace Umbraco.Web { internal static class ImageCropperBaseExtensions { - internal static ImageCropDataSet SerializeToCropDataSet(this string json) + internal static ImageCropDataSet DeserializeToCropDataSet(this string json) { var imageCrops = new ImageCropDataSet(); if (json.DetectIsJson()) diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs index e518c5e246..f729ab9dfc 100644 --- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs +++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs @@ -222,7 +222,7 @@ namespace Umbraco.Web ImageCropDataSet cropDataSet = null; if (string.IsNullOrEmpty(imageCropperValue) == false && imageCropperValue.DetectIsJson() && (imageCropMode == ImageCropMode.Crop || imageCropMode == null)) { - cropDataSet = imageCropperValue.SerializeToCropDataSet(); + cropDataSet = imageCropperValue.DeserializeToCropDataSet(); } return GetCropUrl( imageUrl, cropDataSet, width, height, cropAlias, quality, imageCropMode, From 7566546fd7d7c0ef775ac29679d346c7947a6798 Mon Sep 17 00:00:00 2001 From: jf Date: Thu, 3 Nov 2016 17:32:24 +0000 Subject: [PATCH 02/12] fix U4-8792 override overflow --- src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx | 1 + .../umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx index 4a51de9800..d13bc662c2 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx @@ -7,6 +7,7 @@ diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx index 4a51de9800..d13bc662c2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx @@ -7,6 +7,7 @@ From 0df7767f4a6c8fab7145684867fd657f94f8e8ca Mon Sep 17 00:00:00 2001 From: Marcin Zajkowski Date: Thu, 2 Nov 2017 17:32:20 +0100 Subject: [PATCH 03/12] Added no-dirty-check to search fields in all dialogs --- .../src/views/common/dialogs/iconpicker.html | 73 ++++--- .../src/views/common/dialogs/mediapicker.html | 61 +++--- .../common/dialogs/membergrouppicker.html | 32 +-- .../compositions/compositions.html | 24 +-- .../overlays/itempicker/itempicker.html | 32 +-- .../overlays/macropicker/macropicker.html | 13 +- .../usergrouppicker/usergrouppicker.html | 25 ++- .../application/umb-navigation.html | 194 +++++++++--------- 8 files changed, 224 insertions(+), 230 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html index 4e482c26b1..39ddebfaae 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html @@ -1,7 +1,7 @@
-
-
-
+
+
+
-
-
+
+
-
+
- +
- -
+ +
- - No icons were found. - -
+ + No icons were found. + +
-
-
-
- - Cancel - -
-
-
+
+
+
+ + Cancel + +
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html index 99102fed19..c8851194ee 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html @@ -61,22 +61,23 @@
+ on-drag-leave="dragLeave()" + on-drag-end="dragLeave()" + on-drag-enter="dragEnter()" + ng-hide="target"> + -
-
- - +
+ +
@@ -97,7 +98,7 @@
  • {{item.name}} /
    • - +
  • @@ -114,28 +115,26 @@
    • - +
    - - + + - +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html index 48302cea02..e2ff9790d5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html @@ -1,7 +1,7 @@
    - +
    - +
    -
    -
    -
    +
    +
    +
    - - Cancel - + + Cancel + - + -
    -
    -
    +
    +
    +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html index 3cc81fdcf6..64767d01cb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html @@ -7,9 +7,10 @@ style="width: 100%" ng-model="searchTerm" class="umb-search-field search-query input-block-level" - localize="placeholder" - placeholder="@placeholders_filter" - umb-auto-focus> + localize="placeholder" + placeholder="@placeholders_filter" + umb-auto-focus + no-dirty-check>
    @@ -17,20 +18,17 @@
    - - + + - - + +
    • @@ -41,7 +39,7 @@ checklist-model="model.compositeContentTypes" checklist-value="compositeContentType.contentType.alias" ng-change="model.selectCompositeContentType(compositeContentType.contentType)" - ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited"/> + ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />