Added files in .eslintignore, updated globals

.eslintignore

@@ -1,3 +1,9 @@
 frappe/public/js/lib/*
 frappe/public/js/frappe/misc/tests/*
-frappe/public/js/frappe/class.js
+frappe/public/js/frappe/views/test_runner.js
+frappe/core/doctype/doctype/boilerplate/*
+frappe/core/doctype/report/boilerplate/*
+frappe/public/js/frappe/class.js
+frappe/templates/includes/*
+frappe/tests/testcafe/*
+frappe/www/website_script.js

.eslintrc

@@ -1,13 +1,15 @@
 {
 	"env": {
 		"browser": true,
+		"node": true,
 		"es6": true
 	},
 	"extends": "eslint:recommended",
 	"rules": {
 		"indent": [
 			"error",
-			"tab"
+			"tab",
+			{ "SwitchCase": 1 }
 		],
 		"linebreak-style": [
 			"error",
@@ -27,9 +29,16 @@
 			"warn"
 		],
 		"no-console": [
+			"warn"
+		],
+		"no-extra-boolean-cast": [
+			"off"
+		],
+		"no-control-regex": [
 			"off"
 		]
 	},
+	"root": true,
 	"globals": {
 		"frappe": true,
 		"$": true,
@@ -86,7 +95,9 @@
 		"CANCEL": true,
 		"copy_dict": true,
 		"get_number_format_info": true,
-		
+		"print_table": true,
+		"Layout": true,
+		"web_form_settings": true,
 		"$c": true,
 		"$a": true,
 		"$i": true,
@@ -99,6 +110,10 @@
 		"get_field_obj": true,
 		"get_query_params": true,
 		"unhide_field": true,
-		"hide_field": true
+		"hide_field": true,
+		"set_field_options": true,
+		"getCookie": true,
+		"getCookies": true,
+		"get_url_arg": true
 	}
 }

frappe/build.js

@@ -25,7 +25,7 @@ const action = process.argv[2] || '--build';
 
 if (['--build', '--watch'].indexOf(action) === -1) {
 	console.log('Invalid argument: ', action);
-	return;
+	process.exit();
 }
 
 if (action === '--build') {

frappe/core/doctype/communication/communication_list.js

@@ -9,7 +9,7 @@ frappe.listview_settings['Communication'] = {
 	filters: [["status", "=", "Open"]],
 
 	onload: function(list_view) {
-		method = "frappe.email.inbox.create_email_flag_queue"
+		var method = "frappe.email.inbox.create_email_flag_queue"
 
 		list_view.page.add_menu_item(__("Mark as Read"), function() {
 			list_view.call_for_selected_items(method, { action: "Read" })

frappe/core/doctype/doctype/boilerplate/controller_list.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 frappe.listview_settings['{doctype}'] = {{
 	add_fields: ["status"],
 	filters:[["status","=", "Open"]]

frappe/core/doctype/doctype/doctype.js

@@ -13,7 +13,7 @@
 
 frappe.ui.form.on('DocType', {
 	refresh: function(frm) {
-		if(frm.is_new() && (user !== "Administrator" || !frappe.boot.developer_mode)) {
+		if(frm.is_new() && (frappe.session.user !== "Administrator" || !frappe.boot.developer_mode)) {
 			frm.set_value("custom", 1);
 			frm.toggle_enable("custom", 0);
 		}

frappe/core/doctype/error_log/error_log_list.js

@@ -1,9 +1,9 @@
 frappe.listview_settings['Error Log'] = {
 	add_fields: ["seen"],
 	get_indicator: function(doc) {
-        if(cint(doc.seen)) {
+		if(cint(doc.seen)) {
 			return [__("Seen"), "green", "seen,=,1"];
-        } else {
+		} else {
 			return [__("Not Seen"), "red", "seen,=,0"];
 		}
 	},

frappe/core/doctype/error_snapshot/error_snapshot.js

@@ -1,9 +1,9 @@
 frappe.ui.form.on("Error Snapshot", "load", function(frm){
-    frm.set_read_only(true);
+	frm.set_read_only(true);
 });
 
 frappe.ui.form.on("Error Snapshot", "refresh", function(frm){
-    frm.set_df_property("view", "options", frappe.render_template("error_snapshot", {"doc": frm.doc}));
+	frm.set_df_property("view", "options", frappe.render_template("error_snapshot", {"doc": frm.doc}));
 
 	if (frm.doc.relapses) {
 		frm.add_custom_button(__('Show Relapses'), function() {

frappe/core/doctype/error_snapshot/error_snapshot_list.js

@@ -1,14 +1,14 @@
 frappe.listview_settings["Error Snapshot"] = {
-    add_fields: ["parent_error_snapshot", "relapses", "seen"],
-    filters:[
-        ["parent_error_snapshot","=",null],
-        ["seen", "=", false]
-    ],
-    get_indicator: function(doc){
-        if (doc.parent_error_snapshot && doc.parent_error_snapshot.length){
-            return [__("Relapsed"), !doc.seen ? "orange" : "blue", "parent_error_snapshot,!=,"];
-        } else {
-            return [__("First Level"), !doc.seen ? "red" : "green", "parent_error_snapshot,=,"];
-        }
-    }
+	add_fields: ["parent_error_snapshot", "relapses", "seen"],
+	filters:[
+		["parent_error_snapshot","=",null],
+		["seen", "=", false]
+	],
+	get_indicator: function(doc){
+		if (doc.parent_error_snapshot && doc.parent_error_snapshot.length){
+			return [__("Relapsed"), !doc.seen ? "orange" : "blue", "parent_error_snapshot,!=,"];
+		} else {
+			return [__("First Level"), !doc.seen ? "red" : "green", "parent_error_snapshot,=,"];
+		}
+	}
 }

frappe/core/doctype/feedback_request/feedback_request.js

@@ -3,7 +3,7 @@
 
 frappe.ui.form.on('Feedback Request', {
 	refresh: function(frm) {
-		rating_icons = frappe.render_template("rating_icons", {rating: frm.doc.rating, show_label: false});
+		var rating_icons = frappe.render_template("rating_icons", {rating: frm.doc.rating, show_label: false});
 		$(frm.fields_dict.feedback_rating.wrapper).html(rating_icons);
 
 		if(frm.doc.reference_doctype && frm.doc.reference_name) {

frappe/core/doctype/feedback_request/feedback_request_list.js

@@ -4,13 +4,13 @@ frappe.listview_settings['Feedback Request'] = {
 	},
 	column_render: {
 		rating: function(doc) {
-			html = ""
+			var html = ""
 			for (var i = 0; i < 5; i++) {
 				html += repl("<span class='indicator %(color)s'></span>", 
 					{color: i<doc.rating? "blue": "darkgrey"})
 			}
 
-			return html
+			return html;
 		}
 	}
 }

frappe/core/doctype/file/file_list.js

@@ -42,12 +42,12 @@ frappe.listview_settings['File'] = {
 		doclist.list_renderer.settings.setup_dragdrop(doclist);
 
 		doclist.$page.on("click", ".list-row-checkbox", function(event) {
-				doclist.list_renderer.settings.add_menu_item_copy(doclist);
+			doclist.list_renderer.settings.add_menu_item_copy(doclist);
 		})
 	},
 	list_view_doc:function(doclist){
-		$(doclist.wrapper).on("click", 'button[list_view_doc="'+doclist.doctype+'"]', function(){
-			dialog = frappe.ui.get_upload_dialog({
+		$(doclist.wrapper).on("click", 'button[list_view_doc="'+doclist.doctype+'"]', function() {
+			frappe.ui.get_upload_dialog({
 				"args": {
 					"folder": doclist.current_folder,
 					"from_form": 1
@@ -83,7 +83,7 @@ frappe.listview_settings['File'] = {
 
 		doclist.page.add_menu_item(__("Import .zip"), function() {
 			// make upload dialog
-			dialog = frappe.ui.get_upload_dialog({
+			frappe.ui.get_upload_dialog({
 				args: {
 					folder: doclist.current_folder,
 					from_form: 1
@@ -197,7 +197,7 @@ frappe.listview_settings['File'] = {
 	set_primary_action:function(doclist){
 		doclist.page.clear_primary_action();
 		doclist.page.set_primary_action(__("New"), function() {
-			dialog = frappe.ui.get_upload_dialog({
+			frappe.ui.get_upload_dialog({
 				"args": {
 					"folder": doclist.current_folder,
 					"from_form": 1

frappe/core/doctype/report/boilerplate/controller.js

@@ -1,5 +1,6 @@
 // Copyright (c) 2016, {app_publisher} and contributors
 // For license information, please see license.txt
+/* eslint-disable */
 
 frappe.query_reports["{name}"] = {{
 	"filters": [

frappe/core/doctype/role_permission_for_page_and_report/role_permission_for_page_and_report.js

@@ -39,8 +39,8 @@ frappe.ui.form.on('Role Permission for Page and Report', {
 	},
 
 	clear_fields: function(frm) {
-		field = (frm.doc.set_role_for == 'Report') ? 'page' : 'report';
-		frm.set_value(field, '')
+		var field = (frm.doc.set_role_for == 'Report') ? 'page' : 'report';
+		frm.set_value(field, '');
 	},
 
 	page: function(frm) {

frappe/core/doctype/system_settings/system_settings.js

@@ -14,9 +14,9 @@ frappe.ui.form.on("System Settings", "refresh", function(frm) {
 });
 
 frappe.ui.form.on("System Settings", "enable_password_policy", function(frm) {
-    if(frm.doc.enable_password_policy == 0){
-        frm.set_value("minimum_password_score", "");
-    }else{
-        frm.set_value("minimum_password_score", "2");
-    }
+	if(frm.doc.enable_password_policy == 0){
+		frm.set_value("minimum_password_score", "");
+	} else {
+		frm.set_value("minimum_password_score", "2");
+	}
 });

frappe/core/page/data_import_tool/data_import_tool.js

@@ -22,7 +22,7 @@ frappe.DataImportTool = Class.extend({
 		}
 
 		if(in_list(frappe.boot.user.can_import, doctype)) {
-				this.select.val(doctype).change();
+			this.select.val(doctype).change();
 		}
 
 		frappe.route_options = null;

frappe/core/page/desktop/desktop.js

@@ -74,16 +74,16 @@ $.extend(frappe.desktop, {
 		// TEMP: test activiation without this message.
 		return;
 
-		if(!frappe.user.has_role('System Manager')) {
-			return;
-		}
-
-		frappe.call({
-			method: 'frappe.core.page.desktop.desktop.get_help_messages',
-			callback: function(r) {
-				frappe.desktop.render_help_messages(r.message);
-			}
-		});
+		// if(!frappe.user.has_role('System Manager')) {
+		// 	return;
+		// }
+
+		// frappe.call({
+		// 	method: 'frappe.core.page.desktop.desktop.get_help_messages',
+		// 	callback: function(r) {
+		// 		frappe.desktop.render_help_messages(r.message);
+		// 	}
+		// });
 
 	},
 
@@ -91,7 +91,7 @@ $.extend(frappe.desktop, {
 		var wrapper = frappe.desktop.wrapper.find('.help-message-wrapper');
 		var $help_messages = wrapper.find('.help-messages');
 
-		set_current_message = function(idx) {
+		var set_current_message = function(idx) {
 			idx = cint(idx);
 			wrapper.current_message_idx = idx;
 			wrapper.find('.left-arrow, .right-arrow').addClass('disabled');
@@ -166,7 +166,7 @@ $.extend(frappe.desktop, {
 			}
 			return false;
 		} else {
-			module = frappe.get_module(parent.attr("data-name"));
+			var module = frappe.get_module(parent.attr("data-name"));
 			if (module && module.onclick) {
 				module.onclick();
 				return false;
@@ -181,7 +181,7 @@ $.extend(frappe.desktop, {
 
 		new Sortable($("#icon-grid").get(0), {
 			onUpdate: function(event) {
-				new_order = [];
+				var new_order = [];
 				$("#icon-grid .case-wrapper").each(function(i, e) {
 					new_order.push($(this).attr("data-name"));
 				});

frappe/core/page/permission_manager/permission_manager.js

@@ -380,7 +380,8 @@ frappe.PermissionEngine = Class.extend({
 							options:me.options.roles, reqd:1,fieldname:"role"},
 						{fieldtype:"Select", label:__("Permission Level"),
 							options:[0,1,2,3,4,5,6,7,8,9], reqd:1, fieldname: "permlevel",
-						description: __("Level 0 is for document level permissions, higher levels for field level permissions.")}
+							description: __("Level 0 is for document level permissions, \
+								higher levels for field level permissions.")}
 					]
 				});
 				if(me.get_doctype()) {
@@ -417,6 +418,7 @@ frappe.PermissionEngine = Class.extend({
 	},
 
 	show_user_permission_doctypes: function(d) {
+		var me = this;
 		if (!d.dialog) {
 			var fields = [];
 			for (var i=0, l=d.linked_doctypes.length; i<l; i++) {
@@ -478,7 +480,7 @@ frappe.PermissionEngine = Class.extend({
 						if(r.exc) {
 							frappe.msgprint(__("Did not set"));
 						} else {
-							var msg =	frappe.msgprint(__("Saved!"));
+							var msg = frappe.msgprint(__("Saved!"));
 							setTimeout(function() { msg.hide(); }, 3000);
 							d.user_permission_doctypes = user_permission_doctypes;
 							dialog.hide();

frappe/core/page/user_permissions/user_permissions.js

@@ -50,9 +50,9 @@ frappe.UserPermissions = Class.extend({
 		var me = this;
 
 		$(this.wrapper).find(".view-role-permissions").on("click", function() {
-				frappe.route_options = { doctype: me.get_doctype() || "" };
-				frappe.set_route("permission-manager");
-			})
+			frappe.route_options = { doctype: me.get_doctype() || "" };
+			frappe.set_route("permission-manager");
+		})
 
 		return frappe.call({
 			module:"frappe.core",
@@ -141,7 +141,7 @@ frappe.UserPermissions = Class.extend({
 				primary_action: function() {
 					var filedata = d.fields_dict.attach.get_value();
 					if(!filedata) {
-						frappe.msgprint(_("Please attach a file"));
+						frappe.msgprint(__("Please attach a file"));
 						return;
 					}
 					frappe.call({
@@ -250,9 +250,11 @@ frappe.UserPermissions = Class.extend({
 
 		$.each([[__("Allow User"), 150], [__("If Document Type"), 150], [__("Is"),150], ["", 50]],
 			function(i, col) {
-			$("<th>").html(col[0]).css("width", col[1]+"px")
-				.appendTo(me.table.find("thead tr"));
-		});
+				$("<th>")
+					.html(col[0])
+					.css("width", col[1]+"px")
+					.appendTo(me.table.find("thead tr"));
+			});
 
 
 		$.each(this.prop_list, function(i, d) {

frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.js

@@ -16,7 +16,7 @@ frappe.query_reports["Permitted Documents For User"] = {
 			"fieldtype": "Link",
 			"options": "DocType",
 			"reqd": 1,
-			"get_query": function() {
+			"get_query": function () {
 				return {
 					"query": "frappe.core.report.permitted_documents_for_user.permitted_documents_for_user.query_doctypes",
 					"filters": {
@@ -25,10 +25,10 @@ frappe.query_reports["Permitted Documents For User"] = {
 				}
 			}
 		},
- 		{
- 			"fieldname": "show_permissions",
- 			"label": __("Show Permissions"),
- 			"fieldtype": "Check"
- 		}
+		{
+			"fieldname": "show_permissions",
+			"label": __("Show Permissions"),
+			"fieldtype": "Check"
+		}
 	]
 }

frappe/custom/doctype/custom_field/custom_field.js

@@ -7,10 +7,10 @@
 frappe.ui.form.on('Custom Field', {
 	setup: function(frm) {
 		frm.set_query('dt', function(doc) {
-			filters = [
+			var filters = [
 				['DocType', 'issingle', '=', 0],
 			];
-			if(user!=="Administrator") {
+			if(frappe.session.user!=="Administrator") {
 				filters.push(['DocType', 'module', '!=', 'Core'])
 			}
 			return {
@@ -57,7 +57,7 @@ frappe.ui.form.on('Custom Field', {
 	fieldtype: function(frm) {
 		if(frm.doc.fieldtype == 'Link') {
 			frm.fields_dict['options_help'].disp_area.innerHTML =
-			  __('Name of the Document Type (DocType) you want this field to be linked to. e.g. Customer');
+				__('Name of the Document Type (DocType) you want this field to be linked to. e.g. Customer');
 		} else if(frm.doc.fieldtype == 'Select') {
 			frm.fields_dict['options_help'].disp_area.innerHTML =
 				__('Options for select. Each option on a new line.')+' '+__('e.g.:')+'<br>'+__('Option 1')+'<br>'+__('Option 2')+'<br>'+__('Option 3')+'<br>';

frappe/custom/doctype/customize_form/customize_form.js

@@ -14,8 +14,8 @@ frappe.ui.form.on("Customize Form", {
 					['DocType', 'issingle', '=', 0],
 					['DocType', 'custom', '=', 0],
 					['DocType', 'name', 'not in', 'DocType, DocField, DocPerm, User, Role, Has Role, \
-						 Page, Has Role, Module Def, Print Format, Report, Customize Form, \
-						 Customize Form Field']
+						Page, Has Role, Module Def, Print Format, Report, Customize Form, \
+						Customize Form Field']
 				]
 			};
 		});
@@ -262,7 +262,7 @@ frappe.customize_form.add_fields_help = function(frm) {
 					<td>\
 						Show field if a condition is met<br />\
 						Example: <code>eval:doc.status=='Cancelled'</code>\
-						 on a field like \"reason_for_cancellation\" will reveal \
+						on a field like \"reason_for_cancellation\" will reveal \
 						\"Reason for Cancellation\" only if the record is Cancelled.\
 					</td>\
 				</tr>\

frappe/desk/doctype/event/event.js

@@ -4,8 +4,8 @@
 frappe.ui.form.on("Event", {
 	onload: function(frm) {
 		frm.set_query("ref_type", function(txt) {
-	        return {
-	            "filters": {
+			return {
+				"filters": {
 					"issingle": 0,
 				}
 			};
@@ -20,8 +20,8 @@ frappe.ui.form.on("Event", {
 	},
 	repeat_on: function(frm) {
 		if(frm.doc.repeat_on==="Every Day") {
-			$.each(["monday", "tuesday", "wednesday", "thursday", "friday",
-				"saturday", "sunday"], function(i,v) {
+			["monday", "tuesday", "wednesday", "thursday",
+				"friday", "saturday", "sunday"].map(function(v) {
 					frm.set_value(v, 1);
 				});
 		}

frappe/desk/doctype/kanban_board/kanban_board.js

@@ -35,7 +35,7 @@ frappe.ui.form.on('Kanban Board', {
 		field.options && field.options.split('\n').forEach(function(o, i) {
 			o = o.trim();
 			if(!o) return;
-			d = frm.add_child('columns');
+			var d = frm.add_child('columns');
 			d.column_name = o;
 		});
 		frm.refresh();

frappe/desk/doctype/todo/todo.js

@@ -3,8 +3,8 @@
 frappe.ui.form.on("ToDo", {
 	onload: function(frm) {
 		frm.set_query("reference_type", function(txt) {
-	        return {
-	            "filters": {
+			return {
+				"filters": {
 					"issingle": 0,
 				}
 			};

frappe/desk/page/activity/activity.js

@@ -32,7 +32,7 @@ frappe.pages['activity'].on_page_load = function(wrapper) {
 			},
 			show_filters: true,
 			doctype: "Communication",
- 			get_args: function() {
+			get_args: function() {
 				if (frappe.route_options && frappe.route_options.show_likes) {
 					delete frappe.route_options.show_likes;
 					return {

frappe/desk/page/applications/applications.js

@@ -21,7 +21,7 @@ frappe.applications.Installer = Class.extend({
 				me.make_page();
 
 				// no apps
-				if(!keys(apps).length) {
+				if(!Object.keys(apps).length) {
 					me.wrapper.html('<div class="text-muted app-listing padding">' + __("No Apps Installed") + '</div>');
 					return;
 				}

frappe/desk/page/backups/backups.js

@@ -5,7 +5,7 @@ frappe.pages['backups'].on_page_load = function(wrapper) {
 		single_column: true
 	});
 
-  page.add_inner_button(__("Set Number of Backups"), function() {
+	page.add_inner_button(__("Set Number of Backups"), function () {
 		frappe.set_route('Form', 'System Settings');
 	});
 

frappe/desk/page/chat/chat.js

@@ -220,7 +220,7 @@ frappe.Chat = Class.extend({
 		if(data.owner==data.reference_name
 			&& data.communication_type!=="Notification"
 			&& data.comment_type!=="Bot") {
-				data.is_public = true;
+			data.is_public = true;
 		}
 
 		if(data.owner==data.reference_name && data.communication_type !== "Bot") {

frappe/desk/page/modules/modules.js

@@ -63,7 +63,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
 					module: module_name
 				},
 				callback: function(r) {
-					m = frappe.get_module(module_name);
+					var m = frappe.get_module(module_name);
 					m.data = r.message.data;
 					process_data(module_name, m.data);
 					page.section_data[module_name] = m;

frappe/desk/page/setup_wizard/setup_wizard.js

@@ -155,7 +155,7 @@ frappe.wiz.Wizard = Class.extend({
 				}, 2000);
 			},
 			error: function(r) {
-				var d = msgprint(__("There were errors."));
+				var d = frappe.msgprint(__("There were errors."));
 				d.custom_onhide = function() {
 					frappe.set_route(me.page_name, me.slides.length - 1);
 				};
@@ -229,14 +229,14 @@ frappe.wiz.WizardSlide = Class.extend({
 		}
 
 		this.$body = $(frappe.render_template("setup_wizard_page", {
-				help: __(this.help),
-				title:__(this.title),
-				main_title:__(this.wiz.title),
-				step: this.id + 1,
-				name: this.name,
-				css_class: this.css_class || "",
-				slides_count: this.wiz.slides.length
-			})).appendTo(this.$wrapper);
+			help: __(this.help),
+			title:__(this.title),
+			main_title:__(this.wiz.title),
+			step: this.id + 1,
+			name: this.name,
+			css_class: this.css_class || "",
+			slides_count: this.wiz.slides.length
+		})).appendTo(this.$wrapper);
 
 		this.body = this.$body.find(".form")[0];
 
@@ -314,7 +314,7 @@ frappe.wiz.WizardSlide = Class.extend({
 		//setup mousefree navigation
 		this.$body.on('keypress', function(e) {
 			if(e.which === 13) {
-				$target = $(e.target);
+				var $target = $(e.target);
 				if($target.hasClass('prev-btn')) {
 					me.prev();
 				} else if($target.hasClass('btn-attach')) {
@@ -469,7 +469,7 @@ function load_frappe_slides() {
 			var data = frappe.wiz.regional_data;
 
 			slide.get_input("country").empty()
-				.add_options([""].concat(keys(data.country_info).sort()));
+				.add_options([""].concat(Object.keys(data.country_info).sort()));
 
 
 			slide.get_input("currency").empty()
@@ -559,7 +559,7 @@ function load_frappe_slides() {
 		],
 		help: __('The first user will become the System Manager (you can change this later).'),
 		onload: function(slide) {
-			if(user!=="Administrator") {
+			if(frappe.session.user!=="Administrator") {
 				slide.form.fields_dict.password.$wrapper.toggle(false);
 				slide.form.fields_dict.email.$wrapper.toggle(false);
 				if(frappe.boot.user.first_name || frappe.boot.user.last_name) {
@@ -580,7 +580,7 @@ function load_frappe_slides() {
 		},
 		css_class: "single-column"
 	};
-};
+}
 
 frappe.wiz.on("before_load", function() {
 	load_frappe_slides();

frappe/email/doctype/auto_email_report/auto_email_report.js

@@ -62,7 +62,7 @@ frappe.ui.form.on('Auto Email Report', {
 			var table = $('<table class="table table-bordered" style="cursor:pointer; margin:0px;"><thead>\
 				<tr><th style="width: 50%">'+__('Filter')+'</th><th>'+__('Value')+'</th></tr>\
 				</thead><tbody></tbody></table>').appendTo(wrapper);
-				$('<p class="text-muted small">' + __("Click table to edit") + '</p>').appendTo(wrapper);
+			$('<p class="text-muted small">' + __("Click table to edit") + '</p>').appendTo(wrapper);
 
 			var filters = JSON.parse(frm.doc.filters || '{}');
 			var report_filters = frappe.query_reports[frm.doc.report].filters;

frappe/email/doctype/email_account/email_account.js

@@ -18,7 +18,6 @@ frappe.email_defaults = {
 		"use_imap": 1
 	},
 	"Sendgrid": {
-		"enable_outgoing": 0,
 		"enable_outgoing": 1,
 		"smtp_server": "smtp.sendgrid.net",
 		"smtp_port": 587,
@@ -71,7 +70,7 @@ frappe.ui.form.on("Email Account", {
 	service: function(frm) {
 		$.each(frappe.email_defaults[frm.doc.service], function(key, value) {
 			frm.set_value(key, value);
-		})
+		});
 		if (!frm.doc.use_imap) {
 			$.each(frappe.email_defaults_pop[frm.doc.service], function(key, value) {
 				frm.set_value(key, value);
@@ -94,7 +93,7 @@ frappe.ui.form.on("Email Account", {
 	},
 
 	enable_incoming: function(frm) {
-		frm.doc.no_remaining = null //perform full sync
+		frm.doc.no_remaining = null; //perform full sync
 		//frm.set_df_property("append_to", "reqd", frm.doc.enable_incoming);
 	},
 
@@ -114,8 +113,8 @@ frappe.ui.form.on("Email Account", {
 		frm.events.show_gmail_message_for_less_secure_apps(frm);
 
 		if(frappe.route_flags.delete_user_from_locals && frappe.route_flags.linked_user) {
-			delete frappe.route_flags.delete_user_from_locals
-			delete locals['User'][frappe.route_flags.linked_user]
+			delete frappe.route_flags.delete_user_from_locals;
+			delete locals['User'][frappe.route_flags.linked_user];
 		}
 	},
 
@@ -134,7 +133,7 @@ frappe.ui.form.on("Email Account", {
 
 	update_domain: function(frm){
 		if (!frm.doc.email_id && !frm.doc.service){
-			return
+			return;
 		}
 
 		frappe.call({
@@ -145,17 +144,17 @@ frappe.ui.form.on("Email Account", {
 			},
 			callback: function (r) {
 				if (r.message) {
-					frm.events.set_domain_fields(frm, r.message)
+					frm.events.set_domain_fields(frm, r.message);
 				} else {
-					frm.set_value("domain", "")
+					frm.set_value("domain", "");
 					frappe.confirm(__('Email Domain not configured for this account, Create one?'),
 						function () {
 							frappe.model.with_doctype("Email Domain", function() {
 								frappe.route_options = { email_id: frm.doc.email_id };
-								frappe.route_flags.return_to_email_account = 1
+								frappe.route_flags.return_to_email_account = 1;
 								var doc = frappe.model.get_new_doc("Email Domain");
 								frappe.set_route("Form", "Email Domain", doc.name);
-							})
+							});
 						}
 					);
 				}
@@ -165,26 +164,26 @@ frappe.ui.form.on("Email Account", {
 
 	set_domain_fields: function(frm, args) {
 		if(!args){
-			args = frappe.route_flags.set_domain_values? frappe.route_options: {}
+			args = frappe.route_flags.set_domain_values? frappe.route_options: {};
 		}
 
-		for(field in args) {
+		for(var field in args) {
 			frm.set_value(field, args[field]);
 		}
 
-		delete frappe.route_flags.set_domain_values
-		frappe.route_options = {}
+		delete frappe.route_flags.set_domain_values;
+		frappe.route_options = {};
 	},
 
 	email_sync_option: function(frm) {
 		// confirm if the ALL sync option is selected
 
 		if(frm.doc.email_sync_option == "ALL"){
-			msg = __("You are selecting Sync Option as ALL, It will resync all \
+			var msg = __("You are selecting Sync Option as ALL, It will resync all \
 				read as well as unread message from server. This may also cause the duplication\
-				of Communication (emails).")
+				of Communication (emails).");
 			frappe.confirm(msg, null, function() {
-				frm.set_value("email_sync_option", "UNSEEN")
+				frm.set_value("email_sync_option", "UNSEEN");
 			});
 		}
 	}

frappe/email/doctype/email_domain/email_domain.js

@@ -9,8 +9,8 @@ frappe.ui.form.on("Email Domain", {
 			frm.set_value("domain_name",frm.doc.email_id.split("@")[1])
 		}
 
-        if (frm.doc.__islocal != 1 && frappe.route_flags.return_to_email_account) {
-            var route = frappe.get_prev_route()
+		if (frm.doc.__islocal != 1 && frappe.route_flags.return_to_email_account) {
+			var route = frappe.get_prev_route();
 			delete frappe.route_flags.return_to_email_account;
 			frappe.route_flags.set_domain_values = true
 

frappe/email/doctype/email_group/email_group.js

@@ -10,7 +10,8 @@ frappe.ui.form.on("Email Group", "refresh", function(frm) {
 
 		frm.add_custom_button(__("Import Subscribers"), function() {
 			frappe.prompt({fieldtype:"Select", options: frm.doc.__onload.import_types,
-				label:__("Import Email From"), fieldname:"doctype", reqd:1}, function(data) {
+				label:__("Import Email From"), fieldname:"doctype", reqd:1},
+				function(data) {
 					frappe.call({
 						method: "frappe.email.doctype.email_group.email_group.import_from",
 						args: {
@@ -26,7 +27,8 @@ frappe.ui.form.on("Email Group", "refresh", function(frm) {
 
 		frm.add_custom_button(__("Add Subscribers"), function() {
 			frappe.prompt({fieldtype:"Text",
-				label:__("Email Addresses"), fieldname:"email_list", reqd:1}, function(data) {
+				label:__("Email Addresses"), fieldname:"email_list", reqd:1},
+				function(data) {
 					frappe.call({
 						method: "frappe.email.doctype.email_group.email_group.add_subscribers",
 						args: {

frappe/email/doctype/email_queue/email_queue_list.js

@@ -1,10 +1,10 @@
 frappe.listview_settings['Email Queue'] = {
 	get_indicator: function(doc) {
-		colour = {'Sent': 'green', 'Sending': 'blue', 'Not Sent': 'grey', 'Error': 'red', 'Expired': 'orange'};
+		var colour = {'Sent': 'green', 'Sending': 'blue', 'Not Sent': 'grey', 'Error': 'red', 'Expired': 'orange'};
 		return [__(doc.status), colour[doc.status], "status,=," + doc.status];
 	},
 	refresh: function(doclist){
-		if (has_common(roles, ["Administrator", "System Manager"])){
+		if (has_common(frappe.user_roles, ["Administrator", "System Manager"])){
 			if (cint(frappe.defaults.get_default("hold_queue"))){
 				doclist.page.clear_inner_toolbar()
 				doclist.page.add_inner_button(__("Resume Sending"), function() {

frappe/email/doctype/newsletter/newsletter.js

@@ -1,5 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
+/* globals erpnext */
 
 cur_frm.cscript.refresh = function(doc) {
 	if(window.erpnext) erpnext.toggle_naming_series();

frappe/printing/page/print_format_builder/print_format_builder.js

@@ -622,7 +622,7 @@ frappe.PrintFormatBuilder = Class.extend({
 			$.each(doc_fields, function(j, f) {
 				if (f && !in_list(column_names, f.fieldname)
 					&& !in_list(["Section Break", "Column Break"], f.fieldtype) && f.label) {
-						fields.push(f);
+					fields.push(f);
 				}
 			})
 			// render checkboxes
@@ -683,23 +683,23 @@ frappe.PrintFormatBuilder = Class.extend({
 	get_edit_html_dialog: function(title, label, $content) {
 		var me = this;
 		var d = new frappe.ui.Dialog({
-				title: title,
-				fields: [
-					{
-						fieldname: "content",
-						fieldtype: "Code",
-						label: label
-					},
-					{
-						fieldname: "help",
-						fieldtype: "HTML",
-						options: '<p>'
-							+ __("You can add dynamic properties from the document by using Jinja templating.")
-							+ __("For example: If you want to include the document ID, use {0}", ["<code>{{ doc.name }}</code>"])
-						+ '</p>'
-					}
-				]
-			});
+			title: title,
+			fields: [
+				{
+					fieldname: "content",
+					fieldtype: "Code",
+					label: label
+				},
+				{
+					fieldname: "help",
+					fieldtype: "HTML",
+					options: '<p>'
+						+ __("You can add dynamic properties from the document by using Jinja templating.")
+						+ __("For example: If you want to include the document ID, use {0}", ["<code>{{ doc.name }}</code>"])
+					+ '</p>'
+				}
+			]
+		});
 
 		// set existing content in input
 		var content = $content.data('content') || "";
@@ -791,4 +791,4 @@ frappe.PrintFormatBuilder = Class.extend({
 			}
 		});
 	}
- });
+});

frappe/public/js/frappe/form/grid.js

@@ -435,14 +435,14 @@ frappe.ui.form.Grid = Class.extend({
 				else {
 					var colsize = 2;
 					switch(df.fieldtype) {
-					case "Text":
-					case "Small Text": colsize = 3; break;
-					case"Check": colsize = 1
+						case "Text":
+						case "Small Text": colsize = 3; break;
+						case"Check": colsize = 1;
 					}
-					df.colsize = colsize
+					df.colsize = colsize;
 				}
 
-				total_colsize += df.colsize
+				total_colsize += df.colsize;
 				if(total_colsize > 11)
 					return false;
 				this.visible_columns.push([df, df.colsize]);

frappe/public/js/frappe/misc/utils.js

@@ -462,7 +462,7 @@ frappe.utils = {
 
 		// Keep looping over the regular expression matches
 		// until we can no longer find a match.
-		while (arrMatches = objPattern.exec( strData )){
+		while ((arrMatches = objPattern.exec( strData ))){
 
 			// Get the delimiter that was found.
 			var strMatchedDelimiter = arrMatches[ 1 ];

frappe/public/js/frappe/model/create_new.js

@@ -335,7 +335,4 @@ frappe.new_doc = function (doctype, opts) {
 	});
 }
 
-// globals for backward compatibility
-window.new_doc = frappe.new_doc;
-
 

frappe/public/js/frappe/ui/filters/filters.js

@@ -856,14 +856,14 @@ frappe.ui.FieldSelect = Class.extend({
 			var label = __(df.label) + ' (' + __(df.parent) + ')';
 			var table = df.parent;
 		}
-		if(frappe.model.no_value_type.indexOf(df.fieldtype)==-1 &&
+		if(frappe.model.no_value_type.indexOf(df.fieldtype) == -1 &&
 			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) {
-				this.options.push({
-					label: label,
-					value: table + "." + df.fieldname,
-					fieldname: df.fieldname,
-					doctype: df.parent
-				})
+			this.options.push({
+				label: label,
+				value: table + "." + df.fieldname,
+				fieldname: df.fieldname,
+				doctype: df.parent
+			});
 			if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {};
 			me.fields_by_name[df.parent][df.fieldname] = df;
 		}

frappe/public/js/frappe/ui/toolbar/search_utils.js

@@ -533,7 +533,6 @@ frappe.search.utils = {
 
 	bolden_match_part: function(str, subseq) {
 		var rendered = "";
-<<<<<<< HEAD
 		if(this.fuzzy_search(subseq, str) === 0) {
 			return str;
 		} else if(this.fuzzy_search(subseq, str) > 6) {
@@ -569,45 +568,3 @@ frappe.search.utils = {
 
 	},
 }
-=======
-		if(this.fuzzy_search(subseq, str) === 0) {
-			return str;
-		} else if(this.fuzzy_search(subseq, str) > 6) {
-			var regEx = new RegExp("("+ subseq +")", "ig");
-			return str.replace(regEx, '<b>$1</b>');
-		} else {
-			var str_orig = str;
-			var str = str.toLowerCase();
-			var str_len = str.length;
-			var subseq = subseq.toLowerCase();
-
-			outer: for(var i = 0, j = 0; i < subseq.length; i++) {
-				var sub_ch = subseq.charCodeAt(i);
-				while(j < str_len) {
-					if(str.charCodeAt(j) === sub_ch) {
-						var str_char = str_orig.charAt(j);
-						if(str_char === str_char.toLowerCase()) {
-							rendered += '<b>' + subseq.charAt(i) + '</b>';
-						} else {
-							rendered += '<b>' + subseq.charAt(i).toUpperCase() + '</b>';
-						}
-						j++;
-						continue outer;
-					}
-					rendered += str_orig.charAt(j);
-					j++;
-				}
-				return str_orig;
-			}
-			rendered += str_orig.slice(j);
-			return rendered;
-		}
-
-	},
-
-	unscrub_and_titlecase: function(str) {
-		return __(str || '').replace(/-|_/g, " ").replace(/\w*/g,
-			function(keywords){return keywords.charAt(0).toUpperCase() + keywords.substr(1).toLowerCase();});
-	},
-}
->>>>>>> Remove all implicit global variables

frappe/public/js/frappe/views/kanban/kanban_view.js

@@ -71,7 +71,7 @@ frappe.views.KanbanView = frappe.views.ListRenderer.extend({
 		return frappe.render_template('list_item_row_head', { main: '', list: this });
 	},
 	required_libs: [
-		'assets/frappe/js/frappe/views/kanban/fluxify.min.js',
+		'assets/frappe/js/lib/fluxify.min.js',
 		'assets/frappe/js/frappe/views/kanban/kanban_board.js'
 	]
 });

frappe/public/js/legacy/layout.js

@@ -43,6 +43,7 @@ Layout.prototype.addcell = function(width) {
 	return this.cur_row.addCell(width);
 }
 
+// eslint-disable-next-line
 Layout.prototype.setcolour = function(col) { $bg(cc,col); }
 
 Layout.prototype.show = function() { $(this.wrapper).toggle(false); }

frappe/public/js/legacy/print_table.js

@@ -192,7 +192,7 @@ frappe.printTable = Class.extend({
 	},
 })
 
-function print_table(dt, dn, fieldname, tabletype, cols, head_labels, widths, condition, cssClass, modifier) {
+window.print_table = function print_table(dt, dn, fieldname, tabletype, cols, head_labels, widths, condition, cssClass, modifier) {
 	return new frappe.printTable({
 		doctype: dt,
 		docname: dn,

frappe/templates/includes/contact.js

@@ -14,10 +14,10 @@ frappe.ready(function() {
 		}
 
 		if(!validate_email(email)) {
-				frappe.msgprint(__("You seem to have written your name instead of your email. \
-					Please enter a valid email address so that we can get back."));
-				$('[name="email"]').focus();
-				return false;
+			frappe.msgprint(__("You seem to have written your name instead of your email. \
+				Please enter a valid email address so that we can get back."));
+			$('[name="email"]').focus();
+			return false;
 		}
 
 		$("#contact-alert").toggle(false);
@@ -35,7 +35,7 @@ frappe.ready(function() {
 				$(':input').val('');
 			}
 		}, this);
-	return false;
+		return false;
 	});
 
 });

frappe/website/doctype/web_form/web_form.js

@@ -1,80 +1,80 @@
 frappe.web_form = {
-    set_fieldname_select: function(frm) {
-        var me = this,
-            doc = frm.doc;
-        if (doc.doc_type) {
-            frappe.model.with_doctype(doc.doc_type, function() {
-                var fields = $.map(frappe.get_doc("DocType", frm.doc.doc_type).fields, function(d) {
-                    if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1 ||
-                        d.fieldtype === 'Table') {
-                        return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname }
-                    } else {
-                        return null;
-                    }
-                })
-                var currency_fields = $.map(frappe.get_doc("DocType", frm.doc.doc_type).fields, function(d) {
-                    if (d.fieldtype === 'Currency' || d.fieldtype === 'Float') {
-                        return { label: d.label, value: d.fieldname }
-                    } else {
-                        return null;
-                    }
-                })
-                frappe.meta.get_docfield("Web Form Field", "fieldname", frm.doc.name).options = [""].concat(fields);
-                frappe.meta.get_docfield("Web Form", "amount_field", frm.doc.name).options = [""].concat(currency_fields);
-                frm.refresh_field("amount_field");
-            });
-        }
-    }
+	set_fieldname_select: function(frm) {
+		var me = this,
+			doc = frm.doc;
+		if (doc.doc_type) {
+			frappe.model.with_doctype(doc.doc_type, function() {
+				var fields = $.map(frappe.get_doc("DocType", frm.doc.doc_type).fields, function(d) {
+					if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1 ||
+						d.fieldtype === 'Table') {
+						return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname }
+					} else {
+						return null;
+					}
+				})
+				var currency_fields = $.map(frappe.get_doc("DocType", frm.doc.doc_type).fields, function(d) {
+					if (d.fieldtype === 'Currency' || d.fieldtype === 'Float') {
+						return { label: d.label, value: d.fieldname }
+					} else {
+						return null;
+					}
+				})
+				frappe.meta.get_docfield("Web Form Field", "fieldname", frm.doc.name).options = [""].concat(fields);
+				frappe.meta.get_docfield("Web Form", "amount_field", frm.doc.name).options = [""].concat(currency_fields);
+				frm.refresh_field("amount_field");
+			});
+		}
+	}
 }
 
 frappe.ui.form.on("Web Form", {
-    refresh: function(frm) {
-        // show is-standard only if developer mode
-        frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
+	refresh: function(frm) {
+		// show is-standard only if developer mode
+		frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
 
-        frappe.web_form.set_fieldname_select(frm);
+		frappe.web_form.set_fieldname_select(frm);
 
-        if (frm.doc.is_standard && !frappe.boot.developer_mode) {
-            frm.set_read_only();
-            frm.disable_save();
-        }
-    },
+		if (frm.doc.is_standard && !frappe.boot.developer_mode) {
+			frm.set_read_only();
+			frm.disable_save();
+		}
+	},
 
-    title: function(frm) {
-        if (frm.doc.__islocal) {
-            var page_name = frm.doc.title.toLowerCase().replace(/ /g, "-");
-            frm.set_value("route", page_name);
-            frm.set_value("success_url", "/" + page_name);
-        }
-    },
+	title: function(frm) {
+		if (frm.doc.__islocal) {
+			var page_name = frm.doc.title.toLowerCase().replace(/ /g, "-");
+			frm.set_value("route", page_name);
+			frm.set_value("success_url", "/" + page_name);
+		}
+	},
 
-    doc_type: function(frm) {
-        frappe.web_form.set_fieldname_select(frm);
-    }
+	doc_type: function(frm) {
+		frappe.web_form.set_fieldname_select(frm);
+	}
 });
 
 
 frappe.ui.form.on("Web Form Field", {
-    fieldtype: function(frm, doctype, name) {
-        var doc = frappe.get_doc(doctype, name);
-        if (fieldtype === 'Section Break' || fieldtype === 'Section Break') {
-            doc.fieldname = '';
-            frm.refresh_field("web_form_fields");
-        }
-    },
-    fieldname: function(frm, doctype, name) {
-        var doc = frappe.get_doc(doctype, name);
-        var df = $.map(frappe.get_doc("DocType", frm.doc.doc_type).fields, function(d) {
-            return doc.fieldname == d.fieldname ? d : null;
-        })[0];
+	fieldtype: function(frm, doctype, name) {
+		var doc = frappe.get_doc(doctype, name);
+		if (['Section Break', 'Column Break', 'Page Break'].includes(doc.fieldtype)) {
+			doc.fieldname = '';
+			frm.refresh_field("web_form_fields");
+		}
+	},
+	fieldname: function(frm, doctype, name) {
+		var doc = frappe.get_doc(doctype, name);
+		var df = $.map(frappe.get_doc("DocType", frm.doc.doc_type).fields, function(d) {
+			return doc.fieldname == d.fieldname ? d : null;
+		})[0];
 
-        doc.label = df.label;
-        doc.reqd = df.reqd;
-        doc.options = df.options;
-        doc.fieldtype = frappe.meta.get_docfield("Web Form Field", "fieldtype")
-            .options.split("\n").indexOf(df.fieldtype) === -1 ? "Data" : df.fieldtype;
-        doc.description = df.description;
-        doc["default"] = df["default"];
+		doc.label = df.label;
+		doc.reqd = df.reqd;
+		doc.options = df.options;
+		doc.fieldtype = frappe.meta.get_docfield("Web Form Field", "fieldtype")
+			.options.split("\n").indexOf(df.fieldtype) === -1 ? "Data" : df.fieldtype;
+		doc.description = df.description;
+		doc["default"] = df["default"];
 
-    }
+	}
 });

frappe/website/doctype/website_theme/website_theme.js

@@ -1,7 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
-
-
+/* globals jscolor */
 frappe.provide("frappe.website_theme");
 $.extend(frappe.website_theme, {
 	color_variables: ["background_color", "top_bar_color", "top_bar_text_color",

frappe/website/js/web_form.js

@@ -17,7 +17,7 @@ frappe.ready(function() {
 			var reader = new FileReader();
 
 			if(input.files.length) {
-				file = input.files[0];
+				var file = input.files[0];
 				frappe.file_reading = true;
 				reader.onload = function(e) {
 					input.filedata = {
@@ -35,8 +35,7 @@ frappe.ready(function() {
 						// clear attachment
 						$(input).val('');
 						$(input).attr('data-value', '');
-
-					};
+					}
 					frappe.file_reading = false;
 				}
 
@@ -61,7 +60,7 @@ frappe.ready(function() {
 		var maxlength = parseInt($(this).attr('maxlength'));
 		if(maxlength && (($(this).val() || '') + '').length > maxlength-1) {
 			$(this).val($(this).val().substr(0, maxlength-1));
-		};
+		}
 	}).each(function() { set_mandatory_class(this); });
 
 	// if changed, set dirty flag
@@ -104,7 +103,7 @@ frappe.ready(function() {
 		return false;
 	});
 
-	show_slide = function(idx) {
+	var show_slide = function(idx) {
 		// hide all sections
 		$('.web-form-page').addClass('hidden');
 
@@ -175,7 +174,7 @@ frappe.ready(function() {
 
 					// check if child table has value
 					var has_value = false;
-					for(key in d) {
+					for(var key in d) {
 						if(typeof d[key]==='string') {
 							d[key] = d[key].trim();
 						}
@@ -286,9 +285,9 @@ frappe.ready(function() {
 						$(".comments, .introduction, .page-head").addClass("hide");
 						scroll(0, 0);
 						set_message(frappe.success_link, true);
-                    } else {
+					} else {
 						set_message(__('Saved'));
-				    }
+					}
 
 					if(frappe.is_new && frappe.login_required) {
 						// reload page (with ID)
@@ -298,13 +297,13 @@ frappe.ready(function() {
 						// redirect to payment
 						window.location.href = data.message;
 					}
-			    } else {
+				} else {
 					frappe.msgprint(__('There were errors. Please report this.'));
-			    }
-		    },
-            always: function() {
-                window.saving = false;
-            }
+				}
+			},
+			always: function() {
+				window.saving = false;
+			}
 		});
 		return true;
 	}

frappe/website/js/website.js

@@ -159,12 +159,9 @@ $.extend(frappe, {
 			.html('<div class="content"><i class="'+icon+' text-muted"></i><br>'
 				+text+'</div>').appendTo(document.body);
 	},
-	hide_message: function(text) {
-		$('.message-overlay').remove();
-	},
 	get_sid: function() {
 		var sid = getCookie("sid");
-		return sid && sid!=="Guest";
+		return sid && sid !== "Guest";
 	},
 	get_modal: function(title, body_html) {
 		var modal = $('<div class="modal" style="overflow: auto;" tabindex="-1">\
@@ -366,7 +363,7 @@ function ask_to_login() {
 // check if logged in?
 $(document).ready(function() {
 	window.full_name = getCookie("full_name");
-	window.logged_in = getCookie("sid") && getCookie("sid")!=="Guest";
+	var logged_in = getCookie("sid") && getCookie("sid") !== "Guest";
 	$("#website-login").toggleClass("hide", logged_in ? true : false);
 	$("#website-post-login").toggleClass("hide", logged_in ? false : true);
 	$(".logged-in").toggleClass("hide", logged_in ? false : true);

socketio.js

@@ -11,13 +11,13 @@ var flags = {};
 var subscriber = redis.createClient(conf.redis_socketio || conf.redis_async_broker_port);
 
 // serve socketio
-http.listen(conf.socketio_port, function(){
-  console.log('listening on *:', conf.socketio_port);
+http.listen(conf.socketio_port, function() {
+  console.log('listening on *:', conf.socketio_port); //eslint-disable-line
 });
 
 // test route
-app.get('/', function(req, res){
-  res.sendfile('index.html');
+app.get('/', function(req, res) {
+	res.sendfile('index.html');
 });
 
 // on socket connection
@@ -199,8 +199,8 @@ function get_site_name(socket) {
 function get_hostname(url) {
 	if (!url) return undefined;
 	if (url.indexOf("://") > -1) {
-        url = url.split('/')[2];
-    }
+		url = url.split('/')[2];
+	}
 	return ( url.match(/:/g) ) ? url.slice( 0, url.indexOf(":") ) : url
 }