upgrade to ESLint 4 (#2013)

* upgrade to ESLint 4, adjust eslintrc to match codebase

* autofix new errors

* manual fixes

* Old Blue: factor out in-template ternaries

Author: AprilSylph

.eslintrc.yml

@@ -27,20 +27,21 @@
         requireParamDescription: false
         requireReturnDescription: false
 
-    indent: [error, tab, {SwitchCase: 1}]
+    indent: [error, tab, {SwitchCase: 1, MemberExpression: off, CallExpression: {arguments: off}}]
     semi: error
     brace-style: [error, 1tbs, allowSingleLine: true]
     linebreak-style: [error, unix]
     semi-spacing: error
     comma-spacing: error
     space-infix-ops: error
     template-curly-spacing: error
-    space-before-function-paren: [error, never]
+    space-before-function-paren: [error, {anonymous: never, named: never, asyncArrow: always}]
     space-before-blocks: error
     keyword-spacing:
       - error
       - before: true
         after: true
+    no-useless-escape: off
   globals:
     BigInt: false
     _: true

Extensions/better_reblogs.js

@@ -314,7 +314,7 @@ XKit.extensions.better_reblogs = new Object({
 			}
 			$this.addClass("xkit-better-reblogs-done");
 
-            // trick tumblr into displaying the little blog info popovers for the reblog avatars
+			// trick tumblr into displaying the little blog info popovers for the reblog avatars
 			$this.find(".reblog-avatar").addClass("post_sub_avatar");
 
 			if (XKit.extensions.better_reblogs.preferences.reorder_reblog_title.value) {
@@ -432,8 +432,8 @@ XKit.extensions.better_reblogs = new Object({
 	},
 
 	hex_to_rgb: function(hex) {
-        // From: http://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
-        /* eslint-disable id-length */
+		// From: http://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
+		/* eslint-disable id-length */
 
 		var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
 		return result ? {

Extensions/classic_header.js

@@ -239,7 +239,7 @@ XKit.extensions.classic_header = new Object({
 					}
 
 					var raw_id = tab_blog.attr('id');
-				// Id has the form tab_blog_{blog-name}
+					// Id has the form tab_blog_{blog-name}
 					var blog_id = raw_id.substring('tab_blog_'.length, raw_id.length);
 					var blog_icon = tab_blog.find('.blog_icon').css('background-image');
 					if (!blog_icon || blog_icon === "none") {

Extensions/hideavatars.js

@@ -108,7 +108,7 @@ XKit.extensions.hideavatars = new Object({
 					return $(this).attr("title") === blogname.title;
 				}).attr("style", "opacity: 0.5; background-image: url('" + hidden_avatar + "');");
 
-			//Avatars in activity lines
+				//Avatars in activity lines
 				$(".ui_avatar_link").filter(function() {
 					return $(this).attr("title") === blogname.title;
 				}).find(".avatar").attr("style", "opacity: 0.5; background-image: url('" + hidden_avatar + "');");

Extensions/old_blue.js

@@ -29,6 +29,9 @@ XKit.extensions.old_blue = new Object({
 			if (!XKit.page.react) {
 				XKit.tools.init_css("old_blue");
 			} else {
+				const old_font_family_rule = this.preferences.old_font.value ? '--font-family: "Helvetica Neue", "HelveticaNeue", Helvetica, Arial, sans-serif' : '';
+				const old_font_size_rule = this.preferences.old_font_size.value ? ':root { --base-font-size: 14px !important; }' : '';
+
 				XKit.tools.add_css(`
 					.xkit--react {
 						--rgb-white: 255, 255, 255;
@@ -64,17 +67,10 @@ XKit.extensions.old_blue = new Object({
 						--gray-13: rgba(var(--rgb-black), 0.13);
 						--gray-7: rgba(var(--rgb-black), 0.07);
 
-						${this.preferences.old_font.value ?
-							'--font-family: "Helvetica Neue", "HelveticaNeue", Helvetica, Arial, sans-serif'
-							: ''
-						}
+						${old_font_family_rule}
 					}
 
-					${this.preferences.old_font_size.value ?
-						`:root {
-							--base-font-size: 14px !important;
-						}` : ''
-					}
+					${old_font_size_rule}
 				`, "old_blue");
 			}
 		}

Extensions/show_picture_size.js

@@ -37,7 +37,7 @@ XKit.extensions.show_picture_size = new Object({
 			var post = XKit.interface.post($(this));
 
 			if (post.type === 'photo') {
-                // Photo
+				// Photo
 				$(this).find('.post_media .post_media_photo').each(function() {
 					var photo = $(this);
 					var photoLink = $(this).parent('.post_media_photo_anchor');
@@ -54,7 +54,7 @@ XKit.extensions.show_picture_size = new Object({
 					});
 				});
 			} else if (post.type === 'photoset') {
-                // Photo set
+				// Photo set
 				$(this).find('.photoset_photo').each(function() {
 					var photoLink = $(this);
 

Extensions/timestamps.js

@@ -409,18 +409,18 @@ XKit.extensions.timestamps = new Object({
 		const sameYear = date.getFullYear() === now.getFullYear();
 
 		if (sameDate) {
-		  return date.toLocaleTimeString(locale, {
-			hour: 'numeric',
-			minute: 'numeric',
-		  });
+			return date.toLocaleTimeString(locale, {
+				hour: 'numeric',
+				minute: 'numeric',
+			});
 		} else {
-		  return date.toLocaleDateString(locale, {
-			day: 'numeric',
-			month: 'short',
-			year: sameYear ? undefined : 'numeric',
-		  });
+			return date.toLocaleDateString(locale, {
+				day: 'numeric',
+				month: 'short',
+				year: sameYear ? undefined : 'numeric',
+			});
 		}
-	  },
+	},
 
 	format_date: function(timestamp) {
 		const absolute_type = this.preferences.format_type_absolute.value;

Extensions/xkit_patches.js

@@ -90,7 +90,7 @@ XKit.extensions.xkit_patches = new Object({
 				let blogs = [];
 				Promise.race([
 					new Promise((resolve) => setTimeout(resolve, 30000)),
-					(async() => {
+					(async () => {
 						const {response} = await tumblr.apiFetch("/v2/user/info", {
 							queryParams: {'fields[blogs]': 'name'},
 						});
@@ -426,9 +426,7 @@ XKit.extensions.xkit_patches = new Object({
 
 					const add_func = `(async ({callback_nonce, arguments}) => {
 						try {
-							const return_value = await (${
-								XKit.tools.normalize_indentation("\t".repeat(7), func.toString())
-							})(arguments);
+							const return_value = await (${XKit.tools.normalize_indentation("\t".repeat(7), func.toString())})(arguments);
 
 							window.postMessage({
 								xkit_callback_nonce: callback_nonce,
@@ -690,7 +688,7 @@ XKit.extensions.xkit_patches = new Object({
 						return this.cssMap;
 					}
 
-					this.cssMap = await XKit.tools.async_add_function(async() => {
+					this.cssMap = await XKit.tools.async_add_function(async () => {
 						if (!window.tumblr) {
 							return null;
 						}
@@ -1324,7 +1322,7 @@ XKit.extensions.xkit_patches = new Object({
 					if (typeof(revisionString[1]) === "undefined") {
 						version.patch = 0;
 					} else {
-				// No need for toLowerCase here since we already do that when we split versionSplit above
+						// No need for toLowerCase here since we already do that when we split versionSplit above
 						version.patch = revisionString[1].trim().charCodeAt(0) - "a".charCodeAt(0);
 					}
 				} else {
@@ -3110,7 +3108,7 @@ XKit.extensions.xkit_patches = new Object({
 
 				$("#xkit-notifications").append(m_html);
 
-					// console.log(" Notification > " + message);
+				// console.log(" Notification > " + message);
 
 				var m_notification_id = XKit.notifications.count;
 				setTimeout(function() {
@@ -3121,7 +3119,7 @@ XKit.extensions.xkit_patches = new Object({
 						try {
 							callback();
 						} catch (e) {
-								// Meh.
+							// Meh.
 						}
 					}
 					$("#xkit_notification_" + m_notification_id).slideUp('slow');

Extensions/xkit_preferences.js

@@ -313,7 +313,7 @@ XKit.extensions.xkit_preferences = new Object({
 				if (new_version > my_version) {
 					XKit.notifications.add("<b>Please update XKit!</b><br/>A new version of XKit is available for your browser. " +
 						"Please click here for more information and how you can easily and quickly update now.", "warning", true, function() {
-							XKit.window.show("Please update XKit",
+						XKit.window.show("Please update XKit",
 							"<b>A new version of XKit, version " + mb_object.version + " is available.</b><br/>" +
 							"You are currently using XKit version " + XKit.version + ".<br/><br/>" +
 							"Please update to the latest version as soon as possible. If you don't, XKit might not work properly, " +
@@ -322,7 +322,7 @@ XKit.extensions.xkit_preferences = new Object({
 							"warning",
 							'<a class="xkit-button default" href="https://new-xkit-extension.tumblr.com/downloads">Go to Download page</a>' +
 							'<div class="xkit-button" id="xkit-close-message">Not now, remind me later.</div>');
-						});
+					});
 				}
 			});
 		},
@@ -2215,9 +2215,7 @@ XKit.extensions.xkit_preferences = new Object({
 		$("#xkit-panel-extension-info").click(function() {
 
 			var text = "XKit version " + XKit.version + "\n" +
-					"extensions:\n" + XKit.installed.list().map(function(i) {
-						return "   " + i + ": " + XKit.installed.version(i) + (XKit.installed.enabled(i) ? "" : " (disabled)");
-					}).join("\n");
+					"extensions:\n" + XKit.installed.list().map(i => "   " + i + ": " + XKit.installed.version(i) + (XKit.installed.enabled(i) ? "" : " (disabled)")).join("\n");
 			var timestamp = new Date();
 
 			XKit.tools.make_file("XKit Basic Export " + timestamp.getTime() + ".txt", text);