From 559e525ffde3b26cf6b821829054a7b32ce8f562 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Fri, 16 Oct 2015 10:31:06 +0100
Subject: [PATCH] Bug 1210774 - Upgrade Loop's use of eslint (to 1.6.x) and
 eslint-plugin-react (to 3.5.x). r=Mardak NPOTB DONTBUILD

---
 browser/components/loop/.eslintrc               | 2 +-
 browser/components/loop/standalone/package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/components/loop/.eslintrc b/browser/components/loop/.eslintrc
index ce0cfdfb8c4b..e3e50b4fd8ce 100644
--- a/browser/components/loop/.eslintrc
+++ b/browser/components/loop/.eslintrc
@@ -44,6 +44,7 @@
     "dot-location": [2, "property"],
     "eol-last": 2,
     "eqeqeq": [2, "smart"],
+    "jsx-quotes": [2, "prefer-double"],
     "key-spacing": [2, {"beforeColon": false, "afterColon": true }],
     "linebreak-style": [2, "unix"],
     "new-cap": 0,                 // TODO: set to 2
@@ -106,7 +107,6 @@
     "yoda": [2, "never"],
     // eslint-plugin-react rules. These are documented at
     // <https://github.com/yannickcr/eslint-plugin-react#list-of-supported-rules>
-    "react/jsx-quotes": [2, "double", "avoid-escape"],
     "react/jsx-no-undef": 2,
     "react/jsx-sort-props": 2,
     "react/jsx-sort-prop-types": 2,
diff --git a/browser/components/loop/standalone/package.json b/browser/components/loop/standalone/package.json
index 71eb1ced26fe..75735f32e2ea 100644
--- a/browser/components/loop/standalone/package.json
+++ b/browser/components/loop/standalone/package.json
@@ -13,9 +13,9 @@
   "dependencies": {},
   "devDependencies": {
     "compression": "1.5.x",
-    "eslint": "1.2.x",
+    "eslint": "1.6.x",
     "eslint-plugin-mozilla": "../../../../testing/eslint-plugin-mozilla",
-    "eslint-plugin-react": "3.2.x",
+    "eslint-plugin-react": "3.5.x",
     "exports-loader": "0.6.x",
     "express": "4.x",
     "imports-loader": "0.6.x",