From 678803199467d49a1a9dcfd59b8d57ea2d99faa2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 18 Jul 2013 13:09:08 +0400
Subject: [PATCH] allow moz and es6 settings to work together

---
 lib/ace/mode/javascript/jshint.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/ace/mode/javascript/jshint.js b/lib/ace/mode/javascript/jshint.js
index ca9a1b5a..dad4644e 100644
--- a/lib/ace/mode/javascript/jshint.js
+++ b/lib/ace/mode/javascript/jshint.js
@@ -1444,9 +1444,6 @@ var JSHINT = (function () {
 	}
 
 	function assume() {
-		if (state.option.es5) {
-			warning("I003");
-		}
 		if (state.option.couch) {
 			combine(predefined, vars.couch);
 		}
@@ -1514,16 +1511,10 @@ var JSHINT = (function () {
 		// Let's assume that chronologically ES3 < ES5 < ES6/ESNext < Moz
 
 		state.option.inMoz = function (strict) {
-			if (strict) {
-				return state.option.moz && !state.option.esnext;
-			}
 			return state.option.moz;
 		};
 
 		state.option.inESNext = function (strict) {
-			if (strict) {
-				return !state.option.moz && state.option.esnext;
-			}
 			return state.option.moz || state.option.esnext;
 		};