yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes boolean checks and problems with removed angular.lowercase deprecated method

Browse Source
This commit is contained in:
Shannon
2018-08-22 14:15:23 +10:00
parent 5b32268cd7
commit 30014ee86b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/views/prevalueeditors/boolean.controller.js
View File

@@ -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;
}
}

6
src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js vendored
View File

@@ -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);
})(window);