Fix bug introduced with 5cac8be re hidden selections

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/web/Scripts.java

@@ -110,7 +110,7 @@ public String toHtml() {
         putjs("jquery-ui", "js/jquery-ui-1.12.1-custom", 11);
         putjs("jquery-tablesorter", "js/jquery-tablesorter-2.26.6", 12);
         putjs("tablesorter-parsers", "js/tablesorter-parsers-0.0.2", 13, true);
-        putjs("searchable-option-list", "js/searchable-option-list-2.0.10", 14);
+        putjs("searchable-option-list", "js/searchable-option-list-2.0.11", 14);
         putjs("utils", "js/utils-0.0.34", 15, true);
         putjs("repos", "js/repos-0.0.2", 20, true);
         putjs("diff", "js/diff-0.0.4", 20, true);

opengrok-web/src/main/webapp/js/searchable-option-list-2.0.10.js renamed to opengrok-web/src/main/webapp/js/searchable-option-list-2.0.11.js

@@ -1044,70 +1044,98 @@
         },
 
         _addSelectionDisplayItem: function ($changedItem) {
-            var solOptionItem = $changedItem.data('sol-item'),
-                $existingDisplayItem = solOptionItem.displaySelectionItem,
-                $displayItemText;
-
             this.numSelected = 1 + this.numSelected;
 
             if (this.config.maxShow !== 0 && this.numSelected > this.config.maxShow) {
                 if (this.valMap == null) {
                     this._setXItemsSelected();
                 }
             } else {
-                /*
-                 * Modified for OpenGrok in 2016, 2019.
-                 */
-                var label = solOptionItem.label;
-                if ($changedItem.data('messages-available')) {
-                    label += ' <span class="';
-                    label += 'note-' + $changedItem.data('messages-level');
-                    label += ' important-note important-note-rounded" ';
-                    label += 'title="Some message is present for this project.';
-                    label += ' Find more info in the project list.">!</span>'
-                }
+                this._buildSelectionDisplayItem($changedItem);
+            }
+        },
 
-                $displayItemText = $('<span class="sol-selected-display-item-text" />').html(label);
-                $existingDisplayItem = $('<div class="sol-selected-display-item"/>')
-                    .append($displayItemText)
-                    .attr('title', solOptionItem.tooltip)
-                    .data('label', solOptionItem.label)
-                    .appendTo(this.$showSelectionContainer)
-                    .dblclick(function () { // Modified for OpenGrok in 2017.
-                        $changedItem.dblclick();
-                    });
+        _buildSelectionDisplayItem: function ($changedItem) {
+            var solOptionItem = $changedItem.data('sol-item'),
+                $existingDisplayItem,
+                $displayItemText;
 
-                // show remove button on display items if not disabled and null selection allowed
-                if ((this.config.multiple || this.config.allowNullSelection) && !$changedItem.prop('disabled')) {
-                    $('<span class="sol-quick-delete"/>')
-                        .html(this.config.texts.quickDelete)
-                        .click(function () { // deselect the project and refresh the search
-                            $changedItem
-                                .prop('checked', false)
-                                .trigger('change');
-                            /*
-                             * Modified for OpenGrok in 2017.
-                             */
-                            if (isOnSearchPage()) {
-                                $('#sbox').submit();
-                            }
-                        })
-                        .prependTo($existingDisplayItem);
-                }
+            /*
+             * Modified for OpenGrok in 2016, 2019.
+             */
+            var label = solOptionItem.label;
+            if ($changedItem.data('messages-available')) {
+                label += ' <span class="';
+                label += 'note-' + $changedItem.data('messages-level');
+                label += ' important-note important-note-rounded" ';
+                label += 'title="Some message is present for this project.';
+                label += ' Find more info in the project list.">!</span>'
+            }
 
-                solOptionItem.displaySelectionItem = $existingDisplayItem;
+            $displayItemText = $('<span class="sol-selected-display-item-text" />').html(label);
+            $existingDisplayItem = $('<div class="sol-selected-display-item"/>')
+                .append($displayItemText)
+                .attr('title', solOptionItem.tooltip)
+                .data('label', solOptionItem.label)
+                .appendTo(this.$showSelectionContainer)
+                .dblclick(function () { // Modified for OpenGrok in 2017.
+                    $changedItem.dblclick();
+                });
+
+            // show remove button on display items if not disabled and null selection allowed
+            if ((this.config.multiple || this.config.allowNullSelection) && !$changedItem.prop('disabled')) {
+                $('<span class="sol-quick-delete"/>')
+                    .html(this.config.texts.quickDelete)
+                    .click(function () { // deselect the project and refresh the search
+                        $changedItem
+                            .prop('checked', false)
+                            .trigger('change');
+                        /*
+                         * Modified for OpenGrok in 2017.
+                         */
+                        if (isOnSearchPage()) {
+                            $('#sbox').submit();
+                        }
+                    })
+                    .prependTo($existingDisplayItem);
             }
+
+            solOptionItem.displaySelectionItem = $existingDisplayItem;
         },
 
         _removeSelectionDisplayItem: function ($changedItem) {
             var solOptionItem = $changedItem.data('sol-item'),
                 $myDisplayItem = solOptionItem.displaySelectionItem;
 
+            var wasExceeding = this.config.maxShow !== 0 && this.numSelected > this.config.maxShow;
             this.numSelected = this.numSelected - 1;
 
             if ($myDisplayItem) {
                 $myDisplayItem.remove();
                 solOptionItem.displaySelectionItem = undefined;
+
+                /*
+                 * N.b. for bulk mode, wasExceeding handling is off since only
+                 * Clear or Invert-Selection would cause this function to be
+                 * called. For Clear, there won't be any selected items at the
+                 * end, so wasExceeding is irrelevant. For Invert-Selection,
+                 * checked options are unchecked first -- i.e. we go to zero
+                 * this.numSelected first -- so normal _addSelectionDisplayItem
+                 * takes care of things.
+                 */
+
+                if (wasExceeding && this.valMap == null) {
+                    var self = this;
+                    this.$selectionContainer
+                        .find('.sol-option input[type="checkbox"]:not([disabled]):checked')
+                        .each(function (index, item) {
+                            var $currentOptionItem = $(item);
+                            if ($currentOptionItem.data('sol-item').displaySelectionItem == null) {
+                                self._buildSelectionDisplayItem($currentOptionItem);
+                                return false;
+                            }
+                        });
+                }
             }
             if (this.valMap == null) {
                 this._setXItemsSelected();