From 44dfe4c23716c98c06bde1f5ada4a405041d52d4 Mon Sep 17 00:00:00 2001
From: Felix Hammerl <fhammerl@thoughtworks.com>
Date: Wed, 24 Feb 2016 10:54:11 +0100
Subject: Clean up jshintrc

---
 web-ui/.jshintrc                                          | 15 ++++++++-------
 web-ui/app/js/helpers/contenttype.js                      |  2 ++
 web-ui/test/spec/mail_view/ui/draft_box.spec.js           |  2 --
 web-ui/test/spec/mail_view/ui/draft_save_status.spec.js   |  2 --
 .../test/spec/mail_view/ui/recipients/recipients.spec.js  |  2 --
 .../mail_view/ui/recipients/recipients_iterator.spec.js   |  2 --
 web-ui/test/spec/mail_view/ui/send_button.spec.js         |  2 --
 web-ui/test/spec/page/router/url_params.spec.js           |  2 --
 web-ui/test/spec/tags/data/tags.spec.js                   |  2 --
 web-ui/test/spec/user_alerts/ui/user_alerts.spec.js       |  2 --
 10 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/web-ui/.jshintrc b/web-ui/.jshintrc
index 220aedfe..1e2a147d 100644
--- a/web-ui/.jshintrc
+++ b/web-ui/.jshintrc
@@ -1,29 +1,30 @@
 {
-  "node": true,
   "browser": true,
   "esnext": true,
   "bitwise": true,
-  "camelcase": false,
-  "curly": false,
+  "curly": true,
   "loopfunc": true,
   "eqeqeq": true,
   "immed": true,
   "indent": 2,
-  "latedef": false,
   "newcap": true,
   "noarg": true,
-  "quotmark": "single",
   "regexp": true,
   "smarttabs": true,
-  "strict": "function",
+  "strict": true,
   "trailing": true,
-  "undef": false,
+  "undef": true,
   "validthis": true,
   "jasmine": true,
+  "node": false,
+  "latedef": false,
   "predef": [
+    "require",
+    "console",
     "$",
     "jQuery",
     "define",
+    "Foundation",
     "describeComponent",
     "describeMixin",
     "requirejs",
diff --git a/web-ui/app/js/helpers/contenttype.js b/web-ui/app/js/helpers/contenttype.js
index 92b456e9..a1e5361a 100644
--- a/web-ui/app/js/helpers/contenttype.js
+++ b/web-ui/app/js/helpers/contenttype.js
@@ -14,6 +14,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
  */
+
+/* jshint curly: false */
 define([], function () {
   'use strict';
   var exports = {};
diff --git a/web-ui/test/spec/mail_view/ui/draft_box.spec.js b/web-ui/test/spec/mail_view/ui/draft_box.spec.js
index f095f5e5..921767ba 100644
--- a/web-ui/test/spec/mail_view/ui/draft_box.spec.js
+++ b/web-ui/test/spec/mail_view/ui/draft_box.spec.js
@@ -1,5 +1,3 @@
-/* global Pixelated */
-
 describeComponent('mail_view/ui/draft_box', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_view/ui/draft_save_status.spec.js b/web-ui/test/spec/mail_view/ui/draft_save_status.spec.js
index 0e428066..0db823d9 100644
--- a/web-ui/test/spec/mail_view/ui/draft_save_status.spec.js
+++ b/web-ui/test/spec/mail_view/ui/draft_save_status.spec.js
@@ -1,5 +1,3 @@
-/* global Pixelated */
-
 describeComponent('mail_view/ui/draft_save_status', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_view/ui/recipients/recipients.spec.js b/web-ui/test/spec/mail_view/ui/recipients/recipients.spec.js
index a3b3381f..5bca73fe 100644
--- a/web-ui/test/spec/mail_view/ui/recipients/recipients.spec.js
+++ b/web-ui/test/spec/mail_view/ui/recipients/recipients.spec.js
@@ -1,5 +1,3 @@
-/* global Pixelated */
-
 describeComponent('mail_view/ui/recipients/recipients',function () {
   'use strict';
   var recipientsUpdatedEvent;
diff --git a/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js b/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js
index 51f18db3..db240379 100644
--- a/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js
+++ b/web-ui/test/spec/mail_view/ui/recipients/recipients_iterator.spec.js
@@ -1,5 +1,3 @@
-/* global Pixelated */
-
 define(['mail_view/ui/recipients/recipients_iterator'], function (RecipientsIterator) {
   'use strict';
 
diff --git a/web-ui/test/spec/mail_view/ui/send_button.spec.js b/web-ui/test/spec/mail_view/ui/send_button.spec.js
index 351b4a08..480fe7a8 100644
--- a/web-ui/test/spec/mail_view/ui/send_button.spec.js
+++ b/web-ui/test/spec/mail_view/ui/send_button.spec.js
@@ -1,5 +1,3 @@
-/* global Pixelated */
-
 describeComponent('mail_view/ui/send_button', function () {
 
   'use strict';
diff --git a/web-ui/test/spec/page/router/url_params.spec.js b/web-ui/test/spec/page/router/url_params.spec.js
index 24cc3797..3c550a43 100644
--- a/web-ui/test/spec/page/router/url_params.spec.js
+++ b/web-ui/test/spec/page/router/url_params.spec.js
@@ -1,5 +1,3 @@
-/* global jasmine */
-
 require(['page/router/url_params'], function (urlParams) {
   'use strict';
 
diff --git a/web-ui/test/spec/tags/data/tags.spec.js b/web-ui/test/spec/tags/data/tags.spec.js
index 7c4cd4e0..6760b7ac 100644
--- a/web-ui/test/spec/tags/data/tags.spec.js
+++ b/web-ui/test/spec/tags/data/tags.spec.js
@@ -1,5 +1,3 @@
-/* global Pixelated */
-
 describeComponent('tags/data/tags', function () {
   'use strict';
 
diff --git a/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js b/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js
index 5d87795a..bde3b7fa 100644
--- a/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js
+++ b/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js
@@ -1,5 +1,3 @@
-/* global Pixelated */
-
 describeComponent('user_alerts/ui/user_alerts', function () {
   'use strict';
 
-- 
cgit v1.2.3