erge branch '3.0'

* 3.0: Fixed wrong behaviour of icon changes when open a category
thorsten · Jan 6, 2020 · 61e0120 · 61e0120
2 parents 71aeb56 + 227db73
commit 61e0120
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/phpmyfaq/admin/assets/js/category.js b/phpmyfaq/admin/assets/js/category.js
@@ -15,11 +15,11 @@
 
 document.addEventListener('DOMContentLoaded', () => {
   'use strict';
-  $(function() {
+  () => {
     $('.list-group-item').on('click', function() {
-      $('.fa', this)
+      $('.fa.pmf-has-subcategories', this)
         .toggleClass('fa-caret-right')
         .toggleClass('fa-caret-down');
     });
-  });
+  };
 });
diff --git a/phpmyfaq/admin/assets/src/index.js b/phpmyfaq/admin/assets/src/index.js
@@ -7,7 +7,7 @@
  *
  * @package phpMyFAQ
  * @author Thorsten Rinne
- * @copyright 2019 phpMyFAQ Team
+ * @copyright 2019-2020 phpMyFAQ Team
  * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link https://www.phpmyfaq.de
  * @since 2019-12-20

diff --git a/phpmyfaq/admin/category.main.php b/phpmyfaq/admin/category.main.php
@@ -350,7 +350,7 @@
                 );
                 printf(
                     '<span>%s %s</span>',
-                    $numSubCategories > 0 ? '<i class="fa fa-caret-right"></i>' : '',
+                    $numSubCategories > 0 ? '<i class="fa fa-caret-right pmf-has-subcategories"></i>' : '',
                     $categoryName
                 );
 

diff --git a/phpmyfaq/assets/src/frontend.js b/phpmyfaq/assets/src/frontend.js
@@ -7,7 +7,7 @@
  *
  * @package phpMyFAQ
  * @author Thorsten Rinne
- * @copyright 2019 phpMyFAQ Team
+ * @copyright 2019-2020 phpMyFAQ Team
  * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link https://www.phpmyfaq.de
  * @since 2019-12-20

diff --git a/phpmyfaq/assets/src/vendors.js b/phpmyfaq/assets/src/vendors.js
@@ -7,7 +7,7 @@
  *
  * @package phpMyFAQ
  * @author Thorsten Rinne
- * @copyright 2019 phpMyFAQ Team
+ * @copyright 2019-2020 phpMyFAQ Team
  * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link https://www.phpmyfaq.de
  * @since 2019-12-14

diff --git a/phpmyfaq/lang/language_mn.php b/phpmyfaq/lang/language_mn.php
@@ -8,7 +8,7 @@
  *
  * @category  phpMyFAQ
  * @author    khaidaw@gmail.com
- * @copyright 2019 phpMyFAQ Team
+ * @copyright 2019-2020 phpMyFAQ Team
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2019-03-24