From dd5f65b84e897c79421e055a04e2cd1e7d456730 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 17 Aug 2020 13:34:51 +0200
Subject: [PATCH 01/13] Adjust noDirtyCheck directive to accept a parameter to
 enable/disable dirty check

---
 .../validation/nodirtycheck.directive.js      | 18 ++++++----
 .../views/components/forms/umb-checkbox.html  | 34 ++++++-------------
 .../components/forms/umb-radiobutton.html     | 34 ++++++-------------
 3 files changed, 34 insertions(+), 52 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index 800ac8748088..62223dab1bbb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -10,13 +10,19 @@ function noDirtyCheck() {
         require: 'ngModel',
         link: function (scope, elm, attrs, ctrl) {
 
-            var alwaysFalse = {
-                    get: function () { return false; },
-                    set: function () { }
-                };
-            Object.defineProperty(ctrl, '$pristine', alwaysFalse);
-            Object.defineProperty(ctrl, '$dirty', alwaysFalse);
+            var dirtyCheck = scope.$eval(attrs.noDirtyCheck) === false;
+            if (dirtyCheck)
+                return;
 
+            ctrl.$setDirty = angular.noop;
+
+            //var alwaysFalse = {
+            //    get: function () { return false; },
+            //    set: function () { }
+            //};
+
+            //Object.defineProperty(ctrl, '$pristine', alwaysFalse);
+            //Object.defineProperty(ctrl, '$dirty', alwaysFalse);
         }
     };
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index c25541da2190..2f3e8985f05d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -1,29 +1,17 @@
 <label class="checkbox umb-form-check umb-form-check--checkbox {{vm.cssClass}}" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
     <span class="umb-form-check__symbol">
-        <input ng-if="vm.disableDirtyCheck"
-            type="checkbox"
-            id="{{vm.inputId}}"
-            name="{{vm.name}}"
-            value="{{vm.value}}"
-            class="umb-form-check__input"
-            val-server-field="{{vm.serverValidationField}}"
-            ng-model="vm.model"
-            ng-disabled="vm.disabled"
-            ng-required="vm.required"
-            ng-change="vm.change()"
-            no-dirty-check />
 
-        <input ng-if="!vm.disableDirtyCheck"
-            type="checkbox"
-            id="{{vm.inputId}}"
-            name="{{vm.name}}"
-            value="{{vm.value}}"
-            class="umb-form-check__input"
-            val-server-field="{{vm.serverValidationField}}"
-            ng-model="vm.model"
-            ng-disabled="vm.disabled"
-            ng-required="vm.required"
-            ng-change="vm.change()"/>
+        <input type="checkbox"
+               id="{{vm.inputId}}"
+               name="{{vm.name}}"
+               value="{{vm.value}}"
+               class="umb-form-check__input"
+               val-server-field="{{vm.serverValidationField}}"
+               ng-model="vm.model"
+               ng-disabled="vm.disabled"
+               ng-required="vm.required"
+               ng-change="vm.change()"
+               no-dirty-check="vm.disableDirtyCheck" />
 
         <span class="umb-form-check__state" aria-hidden="true">
             <span class="umb-form-check__check">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 067e1ca8d9fb..6f220a24ad79 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -1,29 +1,17 @@
 <label class="radio umb-form-check umb-form-check--radiobutton {{vm.cssClass}}" ng-class="{ 'umb-form-check--disabled': vm.disabled }">
     <span class="umb-form-check__symbol">
-        <input ng-if="vm.disableDirtyCheck"
-            type="radio"
-            id="{{vm.inputId}}"
-            name="{{vm.name}}"
-            value="{{vm.value}}"
-            class="umb-form-check__input"
-            val-server-field="{{vm.serverValidationField}}"
-            ng-model="vm.model"
-            ng-disabled="vm.disabled"
-            ng-required="vm.required"
-            ng-change="vm.change()"
-            no-dirty-check />
 
