From 1e593db0002415a640e3596692de20e81d33830f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 6 Aug 2020 19:30:41 +0200
Subject: [PATCH] client: remove more jQuery-ism

---
 assets/js/selfoss-base.js          | 13 ++++++++-----
 assets/js/selfoss-events-search.js |  6 ++----
 assets/js/selfoss-events.js        |  7 +++----
 assets/js/selfoss-ui.js            |  3 +--
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/assets/js/selfoss-base.js b/assets/js/selfoss-base.js
index 8c0d744c34..921f928696 100644
--- a/assets/js/selfoss-base.js
+++ b/assets/js/selfoss-base.js
@@ -190,10 +190,13 @@ var selfoss = {
 
         $(element).find(':input').each(function(i, el) {
             // get only input elements with name
-            if ($.trim($(el).attr('name')).length != 0) {
-                values[$(el).attr('name')] = $(el).val();
-                if ($(el).attr('type') == 'checkbox') {
-                    values[$(el).attr('name')] = $(el).attr('checked') ? 1 : 0;
+            if (el.hasAttribute('name')) {
+                let name = el.getAttribute('name').trim();
+                if (name.length != 0) {
+                    values[name] = $(el).val();
+                    if ($(el).attr('type') == 'checkbox') {
+                        values[name] = $(el).attr('checked') ? 1 : 0;
+                    }
                 }
             }
         });
@@ -281,7 +284,7 @@ var selfoss = {
      */
     showErrors: function(form, errors) {
         $(form).find('span.error').remove();
-        $.each(errors, function(key, val) {
+        Object.entries(errors).forEach(([key, val]) => {
             form.find("[name='" + key + "']").addClass('error').parent('li').append('<span class="error">' + val + '</span>');
         });
     },
diff --git a/assets/js/selfoss-events-search.js b/assets/js/selfoss-events-search.js
index b5d848d527..c8498740ee 100644
--- a/assets/js/selfoss-events-search.js
+++ b/assets/js/selfoss-events-search.js
@@ -33,10 +33,8 @@ selfoss.events.search = function() {
         var words = splitTerm(term);
         term = joinTerm(words);
         $('#search-list').html('');
-        var itemId = 0;
-        $.each(words, function(index, item) {
-            $('#search-list').append('<li id="search-item-' + itemId + '">' + item + ' <i class="fas fa-times"></i></li>');
-            itemId++;
+        words.forEach((item, index) => {
+            $('#search-list').append('<li id="search-item-' + index + '">' + item + ' <i class="fas fa-times"></i></li>');
         });
 
         // execute search
diff --git a/assets/js/selfoss-events.js b/assets/js/selfoss-events.js
index af28172749..b0b0a6d5ce 100644
--- a/assets/js/selfoss-events.js
+++ b/assets/js/selfoss-events.js
@@ -152,16 +152,15 @@ selfoss.events = {
         }
 
         // load items
-        if ($.inArray(selfoss.events.section,
-            ['newest', 'unread', 'starred']) > -1) {
+        if (['newest', 'unread', 'starred'].includes(selfoss.events.section)) {
             selfoss.filter.type = selfoss.events.section;
             selfoss.filter.tag = '';
             selfoss.filter.source = '';
             if (selfoss.events.subsection) {
                 selfoss.events.lastSubsection = selfoss.events.subsection;
-                if (selfoss.events.subsection.substr(0, 4) == 'tag-') {
+                if (selfoss.events.subsection.startsWith('tag-')) {
                     selfoss.filter.tag = selfoss.events.subsection.substr(4);
-                } else if (selfoss.events.subsection.substr(0, 7) == 'source-') {
+                } else if (selfoss.events.subsection.startsWith('source-')) {
                     var sourceId = parseInt(selfoss.events.subsection.substr(7));
                     if (sourceId) {
                         selfoss.filter.source = sourceId;
diff --git a/assets/js/selfoss-ui.js b/assets/js/selfoss-ui.js
index a14637bd5d..c7da3eba21 100644
--- a/assets/js/selfoss-ui.js
+++ b/assets/js/selfoss-ui.js
@@ -481,8 +481,7 @@ selfoss.ui = {
                 if (placeholder) {
                     if (state == 'plural') {
                         pluralKeyword = buffer.trim();
-                        if ($.inArray(pluralKeyword,
-                            ['zero', 'one', 'other']) > -1) {
+                        if (['zero', 'one', 'other'].includes(pluralKeyword)) {
                             buffer = '';
                         } else {
                             pluralKeyword = undefined;