WebSVN – Moodle – Diff – /lib/amd/src/showhidesettings.js

     function isMultiSelect($el) {
         return ($el.is('select') && $el.prop('multiple'));
+    }
+    /**
+     * Are the selected values of a multi-select a subset of (i.e. 'in') the list of values provided?
+     * @param {jQuery} $el
+     * @param {array} values
+     * @returns {boolean}
+     */
+    function multiSelectIn($el, values) {
+        let selected = $el.val() || [];
+        if (selected.length == 0) {
+            selected.push('');
+        }
+        // Lock/hide if the selected values are a subset of the values.
+        let isSubset = selected.every(element => values.includes(element));
+        return isSubset;
+    }
     /**
-     * Does the multi-select exactly match the list of values provided?
+     * Are the selected values of a multi-select an exact match (i.e. 'eq') to the list of values provided?
      * @param {jQuery} $el
      * @param {array} values
      * @returns {boolean}
      */
     function multiSelectMatches($el, values) {
         var selected = $el.val() || [];
-        if (!values.length) {
+        if (values.length === 1 && values[0] === '') {
-            // No values - nothing to match against.
+            // Values array contains a single empty entry -> value was empty.
-            return false;
+            return selected.length === 0;
+        }
         if (selected.length !== values.length) {
             // Different number of expected and actual values - cannot possibly be a match.
             return false;
                     // the associated hidden element, which we have already found, above.
                     hide = hide || hiddenVal;
                     return;
+                }
                 if (isMultiSelect($el)) {
-                    // For multiselect, we check to see if the list of values provided matches the list selected.
+                    // For multiselect, we check to see if the selected values are a subset of the list of values provided.
-                    hide = multiSelectMatches($el, values);
+                    hide = multiSelectIn($el, values);
                     return;
+                }
                 // All other element types - check to see if the value is in the list.
                 hide = hide || (values.indexOf($el.val()) > -1);
             });
             dependencies = opts.dependencies;
             initHandlers();
             hideDependencyInfo();
+        }
     };
-});
 });

Proyectos de Subversion Moodle

(root)/lib/amd/src/showhidesettings.js – Rev 1 → 1441