@okjavis/nodebb-theme-javis 5.0.1 → 5.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okjavis/nodebb-theme-javis",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Modern, premium NodeBB theme for JAVIS Community - Extends Harmony with custom styling",
   "main": "theme.js",
   "scripts": {

package/plugin.json

@@ -18,7 +18,8 @@
     "static/lib/theme.js"
   ],
   "modules": {
-    "../admin/plugins/javis.js": "public/admin.js"
+    "../admin/plugins/javis.js": "public/admin.js",
+    "forum/search": "public/src/client/search.js"
   },
   "templates": "templates",
   "screenshot": "screenshot.png",

package/public/src/client/search.js

@@ -257,12 +257,14 @@ define('forum/search', [
 		categoryFilter.init(dropdownEl, {
 			selectedCids: _selectedCids,
 			updateButton: false, // prevent categoryFilter module from updating the button
+			states: [], // FIX: Disable watch states to remove "Watched categories" from dropdown
+			showLinks: true, // FIX: Show regular category links
 			onSelect: function (data) {
-				// Update selectedCids immediately when a category is clicked
+				// FIX: Update selectedCids immediately when a category is clicked
 				ajaxify.data.selectedCids = data.selectedCids;
 				selectedCids = data.selectedCids;
 
-				// Trigger search immediately
+				// FIX: Trigger search immediately without requiring additional clicks
 				const searchFiltersNew = getSearchDataFromDOM();
 				if (JSON.stringify(searchFilters) !== JSON.stringify(searchFiltersNew)) {
 					searchFilters = searchFiltersNew;

package/static/lib/theme.js

@@ -8,10 +8,22 @@
 
   var carouselCounter = 0;
 
+  // Patch search module to fix category filter
+  $(window).on('action:ajaxify.end', function(ev, data) {
+    if (data.url && data.url.startsWith('search')) {
+      patchSearchCategoryFilter();
+    }
+  });
+
   // Theme initialization
   $(document).ready(function() {
     console.log('JAVIS Community Theme initialized');
 
+    // Patch search if we're already on the search page
+    if (window.location.pathname.includes('/search')) {
+      setTimeout(patchSearchCategoryFilter, 500);
+    }
+
     // Initialize sidebar toggle handler
     initSidebarToggle();
 
@@ -658,6 +670,64 @@
     });
   }
 
+  /**
+   * Patch search page category filter to:
+   * 1. Remove "Watched categories" from dropdown
+   * 2. Auto-apply category filter on selection (no additional click needed)
+   */
+  function patchSearchCategoryFilter() {
+    var $categoryFilter = $('[component="search/filters"] [component="category/filter"]');
+    if (!$categoryFilter.length || $categoryFilter.attr('data-javis-patched')) {
+      return;
+    }
+    $categoryFilter.attr('data-javis-patched', 'true');
+
+    console.log('JAVIS: Patching search category filter');
+
+    // Function to remove "Watched categories" from the dropdown
+    function removeWatchedCategories() {
+      // Method 1: Remove by data-cid="watched"
+      var $watchedItem = $categoryFilter.find('[component="category/list"] li[data-cid="watched"]');
+      if ($watchedItem.length) {
+        $watchedItem.remove();
+        console.log('JAVIS: Removed "Watched categories" by data-cid');
+        return true;
+      }
+
+      // Method 2: Remove by text content (fallback)
+      $categoryFilter.find('[component="category/list"] li').each(function() {
+        var $li = $(this);
+        var text = $li.text().toLowerCase().trim();
+        if (text.includes('watched') && text.includes('categor')) {
+          $li.remove();
+          console.log('JAVIS: Removed "Watched categories" by text match');
+          return false; // break the loop
+        }
+      });
+    }
+
+    // Remove immediately
+    removeWatchedCategories();
+
+    // Also remove when dropdown opens (in case categories are loaded dynamically)
+    $categoryFilter.on('shown.bs.dropdown', function() {
+      setTimeout(removeWatchedCategories, 100);
+    });
+
+    // Add immediate search trigger on category selection
+    $categoryFilter.on('click', '[component="category/list"] [data-cid]', function(e) {
+      var $item = $(this);
+      var cid = $item.attr('data-cid');
+
+      // Let the original handler update the selection state first
+      setTimeout(function() {
+        // Trigger the search by closing the dropdown (which triggers the existing onHidden handler)
+        $categoryFilter.find('.dropdown-toggle').dropdown('hide');
+        console.log('JAVIS: Auto-triggering search for category:', cid);
+      }, 50);
+    });
+  }
+
   /**
    * Initialize immediate category filter navigation on feed page
    * When a category is selected, navigate immediately instead of waiting for dropdown close

package/templates/partials/category/filter-dropdown-content.tpl

@@ -41,4 +41,4 @@
         </li>
         {{{end}}}
     </ul>
-</div>
+</div>