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

v8: Fix onChange callback in umbCheckbox and umbRadiobutton (#6345)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2019-09-16 12:56:37 +02:00
committed by Sebastiaan Janssen
parent 976465be4b
commit be0d38f2af
7 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js
View File

@@ -36,17 +36,17 @@
(function () {
'use strict';
function UmbCheckboxController($timeout) {
var vm = this;
if (vm.onChange) {
$timeout(function() {
vm.onChange({model:vm.model, value:vm.value});
vm.change = change;
function change() {
$timeout(function () {
vm.onChange({ model: vm.model, value: vm.value });
}, 0);
}
}
var component = {

7
src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js
View File

@@ -38,12 +38,13 @@
var vm = this;
if (vm.onChange) {
vm.change = change;
function change() {
$timeout(function () {
vm.onChange({ model: vm.model, value: vm.value });
}, 0);
}
}
}
var component = {

2
src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html
View File

@@ -8,7 +8,7 @@
ng-model="vm.model"
ng-disabled="vm.disabled"
ng-required="vm.required"
ng-change="vm.onChange()"/>
ng-change="vm.change()"/>
<span class="umb-form-check__state" aria-hidden="true">
<span class="umb-form-check__check">

2
src/Umbraco.Web.UI.Client/src/views/components/forms/umb-radiobutton.html
View File

@@ -5,7 +5,7 @@
ng-model="vm.model"
ng-disabled="vm.disabled"
ng-required="vm.required"
ng-change="vm.onChange()" />
ng-change="vm.change()" />
<span class="umb-form-check__state" aria-hidden="true">
<span class="umb-form-check__check"></span>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js
View File

@@ -5,7 +5,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
vm.configItems = [];
vm.viewItems = [];
vm.changed = changed;
vm.change = change;
function init() {
@@ -74,7 +74,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
}
function changed(model, value) {
function change(model, value) {
var index = $scope.model.value.indexOf(value);

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html
View File

@@ -1,7 +1,7 @@
<div class="umb-property-editor umb-checkboxlist" ng-controller="Umbraco.PropertyEditors.CheckboxListController as vm">
<ul class="unstyled">
<li ng-repeat="item in vm.viewItems track by item.key">
<umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.changed(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
<umb-checkbox name="{{::model.alias}}" value="{{::item.value}}" model="item.checked" text="{{::item.value}}" on-change="vm.change(model, value)" required="vm.model.validation.mandatory && !vm.model.value.length"></umb-checkbox>
</li>
</ul>
</div>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html
View File

@@ -1,7 +1,7 @@
<div class="umb-property-editor umb-radiobuttons" ng-controller="Umbraco.PropertyEditors.RadioButtonsController">
<ul class="unstyled">
<li ng-repeat="item in configItems track by item.id">
<umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
<umb-radiobutton name="{{model.alias}}" value="{{item.value}}" model="model.value" text="{{item.value}}" on-change="vm.change(model, value)" required="model.validation.mandatory && model.value == ''"></umb-radiobutton>
</li>
</ul>
</div>