From 7143792c0ef43841c8824e9f76390ba3bf880a90 Mon Sep 17 00:00:00 2001 From: Matthew Harris Date: Thu, 17 Sep 2015 19:44:25 +0100 Subject: [PATCH 1/4] fix #5826 --- .../Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml | 2 +- src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js | 4 ++++ src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml index 9f6d8c104..2cb794126 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml @@ -43,7 +43,7 @@
- +
} diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js index 1d515c557..80880b7de 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js +++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js @@ -71,6 +71,10 @@ return confirm(confirmRemoveMessage); }); + $("body").on("click", "[itemprop~='RestorePlacements']", function () { + return confirm(confirmRestorePlacementMessage); + }); + $(".check-all").change(function () { $(this).parents("table.items").find(":checkbox:not(:disabled)").prop('checked', $(this).prop("checked")); }); diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml index 954bc51f8..d4b2fb61c 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml @@ -97,7 +97,8 @@ @using (Script.Foot()) { } \ No newline at end of file From 4aaf4d34d0a030c10812c2a3dcbd53d9a4e8dd87 Mon Sep 17 00:00:00 2001 From: Matthew Harris Date: Thu, 17 Sep 2015 21:58:12 +0100 Subject: [PATCH 2/4] amends based on PR feedback --- .../Views/Admin/EditPlacement.cshtml | 2 +- src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js | 10 ++++++---- src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml index 2cb794126..e9b798834 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml @@ -43,7 +43,7 @@
- +
} diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js index 80880b7de..12a7ee408 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js +++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js @@ -68,13 +68,15 @@ return false; } + // use a custom message if its set in data-message + var dataMessage = $(this).data('message'); + if (dataMessage !== undefined) { + confirmRemoveMessage = dataMessage; + } + return confirm(confirmRemoveMessage); }); - $("body").on("click", "[itemprop~='RestorePlacements']", function () { - return confirm(confirmRestorePlacementMessage); - }); - $(".check-all").change(function () { $(this).parents("table.items").find(":checkbox:not(:disabled)").prop('checked', $(this).prop("checked")); }); diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml index d4b2fb61c..dffd08c00 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml @@ -98,7 +98,6 @@ } \ No newline at end of file From d9a0e040c129aaeab6478af975e0d90b98870ac4 Mon Sep 17 00:00:00 2001 From: Matthew Harris Date: Thu, 17 Sep 2015 22:54:47 +0100 Subject: [PATCH 3/4] don't overwrite confirmRemoveMessage --- src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js index 12a7ee408..e62769b93 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js +++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js @@ -70,11 +70,11 @@ // use a custom message if its set in data-message var dataMessage = $(this).data('message'); - if (dataMessage !== undefined) { - confirmRemoveMessage = dataMessage; + if (dataMessage === undefined) { + dataMessage = confirmRemoveMessage; } - return confirm(confirmRemoveMessage); + return confirm(dataMessage); }); $(".check-all").change(function () { From 20fbd99658b9f866c6b2bf096a0e139d9c38863b Mon Sep 17 00:00:00 2001 From: Matthew Harris Date: Thu, 17 Sep 2015 22:58:58 +0100 Subject: [PATCH 4/4] updated all instances of RemoveUrl checks --- src/Orchard.Web/Core/Shapes/Scripts/base.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Core/Shapes/Scripts/base.js b/src/Orchard.Web/Core/Shapes/Scripts/base.js index 73a87d6c8..bde720333 100644 --- a/src/Orchard.Web/Core/Shapes/Scripts/base.js +++ b/src/Orchard.Web/Core/Shapes/Scripts/base.js @@ -236,7 +236,13 @@ } if (_this.filter("[itemprop~='RemoveUrl']").length == 1) { - if (!confirm(confirmRemoveMessage)) { + // use a custom message if its set in data-message + var dataMessage = _this.data('message'); + if (dataMessage === undefined) { + dataMessage = confirmRemoveMessage; + } + + if (!confirm(dataMessage)) { return false; } }