From 30014ee86b8d6ab59ebd1e2a19a263529c6fdb73 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 22 Aug 2018 14:15:23 +1000 Subject: [PATCH] fixes boolean checks and problems with removed angular.lowercase deprecated method --- .../src/views/prevalueeditors/boolean.controller.js | 3 ++- src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js index e397722f7d..895ac453a1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js @@ -4,7 +4,8 @@ function updateToggleValue() { $scope.toggleValue = false; - if ($scope.model && $scope.model.value && ($scope.model.value.toString() === "1" || angular.lowercase($scope.model.value) === "true")) { + if ($scope.model && $scope.model.value && + ($scope.model.value === true || $scope.model.value.toString() === "1" || $scope.model.value.toString().toLowerCase() === "true")) { $scope.toggleValue = true; } } diff --git a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js index da92ff3363..b4a3fb9ed6 100644 --- a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js +++ b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js @@ -1420,13 +1420,13 @@ function MockXhr() { var header = this.$$respHeaders[name]; if (header) return header; - name = angular.lowercase(name); + name = name.toLowerCase(); header = this.$$respHeaders[name]; if (header) return header; header = undefined; angular.forEach(this.$$respHeaders, function (headerVal, headerName) { - if (!header && angular.lowercase(headerName) == name) header = headerVal; + if (!header && headerName.toLowerCase() == name) header = headerVal; }); return header; }; @@ -1883,4 +1883,4 @@ window.jstestdriver && (function (window) { } } }; -})(window); \ No newline at end of file +})(window);