Resolve TODOs in form builder dependency JS code

See #2509

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Empty.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Empty.js
index d14b1ca29b3b36d7633f9019b32f9b7dc1674271..30e79c8c1dbb6c25c73add45f0dc69ecca23605b 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Empty.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/Empty.js
@@ -26,7 +26,6 @@ define(['./Abstract', 'Core'], function(Abstract, Core) {
                                case 'INPUT':
                                        switch (this._field.type) {
                                                case 'checkbox':
-                                                       // TODO: check if working
                                                        return !this._field.checked;
                                                
                                                case 'radio':
@@ -41,11 +40,13 @@ define(['./Abstract', 'Core'], function(Abstract, Core) {
                                        }
                                
                                case 'SELECT':
-                                       // TODO: check if working for multiselect
-                                       return this._field.value.length === 0;
+                                       if (this._field.multiple) {
+                                               return elBySelAll('option:checked', this._field).length === 0;
+                                       }
+                                       
+                                       return this._field.value == 0 || this._field.value.length === 0;
                                
                                case 'TEXTAREA':
-                                       // TODO: check if working
                                        return this._field.value.trim().length === 0;
                        }
                }

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/NonEmpty.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/NonEmpty.js
index 983e39570d8b17adf50527fce24ce1c07018fd67..b84d8def587c4fbdaec881288803ff64bc579ad6 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/NonEmpty.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Dependency/NonEmpty.js
@@ -26,7 +26,6 @@ define(['./Abstract', 'Core'], function(Abstract, Core) {
                                case 'INPUT':
                                        switch (this._field.type) {
                                                case 'checkbox':
-                                                       // TODO: check if working
                                                        return this._field.checked;
                                                
                                                case 'radio':
@@ -41,11 +40,13 @@ define(['./Abstract', 'Core'], function(Abstract, Core) {
                                        }
                                
                                case 'SELECT':
-                                       // TODO: check if working for multiselect
-                                       return this._field.value.length !== 0;
+                                       if (this._field.multiple) {
+                                               return elBySelAll('option:checked', this._field).length !== 0;
+                                       }
+                                       
+                                       return this._field.value != 0 && this._field.value.length !== 0;
                                
                                case 'TEXTAREA':
-                                       // TODO: check if working
                                        return this._field.value.trim().length !== 0;
                        }
                }