Apply remarks from decaffeinate to the new javascript files

This commit applies the suggestions from decaffeinate to the newly
generated files so they are easier to read. The code still feels a
little weird though.

Suivi #3034

Author: nud

app/assets/javascripts/application.js

@@ -1,9 +1,3 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 //= require jquery2
 //= require jquery_ujs
 //= require jquery.autocomplete
@@ -15,7 +9,7 @@
 //= require markitup-markdown
 //= require_tree .
 
-const $ = window.jQuery;
+$ = window.jQuery;
 
 $("body").on("ajax:success", "form[data-remote]", function(e, data) {
   if (data && data.notice) {
@@ -25,7 +19,7 @@ $("body").on("ajax:success", "form[data-remote]", function(e, data) {
     $("#nb_votes").text(data.nb_votes);
   }
   if (!$(this).data("hidden")) {
-    return $(this)
+    $(this)
       .parent()
       .hide();
   }
@@ -34,7 +28,7 @@ $("body").on("ajax:success", "form[data-remote]", function(e, data) {
 $(".markItUp").markItUp(window.markItUpSettings);
 
 $("a.hit_counter[data-hit]").each(function() {
-  return (this.href = "/redirect/" + $(this).data("hit"));
+  this.href = "/redirect/" + $(this).data("hit");
 });
 
 // Ready to moule
@@ -49,7 +43,7 @@ $("textarea, #form_answers input").keypress(function(event) {
     .find("input[value=Prévisualiser]")
     .next("input[type=submit]")
     .hide();
-  return $(this).off(event);
+  $(this).off(event);
 });
 
 // Add/Remove dynamically links in the news form
@@ -94,7 +88,7 @@ $("article.news .edited_by").each(function() {
   if (nb > 3) {
     const was = field.html();
     field.html(`<a>${nb} personnes</a>`);
-    return field.one("click", () => field.html(was));
+    field.one("click", () => field.html(was));
   }
 });
 
@@ -136,7 +130,7 @@ $("#redaction .link, #redaction .paragraph").lockableEditionInPlace();
 
 // Tags
 $.fn.autocompleter = function() {
-  this.each(function() {
+  return this.each(function() {
     const input = $(this);
     return input.autocomplete(input.data("url"), {
       multiple: true,
@@ -158,14 +152,14 @@ $(".tag_in_place")
   .editionInPlace();
 $(".add_tag, .remove_tag")
   .click(function() {
-    return $(this)
+    $(this)
       .blur()
       .parents("form")
       .data({ hidden: "true" });
   })
   .parents("form")
   .on("ajax:success", function() {
-    return $(this)
+    $(this)
       .find("input")
       .attr({ disabled: "disabled" });
   });
@@ -198,7 +192,7 @@ Raccourcis clavier : <ul>
   });
 
 $("#account_user_attributes_avatar").change(function() {
-  if (window.URL != null) {
+  if (!window.URL) {
     return;
   }
   const url = window.URL.createObjectURL(this.files[0]);
@@ -214,5 +208,4 @@ $("button.more").click(function() {
     .next(".more_actions")
     .show();
   $(this).hide();
-  return false;
 });

app/assets/javascripts/chat.js

@@ -1,14 +1,6 @@
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS205: Consider reworking code to avoid use of IIFEs
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 //= require push
 
-const $ = window.jQuery;
+$ = window.jQuery;
 
 class Chat {
   constructor(board) {
@@ -31,15 +23,13 @@ class Chat {
     this.board.find("form").submit(this.postMessage);
     this.totoz_type = $.cookie("totoz-type");
     this.totoz_url = $.cookie("totoz-url") || "https://totoz.eu/img/";
-    for (var right of Array.from(this.board.find(".board-right"))) {
+    for (var right of this.board.find(".board-right")) {
       this.norlogize(right);
     }
-    for (var left of Array.from(
-      this.board
-        .find(".board-left time")
-        .get()
-        .reverse()
-    )) {
+    for (var left of this.board
+      .find(".board-left time")
+      .get()
+      .reverse()) {
       this.norlogize_left(left);
     }
     this.board
@@ -73,33 +63,23 @@ class Chat {
         .find(".board-left:last .norloge")
         .click(this.norloge);
       this.inboxContainer.scrollTop(this.inbox.height());
-      for (right of Array.from(this.inbox.find(".board-right:last"))) {
+      for (right of this.inbox.find(".board-right:last")) {
         this.norlogize(right);
       }
-      return (() => {
-        const result = [];
-        for (var left of Array.from(this.inbox.find(".board-left time:last"))) {
-          result.push(this.norlogize_left(left));
-        }
-        return result;
-      })();
+      for (var left of this.inbox.find(".board-left time:last")) {
+        this.norlogize_left(left);
+      }
     } else {
       this.inbox
         .prepend(msg.message)
         .find(".board-left:first .norloge")
         .click(this.norloge);
-      for (right of Array.from(this.inbox.find(".board-right:first"))) {
+      for (right of this.inbox.find(".board-right:first")) {
         this.norlogize(right);
       }
-      return (() => {
-        const result1 = [];
-        for (var left of Array.from(
-          this.inbox.find(".board-left time:first")
-        )) {
-          result1.push(this.norlogize_left(left));
-        }
-        return result1;
-      })();
+      for (var left of this.inbox.find(".board-left time:first")) {
+        this.norlogize_left(left);
+      }
     }
   }
 
@@ -144,7 +124,7 @@ class Chat {
     }
     const value = this.input.val();
     const range = this.input.caret();
-    if (range.start == null) {
+    if (!range.start) {
       range.start = 0;
       range.end = 0;
     }
@@ -173,9 +153,7 @@ class Chat {
         const orig = escape(this.data);
         let html = "";
         while ((matches = r.exec(orig))) {
-          var [match, datematch, timematch, minutes, index] = Array.from(
-            matches
-          );
+          var [match, datematch, timematch, minutes, index] = matches;
           if (index) {
             switch (index.substr(0, 1)) {
               case ":":
@@ -246,7 +224,7 @@ class Chat {
           const orig = escape(this.data);
           let html = "";
           while ((matches = totoz.exec(orig))) {
-            var [title, name] = Array.from(matches);
+            var [title, name] = matches;
             var stop = matches.index;
             html =
               html +
@@ -340,10 +318,8 @@ class Chat {
       this.totoz.append(totoz);
     }
     const position = $(event.target).position();
-    const [x, y] = Array.from([
-      position.left,
-      position.top + event.target.offsetHeight
-    ]);
+    const x = position.left;
+    const y = position.top + event.target.offsetHeight;
     return totoz.css({
       "z-index": "15",
       display: "block",

app/assets/javascripts/edition_in_place.js

@@ -1,10 +1,4 @@
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-const $ = window.jQuery;
+$ = window.jQuery;
 
 class EditionInPlace {
   constructor(el, edit) {
@@ -41,7 +35,7 @@ class EditionInPlace {
   cantEdit() {
     this.el.trigger("in_place:cant_edit", this.xhr);
     this.button().click(this.loadForm);
-    return (this.xhr = null);
+    this.xhr = null;
   }
 
   showForm() {
@@ -51,7 +45,7 @@ class EditionInPlace {
     form.find(".markItUp").markItUp(window.markItUpSettings);
     form.submit(this.submitForm);
     this.el.trigger("in_place:form", this.xhr);
-    return (this.xhr = null);
+    this.xhr = null;
   }
 
   reset(event) {
@@ -79,29 +73,29 @@ class EditionInPlace {
       const messages = [];
       for (var attribute in response.errors) {
         var errors = response.errors[attribute];
-        for (message of Array.from(errors)) {
+        for (message of errors) {
           messages.push(message);
         }
       }
       if (messages.length === 1) {
         error.text("Erreur : " + messages[0]);
       } else {
         error.text("Erreurs :");
-        for (message of Array.from(messages)) {
+        for (message of messages) {
           error.append($("<li>").append(message));
         }
       }
       error.show();
     } catch (error1) {}
     this.el.trigger("in_place:error", this.xhr);
-    return (this.xhr = null);
+    this.xhr = null;
   }
 
   success() {
     this.el = $(this.xhr.responseText).replaceAll(this.el);
     this.button().click(this.loadForm);
     this.el.trigger("in_place:success", this.xhr);
-    return (this.xhr = null);
+    this.xhr = null;
   }
 }
 

app/assets/javascripts/lockable_edition_in_place.js

@@ -1,22 +1,17 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-const $ = window.jQuery;
+$ = window.jQuery;
 
 $.fn.lockableEditionInPlace = function() {
   return $(this)
     .on("in_place:form", function() {
       const self = $(this);
       self.data({ cancel: self.find(".cancel").data("url") });
-      return self.data({
+      self.data({
         token: self.find('input[name="authenticity_token"]').serialize()
       });
     })
     .on("in_place:reset", function() {
       const self = $(this);
-      return $.ajax({
+      $.ajax({
         url: self.data("cancel"),
         type: "post",
         data: self.data("token")

app/assets/javascripts/nested_fields.js

@@ -1,9 +1,4 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-const $ = window.jQuery;
+$ = window.jQuery;
 
 class NestedFields {
   constructor(el, parent, nested, text, tag, attributes) {
@@ -33,15 +28,15 @@ class NestedFields {
         })
       })
     );
-    return $(`#add_${this.nested}`).click(this.add_item);
+    $(`#add_${this.nested}`).click(this.add_item);
   }
 
   bind_item(item, counter) {
     const it = $(item);
     it.append(
       `<button type="button" class="remove">Supprimer ce ${this.text} </button>`
     );
-    return it.children(".remove").click(() => {
+    it.children(".remove").click(() => {
       if (counter) {
         const name = `${this.parent}[${
           this.nested

app/assets/javascripts/popup.js

@@ -1,11 +1,4 @@
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS205: Consider reworking code to avoid use of IIFEs
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
-const $ = window.jQuery;
+$ = window.jQuery;
 
 // Popup management: on click on event element, hide / show popup
 $(".popup-event").click(function() {
@@ -25,18 +18,13 @@ $(".popup-event").click(function() {
   }
   // Give new popup display status to all listeners
   const listners = popup.data("popup-listner-ids");
-  return (() => {
-    const result = [];
-    for (var listner of Array.from(listners.split(" "))) {
-      var listnerElement = $(`#${listner}`);
-      if (showPopup) {
-        result.push(listnerElement.attr(`data-popup-${popupId}-shown`, ""));
-      } else {
-        result.push(
-          listnerElement.removeAttr(`data-popup-${popupId}-shown`, "")
-        );
-      }
+
+  for (var listner of listners.split(" ")) {
+    var listnerElement = $(`#${listner}`);
+    if (showPopup) {
+      listnerElement.attr(`data-popup-${popupId}-shown`, "");
+    } else {
+      listnerElement.removeAttr(`data-popup-${popupId}-shown`, "");
     }
-    return result;
-  })();
+  }
 });