From 7f5df182bbc44ef35453929664a4a4641a715b71 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Sat, 13 Apr 2013 08:47:00 +0200
Subject: [PATCH] JSHint: Re-order jshintrc options to split common from
 project settings

There are certain options required by our coding conventions.
The others are specifically overriding it for core. Either
because we have certain code that needs laxing or because we
can be stricter.

Comments can be used in jshintrc since a while now. Though
they are invalid JSON, many parsers (including JSHint) allow
them for documentation purposes.

Change-Id: I43ace21208121e866900b2cbe1efbcebadd2946a
---
 .jshintrc | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 7fa138d44f..c4e265a4de 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,15 +1,10 @@
 {
-	"predef": [
-		"mediaWiki",
-		"jQuery",
-		"QUnit"
-	],
+	/* Common */
 
-	"bitwise": true,
+	// Enforcing
 	"camelcase": true,
 	"curly": true,
 	"eqeqeq": true,
-	"forin": false,
 	"immed": true,
 	"latedef": true,
 	"newcap": true,
@@ -17,18 +12,31 @@
 	"noempty": true,
 	"nonew": true,
 	"quotmark": "single",
-	"regexp": false,
+	"trailing": true,
 	"undef": true,
 	"unused": true,
-	"strict": false,
-	"trailing": true,
+	// Legacy
+	"onevar": true,
+
+	/* Local */
 
+	// Enforcing
+	"bitwise": true,
+	"forin": false,
+	"regexp": false,
+	"strict": false,
+	// Relaxing
 	"laxbreak": true,
 	"smarttabs": true,
 	"multistr": true,
-
+	// Environment
 	"browser": true,
-
+	// Legacy
 	"nomen": true,
-	"onevar": true
+
+	"predef": [
+		"mediaWiki",
+		"jQuery",
+		"QUnit"
+	]
 }
-- 
2.20.1