-        <input ng-if="!vm.disableDirtyCheck"
-            type="radio"
-            id="{{vm.inputId}}"
-            name="{{vm.name}}"
-            value="{{vm.value}}"
-            class="umb-form-check__input"
-            val-server-field="{{vm.serverValidationField}}"
-            ng-model="vm.model"
-            ng-disabled="vm.disabled"
-            ng-required="vm.required"
-            ng-change="vm.change()" />
+        <input type="radio"
+               id="{{vm.inputId}}"
+               name="{{vm.name}}"
+               value="{{vm.value}}"
+               class="umb-form-check__input"
+               val-server-field="{{vm.serverValidationField}}"
+               ng-model="vm.model"
+               ng-disabled="vm.disabled"
+               ng-required="vm.required"
+               ng-change="vm.change()"
+               no-dirty-check="vm.disableDirtyCheck" />
 
         <span class="umb-form-check__state" aria-hidden="true">
             <span class="umb-form-check__check"></span>

From 22d87df03af3eff30ef8b869237587f7a393d252 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 17 Aug 2020 13:43:55 +0200
Subject: [PATCH 02/13] Update dirty property

---
 .../directives/validation/nodirtycheck.directive.js    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index 62223dab1bbb..a9db4d786922 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -14,15 +14,7 @@ function noDirtyCheck() {
             if (dirtyCheck)
                 return;
 
-            ctrl.$setDirty = angular.noop;
-
-            //var alwaysFalse = {
-            //    get: function () { return false; },
-            //    set: function () { }
-            //};
-
-            //Object.defineProperty(ctrl, '$pristine', alwaysFalse);
-            //Object.defineProperty(ctrl, '$dirty', alwaysFalse);
+            ctrl.$setDirty = false;
         }
     };
 }

From db2f095fa309e89e809512c712958413ee6c756f Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 17 Aug 2020 14:35:14 +0200
Subject: [PATCH 03/13] Use Utilities.noop and add description

---
 .../src/common/directives/validation/nodirtycheck.directive.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index a9db4d786922..597a529a5d49 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -10,11 +10,12 @@ function noDirtyCheck() {
         require: 'ngModel',
         link: function (scope, elm, attrs, ctrl) {
 
+            // If no attribute value is "false", then skip and use default behaviour.
             var dirtyCheck = scope.$eval(attrs.noDirtyCheck) === false;
             if (dirtyCheck)
                 return;
 
-            ctrl.$setDirty = false;
+            ctrl.$setDirty = Utilities.noop;
         }
     };
 }

From 2514d2bf98cc76497dce36159df08818df661bf6 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 17 Aug 2020 16:07:25 +0200
Subject: [PATCH 04/13] Set default value from controller

---
 .../common/directives/components/forms/umbcheckbox.directive.js | 2 +-
 .../directives/components/forms/umbradiobutton.directive.js     | 2 +-
 .../src/views/components/forms/umb-checkbox.html                | 2 +-
 .../src/views/components/forms/umb-radiobutton.html             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 717cefbb0a6b..dc5e6a2f8fb9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -50,7 +50,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
-
+            vm.disableDirtyCheck = vm.disableDirtyCheck === true;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 3232ed7f347a..321f44b31e92 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -49,7 +49,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-
+            vm.disableDirtyCheck = vm.disableDirtyCheck === true;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
index 2f3e8985f05d..0e48f232e3ef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
@@ -11,7 +11,7 @@
                ng-disabled="vm.disabled"
                ng-required="vm.required"
                ng-change="vm.change()"
-               no-dirty-check="vm.disableDirtyCheck" />
+               no-dirty-check="{{vm.disableDirtyCheck}}" />
 
         <span class="umb-form-check__state" aria-hidden="true">
             <span class="umb-form-check__check">
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
index 6f220a24ad79..0f2ecf4efe24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
@@ -11,7 +11,7 @@
                ng-disabled="vm.disabled"
                ng-required="vm.required"
                ng-change="vm.change()"
