Sanity-check decaffeinate app.views.Notif

Simon Legner committed 2 years ago

Commit 1efb7941 parent 9073fa25 files · +37 −96Browse files

Showing the changes to assets/javascripts (5 of 5 files). Show all

Unified · Split

5 files

assets/javascripts/views/misc/news.js +12 −27
assets/javascripts/views/misc/notice.js +2 −12
assets/javascripts/views/misc/notif.js +9 −18
assets/javascripts/views/misc/tip.js +2 −12
assets/javascripts/views/misc/updates.js +12 −27

assets/javascripts/views/misc/news.js+12−27

-// TODO: This file was created by bulk-decaffeinate.
-// Sanity-check the conversion and remove this comment.
-/*
- * 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
- * DS206: Consider reworking classes to avoid initClass
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 //= require views/misc/notif
 app.views.News = class News extends app.views.Notif {
-  static initClass() {
+  static className = "_notif _notif-news";
-    this.className += " _notif-news";
-    this.defautOptions = { autoHide: 30000 };
+  static defaultOptions = { autoHide: 30000 };
-  }
-  init() {
+  init0() {
     this.unreadNews = this.getUnreadNews();
     if (this.unreadNews.length) {
       this.show();
   }
   getUnreadNews() {
-    let time;
+    let time = this.getLastReadTime();
-    if (!(time = this.getLastReadTime())) {
+    if (!time) {
       return [];
     }
-    return (() => {
+    const result = [];
-      const result = [];
+    for (var news of app.news) {
-      for (var news of Array.from(app.news)) {
+      if (new Date(news[0]).getTime() <= time) {
-        if (new Date(news[0]).getTime() <= time) {
+        break;
-          break;
-        }
-        result.push(news);
       }
-      return result;
+      result.push(news);
-    })();
+    }
+    return result;
   }
   getLastNewsTime() {
     app.settings.set("news", this.getLastNewsTime());
   }
 };
-app.views.News.initClass();

assets/javascripts/views/misc/notice.js+2−12

@@ -1,15 +1,6 @@
1	// TODO: This file was created by bulk-decaffeinate.
2	// Sanity-check the conversion and remove this comment.
3	/*
4	* decaffeinate suggestions:
5	* DS206: Consider reworking classes to avoid initClass
6	* Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
7	*/
8	app.views.Notice = class Notice extends app.View {	1	app.views.Notice = class Notice extends app.View {
9	static initClass() {	2	static className = "_notice";
10	this.className = "_notice";	3	static attributes = { role: "alert" };
11	this.attributes = { role: "alert" };
12	}
13		4
14	constructor(type, ...args) {	5	constructor(type, ...args) {
15	super();	6	super();
@@ -44,4 +35,3 @@ app.views.Notice = class Notice extends app.View { · 28 unmodified lines
44	$.remove(this.el);	35	$.remove(this.el);
45	}	36	}
46	};	37	};
47	app.views.Notice.initClass();

assets/javascripts/views/misc/notif.js+9−18

-// TODO: This file was created by bulk-decaffeinate.
-// Sanity-check the conversion and remove this comment.
-/*
- * decaffeinate suggestions:
- * DS206: Consider reworking classes to avoid initClass
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 app.views.Notif = class Notif extends app.View {
-  static initClass() {
+  static className = "_notif";
-    this.className = "_notif";
+  static activeClass = "_in";
-    this.activeClass = "_in";
+  static attributes = { role: "alert" };
-    this.attributes = { role: "alert" };
-    this.defaultOptions = { autoHide: 15000 };
+  static defaultOptions = { autoHide: 15000 };
-    this.events = { click: "onClick" };
+  static events = { click: "onClick" };
-  }
   constructor(type, options) {
     super();
     this.type = type;
     this.options = $.extend({}, this.constructor.defaultOptions, options || {});
+    this.init0(); // needs this.options
+    this.refreshElements();
   }
-  init() {
+  init0() {
     this.show();
   }
   }
   position() {
-    const notifications = $$(`.${app.views.Notif.className}`);
+    const notifications = $$(`.${Notif.className}`);
     if (notifications.length) {
       const lastNotif = notifications[notifications.length - 1];
       this.el.style.top =
     }
   }
 };
-app.views.Notif.initClass();

assets/javascripts/views/misc/tip.js+2−12

-// TODO: This file was created by bulk-decaffeinate.
-// Sanity-check the conversion and remove this comment.
-/*
- * decaffeinate suggestions:
- * DS206: Consider reworking classes to avoid initClass
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 //= require views/misc/notif
 app.views.Tip = class Tip extends app.views.Notif {
-  static initClass() {
+  static className = "_notif _notif-tip";
-    this.className = "_notif _notif-tip";
-    this.defautOptions = { autoHide: false };
+  static defautOptions = { autoHide: false };
-  }
   render() {
     this.html(this.tmpl(`tip${this.type}`));
   }
 };
-app.views.Tip.initClass();

assets/javascripts/views/misc/updates.js+12−27

-// TODO: This file was created by bulk-decaffeinate.
-// Sanity-check the conversion and remove this comment.
-/*
- * 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
- * DS206: Consider reworking classes to avoid initClass
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/main/docs/suggestions.md
- */
 //= require views/misc/notif
 app.views.Updates = class Updates extends app.views.Notif {
-  static initClass() {
+  static className = "_notif _notif-news";
-    this.className += " _notif-news";
-    this.defautOptions = { autoHide: 30000 };
+  static defautOptions = { autoHide: 30000 };
-  }
-  init() {
+  init0() {
     this.lastUpdateTime = this.getLastUpdateTime();
     this.updatedDocs = this.getUpdatedDocs();
     this.updatedDisabledDocs = this.getUpdatedDisabledDocs();
     if (!this.lastUpdateTime) {
       return [];
     }
-    return (() => {
+    const result = [];
-      const result = [];
+    for (var doc of Array.from(app.disabledDocs.all())) {
-      for (var doc of Array.from(app.disabledDocs.all())) {
+      if (
-        if (
+        doc.mtime > this.lastUpdateTime &&
-          doc.mtime > this.lastUpdateTime &&
+        app.docs.findBy("slug_without_version", doc.slug_without_version)
-          app.docs.findBy("slug_without_version", doc.slug_without_version)
+      ) {
-        ) {
+        result.push(doc);
-          result.push(doc);
-        }
       }
-      return result;
+    }
-    })();
+    return result;
   }
   getLastUpdateTime() {
     );
   }
 };
-app.views.Updates.initClass();