-               no-dirty-check="vm.disableDirtyCheck" />
+               no-dirty-check="{{vm.disableDirtyCheck}}" />
 
         <span class="umb-form-check__state" aria-hidden="true">
             <span class="umb-form-check__check"></span>

From 0ab8651557404e34a602a0771cffa386c4d91888 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 1 Sep 2020 11:56:00 +0200
Subject: [PATCH 05/13] Check for truthly value

---
 .../common/directives/components/forms/umbcheckbox.directive.js | 2 +-
 .../directives/components/forms/umbradiobutton.directive.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index dc5e6a2f8fb9..3da6f3bfb679 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -50,7 +50,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
-            vm.disableDirtyCheck = vm.disableDirtyCheck === true;
+            vm.disableDirtyCheck = Object.toBoolean(vm.disableDirtyCheck) === true;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 321f44b31e92..b37312c5f41f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -49,7 +49,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-            vm.disableDirtyCheck = vm.disableDirtyCheck === true;
+            vm.disableDirtyCheck = Object.toBoolean(vm.disableDirtyCheck) === true;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [

From 0bb2d1892d19a85211ceb7862516bff3b7839338 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 2 Sep 2020 11:17:36 +0200
Subject: [PATCH 06/13] Use Object.toBoolean

---
 .../src/common/directives/validation/nodirtycheck.directive.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index 597a529a5d49..408c8fe0dc69 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -11,7 +11,7 @@ function noDirtyCheck() {
         link: function (scope, elm, attrs, ctrl) {
 
             // If no attribute value is "false", then skip and use default behaviour.
-            var dirtyCheck = scope.$eval(attrs.noDirtyCheck) === false;
+            var dirtyCheck = Object.toBoolean(attrs.noDirtyCheck) === false;
             if (dirtyCheck)
                 return;
 

From eb48dbd169dbfa65125d57260f8d960666311c91 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 2 Sep 2020 11:21:28 +0200
Subject: [PATCH 07/13] Revert setting $pristine and $dirty for now

---
 .../directives/validation/nodirtycheck.directive.js       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index 408c8fe0dc69..d53dca028a0e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -15,7 +15,13 @@ function noDirtyCheck() {
             if (dirtyCheck)
                 return;
 
-            ctrl.$setDirty = Utilities.noop;
+            var alwaysFalse = {
+                get: function () { return false; },
+                set: function () { }
+            };
+
+            Object.defineProperty(ctrl, '$pristine', alwaysFalse);
+            Object.defineProperty(ctrl, '$dirty', alwaysFalse);
         }
     };
 }

From 0a5b442bf0fb7a99268178f942620ddc0cc2e0ca Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Thu, 1 Oct 2020 09:23:26 +0200
Subject: [PATCH 08/13] Handle default values in dirty check attributes

---
 .../common/directives/components/forms/umbcheckbox.directive.js | 2 +-
 .../directives/components/forms/umbradiobutton.directive.js     | 2 +-
 .../src/common/directives/validation/nodirtycheck.directive.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 3da6f3bfb679..a77caf683a84 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -50,7 +50,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
-            vm.disableDirtyCheck = Object.toBoolean(vm.disableDirtyCheck) === true;
+            vm.disableDirtyCheck = vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index b37312c5f41f..56bc196116d9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -49,7 +49,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-            vm.disableDirtyCheck = Object.toBoolean(vm.disableDirtyCheck) === true;
+            vm.disableDirtyCheck = vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index d53dca028a0e..1d144b1c3ddd 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -11,7 +11,7 @@ function noDirtyCheck() {
         link: function (scope, elm, attrs, ctrl) {
 
             // If no attribute value is "false", then skip and use default behaviour.
-            var dirtyCheck = Object.toBoolean(attrs.noDirtyCheck) === false;
+            var dirtyCheck = !!attrs.noDirtyCheck && Object.toBoolean(attrs.noDirtyCheck) === false;
             if (dirtyCheck)
                 return;
 

From 115a475f80ab85733cedf82204244ede6cdb6423 Mon Sep 17 00:00:00 2001
From: Michael <michael@crossingpaths.be>
Date: Mon, 29 Mar 2021 03:42:47 +0200
Subject: [PATCH 09/13] Add check on presence of disableDirtyCheck atribute

---
 .../directives/components/forms/umbcheckbox.directive.js      | 4 ++--
 .../directives/components/forms/umbradiobutton.directive.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index a77caf683a84..977a2ec59fe5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -41,7 +41,7 @@
 (function () {
     'use strict';
 
-    function UmbCheckboxController($timeout, localizationService) {
+    function UmbCheckboxController($timeout, $attrs, localizationService) {
 
         var vm = this;
 
@@ -50,7 +50,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
-            vm.disableDirtyCheck = vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true;
+            vm.disableDirtyCheck = ($attrs.disableDirtyCheck !== undefined) && (vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true);
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 4caa4413424f..225595451cec 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -40,7 +40,7 @@
 (function () {
     'use strict';
 
-    function UmbRadiobuttonController($timeout, localizationService) {
+    function UmbRadiobuttonController($timeout, $attrs, localizationService) {
 
         var vm = this;
 
@@ -49,7 +49,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-            vm.disableDirtyCheck = vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true;
+            vm.disableDirtyCheck = ($attrs.disableDirtyCheck !== undefined) && (vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true);
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [

From b63e218037ddad35d437453e73f30cd0e72c0e05 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 29 Mar 2021 12:22:07 +0200
Subject: [PATCH 10/13] Check for truthy value otherwise it should be default
 return false and work as no-dirty-check without value

---
 .../common/directives/validation/nodirtycheck.directive.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index 1d144b1c3ddd..6838b345d857 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -10,8 +10,8 @@ function noDirtyCheck() {
         require: 'ngModel',
         link: function (scope, elm, attrs, ctrl) {
 
-            // If no attribute value is "false", then skip and use default behaviour.
-            var dirtyCheck = !!attrs.noDirtyCheck && Object.toBoolean(attrs.noDirtyCheck) === false;
+            // If value if "no-dirty-check" attribute truthy, then skip and use default behaviour.
+            var dirtyCheck = Object.toBoolean(attrs.noDirtyCheck) === true;
             if (dirtyCheck)
                 return;
 

From 94e8e395d49e300d125cc9f045c92b9f5a803df9 Mon Sep 17 00:00:00 2001
From: Michael <michael@crossingpaths.be>
Date: Tue, 30 Mar 2021 09:56:18 +0200
Subject: [PATCH 11/13] update test conditions for vamue of no-dirty-check and
 disable-dirty-check

---
 .../directives/components/forms/umbcheckbox.directive.js    | 2 +-
 .../directives/components/forms/umbradiobutton.directive.js | 2 +-
 .../common/directives/validation/nodirtycheck.directive.js  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index 977a2ec59fe5..dc251e49c227 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -50,7 +50,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
-            vm.disableDirtyCheck = ($attrs.disableDirtyCheck !== undefined) && (vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true);
+            vm.disableDirtyCheck = $attrs.hasOwnProperty("disableDirtyCheck") && vm.disableDirtyCheck !== '0' && vm.disableDirtyCheck !== 0 && vm.disableDirtyCheck.toString().toLowerCase() !== 'false';
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 225595451cec..1920a3060cb0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -49,7 +49,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-            vm.disableDirtyCheck = ($attrs.disableDirtyCheck !== undefined) && (vm.disableDirtyCheck === undefined || Object.toBoolean(vm.disableDirtyCheck) === true);
+            vm.disableDirtyCheck = $attrs.hasOwnProperty("disableDirtyCheck") && vm.disableDirtyCheck !== '0' && vm.disableDirtyCheck !== 0 && vm.disableDirtyCheck .toString().toLowerCase() !== 'false';
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
index 6838b345d857..31ef125511d6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/nodirtycheck.directive.js
@@ -10,9 +10,9 @@ function noDirtyCheck() {
         require: 'ngModel',
         link: function (scope, elm, attrs, ctrl) {
 
-            // If value if "no-dirty-check" attribute truthy, then skip and use default behaviour.
-            var dirtyCheck = Object.toBoolean(attrs.noDirtyCheck) === true;
-            if (dirtyCheck)
+            // if "no-dirty-check" attribute is explicitly falsy, then skip and use default behaviour. In all other cases we consider it truthy
+            var skipNoDirtyCheck = attrs.noDirtyCheck === '0' || attrs.noDirtyCheck === 0 || attrs.noDirtyCheck.toString().toLowerCase() === 'false';
+            if (skipNoDirtyCheck)
                 return;
 
             var alwaysFalse = {

From 6dbc4b42308f07d77e7b01c969151d99ceb0b05d Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Wed, 30 Jun 2021 12:44:32 +0200
Subject: [PATCH 12/13] Remove whitespace

---
 .../directives/components/forms/umbradiobutton.directive.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 1920a3060cb0..4465aff1f2d4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -49,7 +49,7 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-            vm.disableDirtyCheck = $attrs.hasOwnProperty("disableDirtyCheck") && vm.disableDirtyCheck !== '0' && vm.disableDirtyCheck !== 0 && vm.disableDirtyCheck .toString().toLowerCase() !== 'false';
+            vm.disableDirtyCheck = $attrs.hasOwnProperty("disableDirtyCheck") && vm.disableDirtyCheck !== '0' && vm.disableDirtyCheck !== 0 && vm.disableDirtyCheck.toString().toLowerCase() !== 'false';
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [

From 8807bf59e8c233f942515bea36986d7e04586a06 Mon Sep 17 00:00:00 2001
From: Michael <michael@crossingpaths.be>
Date: Mon, 30 Aug 2021 03:40:33 +0200
Subject: [PATCH 13/13] update check

---
 .../directives/components/forms/umbcheckbox.directive.js   | 7 ++++++-
 .../components/forms/umbradiobutton.directive.js           | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
index dc251e49c227..a4508c8879b1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
@@ -50,7 +50,12 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-check_" + String.CreateGuid();
-            vm.disableDirtyCheck = $attrs.hasOwnProperty("disableDirtyCheck") && vm.disableDirtyCheck !== '0' && vm.disableDirtyCheck !== 0 && vm.disableDirtyCheck.toString().toLowerCase() !== 'false';
+            vm.disableDirtyCheck =
+                $attrs.hasOwnProperty("disableDirtyCheck") &&
+                vm.disableDirtyCheck !== '0' &&
+                vm.disableDirtyCheck !== 0 &&
+                vm.disableDirtyCheck !== 'false' &&
+                vm.disableDirtyCheck !== false;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
index 4465aff1f2d4..dd0d2fc31b86 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
@@ -49,7 +49,12 @@
 
         function onInit() {
             vm.inputId = vm.inputId || "umb-radio_" + String.CreateGuid();
-            vm.disableDirtyCheck = $attrs.hasOwnProperty("disableDirtyCheck") && vm.disableDirtyCheck !== '0' && vm.disableDirtyCheck !== 0 && vm.disableDirtyCheck.toString().toLowerCase() !== 'false';
+            vm.disableDirtyCheck =
+                $attrs.hasOwnProperty("disableDirtyCheck") &&
+                vm.disableDirtyCheck !== '0' &&
+                vm.disableDirtyCheck !== 0 &&
+                vm.disableDirtyCheck !== 'false' &&
+                vm.disableDirtyCheck !== false;
             vm.icon = vm.icon || vm.iconClass || null;
 
             // If a labelKey is passed let's update the returned text if it's does not contain an opening square bracket [