JSCS Fixes

24 files changed, 152 insertions, 164 deletions

diff --git a/.jscsrc b/.jscsrc
index c4fdf715c..076dcb857 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -3,7 +3,7 @@
     "fileExtensions": [".js", "jscs"],
 
     "requireParenthesesAroundIIFE": true,
-    "disallowMultipleVarDecl": false,
+    "disallowMultipleVarDecl": "strict",
     "maximumLineLength": 120,
     "validateLineBreaks": "LF",
     "validateIndentation": "\t",
@@ -11,7 +11,7 @@
     "disallowKeywords": ["with"],
     "disallowSpacesInsideObjectBrackets": null,
     "disallowImplicitTypeConversion": ["string"],
-
+    "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
     "safeContextKeyword": "_this",
 
     "excludeFiles": [
@@ -19,24 +19,7 @@
         "vendor/",
         ".git/",
         "l10n/",
-        "js/backbone.js",
-        "js/handlebars-v1.3.0.js",
-        "js/backbone.marionette.js",
-        "js/jquery.autosize.js",
-        "js/jquery.storageapi.js",
-        "js/jquery-visibility.js"
-    ],
+        "js/vendor/"
+    ]
 
-    "jsDoc": {
-        "checkAnnotations": "jsdoc3",
-        "checkParamNames": true,
-        "requireParamTypes": true,
-        "checkRedundantParams": true,
-        "checkReturnTypes": true,
-        "checkRedundantReturns": true,
-        "requireReturnTypes": true,
-        "checkTypes": "capitalizedNativeCase",
-        "checkRedundantAccess": true,
-        "requireNewlineAfterDescription": true
-    }
 }
diff --git a/.travis.yml b/.travis.yml
index d02da97c9..7a195c1b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,8 @@ before_install:
 before_script:
   - cd apps/mail
   - npm install --deps
-  - cd js
-  - npm install --deps
+  - npm run-script bower_deps
+  - ./node_modules/.bin/grunt
   - cd ..
 
 script:
diff --git a/Gruntfile.js b/Gruntfile.js
index 6671fcc11..89497d9c2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,19 +9,23 @@
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @copyright Christoph Wurst 2015
  */
-module.exports = function (grunt) {
+module.exports = function(grunt) {
 	// Project configuration.
 	grunt.initConfig({
+		jshint: {
+			options: {
+				jshintrc: '.jshintrc'
+			},
+			all: ['Gruntfile.js', 'js/*.js', 'js/models/*.js', 'js/views/*.js']
+		},
 		jscs: {
-        		src: 'js/*.js',
+			src: '<%= jshint.all %>',
 			options: {
 				config: '.jscsrc',
 				verbose: true
 			}
-		},
-		jshint: {
-			jshintrc: '.jshintrc'
 		}
+
 	});
 
 	// jscs
diff --git a/js/communication.js b/js/communication.js
index 3ec75aff2..b9e6ec6c0 100644
--- a/js/communication.js
+++ b/js/communication.js
@@ -11,8 +11,8 @@
 define(function(require) {
 	'use strict';
 
-	var $ = require('jquery'),
-		OC = require('OC');
+	var $ = require('jquery');
+	var OC = require('OC');
 
 	return (function() {
 		var messageListXhr = null;
@@ -22,8 +22,8 @@ define(function(require) {
 				ttl: 60000,
 				cache: true,
 				key: url
-			},
-			allOptions = options || {};
+			};
+			var allOptions = options || {};
 			_.defaults(allOptions, defaultOptions);
 
 			// don't cache for the time being
diff --git a/js/init.js b/js/init.js
index 9c38e1765..effc3770d 100644
--- a/js/init.js
+++ b/js/init.js
@@ -13,8 +13,8 @@
 define(function(require) {
 	'use strict';
 
-	var document = require('domready'),
-		Mail = require('app');
+	var document = require('domready');
+	var Mail = require('app');
 
 	Mail.UI.initializeInterface();
 
@@ -157,7 +157,8 @@ define(function(require) {
 			 * Prepare the new message body content for future processing.
 			 */
 			if (MessageBody.val()) {
-				var OldMessageBody, NewMessageBody = MessageBody.val();
+				var OldMessageBody = MessageBody.val();
+				var NewMessageBody = MessageBody.val();
 				if (NewMessageBody !== OldMessageBody) {
 					MessageBody.trigger('autosize.resize');
 					OldMessageBody = NewMessageBody;
@@ -207,8 +208,8 @@ define(function(require) {
 			switch (key) {
 				// If delete key is pressed:
 				case 46:
-					// If not composing a reply and message list is visible:
-					if (!$('.to, .cc, .message-body').is(':focus') && $('#mail_messages').is(':visible')) {
+					// If not composing a reply:
+					if (!$('.to, .cc, .message-body').is(':focus')) {
 						// Mimic a client clicking the delete button for the currently active message.
 						$('.mail_message_summary.active .icon-delete.action.delete').click();
 					}
@@ -216,12 +217,4 @@ define(function(require) {
 			}
 		}
 	});
-
-	// Show the images if wanted
-	$(document).on('click', '#show-images-button', function(){
-		$('#show-images-text').hide();
-		$('iframe').contents().find('img[data-original-src]').each(function(){
-			$(this).attr('src',$(this).attr('data-original-src'));
-		});
-	});
 });
diff --git a/js/jquery.js b/js/jquery.js
index cf6ea9055..e22f54309 100644
--- a/js/jquery.js
+++ b/js/jquery.js
@@ -10,6 +10,5 @@
 
 define(function() {
 	'use strict';
-	
 	return $;
 });
diff --git a/js/models/account.js b/js/models/account.js
index f1e5a127c..85dd6fbda 100644
--- a/js/models/account.js
+++ b/js/models/account.js
@@ -11,8 +11,8 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		FolderCollection = require('models/foldercollection');
+	var Backbone = require('backbone');
+	var FolderCollection = require('models/foldercollection');
 
 	return Backbone.Model.extend({
 		defaults: {
diff --git a/js/models/accountcollection.js b/js/models/accountcollection.js
index a3ac773ab..11123e9c6 100644
--- a/js/models/accountcollection.js
+++ b/js/models/accountcollection.js
@@ -11,8 +11,8 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		Account = require('models/account');
+	var Backbone = require('backbone');
+	var Account = require('models/account');
 
 	return Backbone.Collection.extend({
 		model: Account,
diff --git a/js/models/attachments.js b/js/models/attachments.js
index 8b771669b..b899fd2b9 100644
--- a/js/models/attachments.js
+++ b/js/models/attachments.js
@@ -11,8 +11,8 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		Attachment = require('models/attachment');
+	var Backbone = require('backbone');
+	var Attachment = require('models/attachment');
 
 	return Backbone.Collection.extend({
 		model: Attachment
diff --git a/js/models/foldercollection.js b/js/models/foldercollection.js
index 893a3cd4b..d0665b035 100644
--- a/js/models/foldercollection.js
+++ b/js/models/foldercollection.js
@@ -11,8 +11,8 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		Folder = require('models/folder');
+	var Backbone = require('backbone');
+	var Folder = require('models/folder');
 
 	return Backbone.Collection.extend({
 		model: Folder
diff --git a/js/models/message.js b/js/models/message.js
index 26f8abf15..458988bac 100644
--- a/js/models/message.js
+++ b/js/models/message.js
@@ -11,10 +11,10 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		$ = require('jquery'),
-		OC = require('OC'),
-		MessageFlags = require('models/messageflags');
+	var Backbone = require('backbone');
+	var $ = require('jquery');
+	var OC = require('OC');
+	var MessageFlags = require('models/messageflags');
 
 	return Backbone.Model.extend({
 		defaults: {
@@ -41,8 +41,8 @@ define(function(require) {
 		},
 		flagMessage: function(flag, value) {
 			var messageId = this.id;
-			var thisModel = this;
-			thisModel.get('flags').set(flag, value);
+			var _this = this;
+			_this.get('flags').set(flag, value);
 
 			var flags = [flag, value];
 			$.ajax(
@@ -60,7 +60,7 @@ define(function(require) {
 				},
 				error: function() {
 					require('app').UI.showError(t('mail', 'Message could not be starred. Please try again.'));
-					thisModel.get('flags').set(flag, !value);
+					_this.get('flags').set(flag, !value);
 				}
 			});
 		}
diff --git a/js/models/messagecollection.js b/js/models/messagecollection.js
index 860d4ac87..d23052cef 100644
--- a/js/models/messagecollection.js
+++ b/js/models/messagecollection.js
@@ -11,8 +11,8 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		Message = require('models/message');
+	var Backbone = require('backbone');
+	var Message = require('models/message');
 
 	return Backbone.Collection.extend({
 		model: Message,
diff --git a/js/require_config.js b/js/require_config.js
index 9e4cf9a4e..93a0b8296 100644
--- a/js/require_config.js
+++ b/js/require_config.js
@@ -45,4 +45,4 @@
 		'init',
 		'notification'
 	]);
-})();
\ No newline at end of file
+})();
diff --git a/js/settings.js b/js/settings.js
index 815b9a6f4..fc089a971 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -8,7 +8,6 @@
  * @copyright Christoph Wurst 2015
  */
 
-
 define(function(require) {
 	'use strict';
 
diff --git a/js/ui.js b/js/ui.js
index 6250c23d8..942647070 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -13,13 +13,13 @@
 define(function(require) {
 	'use strict';
 
-	var $ = require('jquery'),
-		Handlebars = require('handlebars'),
-		Marionette = require('marionette'),
-		OC = require('OC'),
-		MessagesView = require('views/messages'),
-		FoldersView = require('views/folders'),
-		ComposerView = require('views/composer');
+	var $ = require('jquery');
+	var Handlebars = require('handlebars');
+	var Marionette = require('marionette');
+	var OC = require('OC');
+	var MessagesView = require('views/messages');
+	var FoldersView = require('views/folders');
+	var ComposerView = require('views/composer');
 
 	require('views/helper');
 	require('settings');
@@ -34,7 +34,7 @@ define(function(require) {
 		var accounts = _.filter(require('app').State.accounts, function(item) {
 			return item.accountId !== -1;
 		});
-		var source = $("#mail-settings-template").html();
+		var source = $('#mail-settings-template').html();
 		var template = Handlebars.compile(source);
 		var html = template(accounts);
 		$('#app-settings-content').html(html);
@@ -73,8 +73,8 @@ define(function(require) {
 		Marionette.TemplateCache.prototype.compileTemplate = function(rawTemplate) {
 			return Handlebars.compile(rawTemplate);
 		};
-		Marionette.ItemView.prototype.modelEvents = {"change": "render"};
-		Marionette.CompositeView.prototype.modelEvents = {"change": "render"};
+		Marionette.ItemView.prototype.modelEvents = {'change': 'render'};
+		Marionette.CompositeView.prototype.modelEvents = {'change': 'render'};
 
 		// ask to handle all mailto: links
 		if (window.navigator.registerProtocolHandler) {
@@ -83,7 +83,7 @@ define(function(require) {
 				OC.generateUrl('apps/mail/compose?uri=%s');
 			try {
 				window.navigator
-					.registerProtocolHandler("mailto", url, "ownCloud Mail");
+					.registerProtocolHandler('mailto', url, 'ownCloud Mail');
 			} catch (e) {
 			}
 		}
@@ -291,7 +291,7 @@ define(function(require) {
 			function(path) {
 				// Loading feedback
 				var saveToFilesBtnSelector = '.attachment-save-to-cloud';
-				if (typeof attachmentId !== "undefined") {
+				if (typeof attachmentId !== 'undefined') {
 					saveToFilesBtnSelector = 'li[data-attachment-id="' +
 						attachmentId + '"] ' + saveToFilesBtnSelector;
 				}
@@ -316,14 +316,14 @@ define(function(require) {
 					},
 					type: 'POST',
 					success: function() {
-						if (typeof attachmentId === "undefined") {
+						if (typeof attachmentId === 'undefined') {
 							require('app').UI.showError(t('mail', 'Attachments saved to Files.'));
 						} else {
 							require('app').UI.showError(t('mail', 'Attachment saved to Files.'));
 						}
 					},
 					error: function() {
-						if (typeof attachmentId === "undefined") {
+						if (typeof attachmentId === 'undefined') {
 							require('app').UI.showError(t('mail', 'Error while saving attachments to Files.'));
 						} else {
 							require('app').UI.showError(t('mail', 'Error while saving attachment to Files.'));
@@ -403,12 +403,12 @@ define(function(require) {
 	view.openForwardComposer = function() {
 		var header = '\n\n\n\n-------- ' +
 			t('mail', 'Forwarded message') +
-			" --------\n";
+			' --------\n';
 
 		// TODO: find a better way to get the current message body
 		var data = {
 			subject: 'Fwd: ' + require('app').State.currentMessageSubject,
-			body: header + require('app').State.currentMessageBody.replace(/<br \/>/g, "\n")
+			body: header + require('app').State.currentMessageBody.replace(/<br \/>/g, '\n')
 		};
 
 		if (require('app').State.currentAccountId !== -1) {
@@ -435,7 +435,7 @@ define(function(require) {
 		var text = tmp.text();
 
 		// Finally, replace tokens with line breaks
-		text = text.replace(new RegExp(breakToken, 'g'), "\n");
+		text = text.replace(new RegExp(breakToken, 'g'), '\n');
 		return text;
 	};
 
@@ -487,7 +487,7 @@ define(function(require) {
 		// Fade out the message composer
 		$('#mail_new_message').prop('disabled', false);
 
-		var self = this;
+		var _this = this;
 		var loadMessageSuccess = function(message) {
 			var reply = {
 				replyToList: message.replyToList,
@@ -516,7 +516,7 @@ define(function(require) {
 			require('app').State.currentMessageSubject = message.subject;
 
 			// Render the message body
-			var source = $("#mail-message-template").html();
+			var source = $('#mail-message-template').html();
 			var template = Handlebars.compile(source);
 			var html = template(message);
 			mailBody
@@ -560,7 +560,7 @@ define(function(require) {
 					'font-weight': 'normal',
 					'font-size': '.8em',
 					'line-height': '1.6em',
-					'font-family': "'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif",
+					'font-family': '"Open Sans", Frutiger, Calibri, "Myriad Pro", Myriad, sans-serif',
 					'color': '#000'
 				});
 				// Fix font when different font is forced
@@ -613,7 +613,7 @@ define(function(require) {
 		};
 
 		var loadDraftSuccess = function(data) {
-			self.openComposer(data);
+			_this.openComposer(data);
 		};
 
 		require('app').Communication.fetchMessage(
diff --git a/js/views/account.js b/js/views/account.js
index f8b5b3415..e233b6626 100644
--- a/js/views/account.js
+++ b/js/views/account.js
@@ -11,8 +11,8 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		FolderView = require('views/folder');
+	var Backbone = require('backbone');
+	var FolderView = require('views/folder');
 
 	return Backbone.Marionette.CompositeView.extend({
 		collection: null,
diff --git a/js/views/attachments.js b/js/views/attachments.js
index 8d85e0580..49652bb2a 100644
--- a/js/views/attachments.js
+++ b/js/views/attachments.js
@@ -11,9 +11,9 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		OC = require('OC'),
-		AttachmentView = require('views/attachment');
+	var Backbone = require('backbone');
+	var OC = require('OC');
+	var AttachmentView = require('views/attachment');
 
 	return Backbone.Marionette.CompositeView.extend({
 		collection: null,
diff --git a/js/views/composer.js b/js/views/composer.js
index d10d119a9..d7db729b3 100644
--- a/js/views/composer.js
+++ b/js/views/composer.js
@@ -11,12 +11,12 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		Handlebars = require('handlebars'),
-		$ = require('jquery'),
-		OC = require('OC'),
-		Attachments = require('models/attachments'),
-		AttachmentsView = require('views/attachments');
+	var Backbone = require('backbone');
+	var Handlebars = require('handlebars');
+	var $ = require('jquery');
+	var OC = require('OC');
+	var Attachments = require('models/attachments');
+	var AttachmentsView = require('views/attachments');
 
 	return Backbone.View.extend({
 		type: 'new',
@@ -34,25 +34,25 @@ define(function(require) {
 		hasData: false,
 		autosized: false,
 		events: {
-			"click .submit-message": "submitMessage",
-			"keypress .message-body": "handleKeyPress",
-			"input  .to": "onInputChanged",
-			"paste  .to": "onInputChanged",
-			"keyup  .to": "onInputChanged",
-			"input  .cc": "onInputChanged",
-			"paste  .cc": "onInputChanged",
-			"keyup  .cc": "onInputChanged",
-			"input  .bcc": "onInputChanged",
-			"paste  .bcc": "onInputChanged",
-			"keyup  .bcc": "onInputChanged",
-			"input  .subject": "onInputChanged",
-			"paste  .subject": "onInputChanged",
-			"keyup  .subject": "onInputChanged",
-			"input  .message-body": "onInputChanged",
-			"paste  .message-body": "onInputChanged",
-			"keyup  .message-body": "onInputChanged",
+			'click .submit-message': 'submitMessage',
+			'keypress .message-body': 'handleKeyPress',
+			'input  .to': 'onInputChanged',
+			'paste  .to': 'onInputChanged',
+			'keyup  .to': 'onInputChanged',
+			'input  .cc': 'onInputChanged',
+			'paste  .cc': 'onInputChanged',
+			'keyup  .cc': 'onInputChanged',
+			'input  .bcc': 'onInputChanged',
+			'paste  .bcc': 'onInputChanged',
+			'keyup  .bcc': 'onInputChanged',
+			'input  .subject': 'onInputChanged',
+			'paste  .subject': 'onInputChanged',
+			'keyup  .subject': 'onInputChanged',
+			'input  .message-body': 'onInputChanged',
+			'paste  .message-body': 'onInputChanged',
+			'keyup  .message-body': 'onInputChanged',
 			// CC/BCC toggle
-			"click .composer-cc-bcc-toggle": "ccBccToggle"
+			'click .composer-cc-bcc-toggle': 'ccBccToggle'
 		},
 		initialize: function(options) {
 			var defaultOptions = {
@@ -114,7 +114,7 @@ define(function(require) {
 			};
 			_.defaults(options, defaultOptions);
 
-			var source = $("#mail-composer").html();
+			var source = $('#mail-composer').html();
 			var template = Handlebars.compile(source);
 
 			this.attachments.reset();
@@ -161,7 +161,7 @@ define(function(require) {
 		setAutoSize: function(state) {
 			if (state === true) {
 				if (!this.autosized) {
-					this.$('textarea').autosize({append: '"\n\n"'});
+					this.$('textarea').autosize({append: '\n\n'});
 					this.autosized = true;
 				}
 				this.$('.message-body').trigger('autosize.resize');
@@ -267,7 +267,7 @@ define(function(require) {
 
 			// if available get account from drop-down list
 			if (this.$('.mail-account').length > 0) {
-				this.accountId = this.$('.mail-account').find(":selected").val();
+				this.accountId = this.$('.mail-account').find(':selected').val();
 			}
 
 			// send the mail
diff --git a/js/views/folders.js b/js/views/folders.js
index ee3f1e0eb..779137bbc 100644
--- a/js/views/folders.js
+++ b/js/views/folders.js
@@ -13,9 +13,9 @@
 define(function(require) {
 	'use strict';
 
-	var Marionette = require('marionette'),
-		AccountView = require('views/account'),
-		AccountCollection = require('models/accountcollection');
+	var Marionette = require('marionette');
+	var AccountView = require('views/account');
+	var AccountCollection = require('models/accountcollection');
 
 	return Marionette.CollectionView.extend({
 		// The collection will be kept here
@@ -77,10 +77,14 @@ define(function(require) {
 
 			if (unread > 0) {
 				window.document.title = name + ' (' + unread + ')' +
+					// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
 					activeEmail + ' - Mail - ' + oc_defaults.title;
+					// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
 			} else {
 				window.document.title = name + activeEmail +
+				// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
 					' - Mail - ' + oc_defaults.title;
+				// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
 			}
 		}
 
diff --git a/js/views/helper.js b/js/views/helper.js
index c223a4e2f..d9c301c41 100644
--- a/js/views/helper.js
+++ b/js/views/helper.js
@@ -15,29 +15,31 @@ define(function(require) {
 
 	var Handlebars = require('handlebars');
 
-	Handlebars.registerHelper("relativeModifiedDate", function(dateInt) {
+	Handlebars.registerHelper('relativeModifiedDate', function(dateInt) {
 		var lastModified = new Date(dateInt * 1000);
 		var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
+		// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
 		return relative_modified_date(lastModifiedTime);
+		// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
 	});
 
-	Handlebars.registerHelper("formatDate", function(dateInt) {
+	Handlebars.registerHelper('formatDate', function(dateInt) {
 		var lastModified = new Date(dateInt * 1000);
 		return formatDate(lastModified);
 	});
 
-	Handlebars.registerHelper("humanFileSize", function(size) {
+	Handlebars.registerHelper('humanFileSize', function(size) {
 		return humanFileSize(size);
 	});
 
 	Handlebars.registerHelper('accountColor', function(account) {
-		var hash = md5(account),
-			maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16),
-			hue = parseInt(hash, 16) / maxRange * 256;
+		var hash = md5(account);
+		var maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16);
+		var hue = parseInt(hash, 16) / maxRange * 256;
 		return new Handlebars.SafeString('hsl(' + hue + ', 90%, 65%)');
 	});
 
-	Handlebars.registerHelper("printAddressList", function(addressList) {
+	Handlebars.registerHelper('printAddressList', function(addressList) {
 		var currentAddress = _.find(require('app').State.accounts, function(item) {
 			return item.accountId === require('app').State.currentAccountId;
 		});
@@ -55,22 +57,22 @@ define(function(require) {
 				label = t('mail', 'you');
 			}
 			var title = t('mail', 'Send message to {email}', {email: email});
-			memo += '<span class="tipsy-mailto" title="' + title + '">';
-			memo += '<a class="link-mailto" data-email="' + email + '" data-label="' + label + '">';
+			memo += '<span class="tipsy-mailto" title="' + title + '>';
+			memo += '<a class="link-mailto" data-email="" + email + "" data-label="" + label + "">';
 			memo += label + '</a></span>';
 			return memo;
-		}, "");
+		}, '');
 		return new Handlebars.SafeString(str);
 	});
 
-	Handlebars.registerHelper("printAddressListPlain", function(addressList) {
+	Handlebars.registerHelper('printAddressListPlain', function(addressList) {
 		var str = _.reduce(addressList, function(memo, value, index) {
 			if (index !== 0) {
 				memo += ', ';
 			}
 			var label = value.label
 				.replace(/(^"|"$)/g, '')
-				.replace(/(^'|'$)/g, '');
+				.replace(/(^"|"$)/g, '');
 			label = Handlebars.Utils.escapeExpression(label);
 			var email = Handlebars.Utils.escapeExpression(value.email);
 			if (label === email) {
@@ -78,11 +80,11 @@ define(function(require) {
 			} else {
 				return memo + '"' + label + '" <' + email + '>';
 			}
-		}, "");
+		}, '');
 		return str;
 	});
 
-	Handlebars.registerHelper("ifHasCC", function(cc, ccList, options) {
+	Handlebars.registerHelper('ifHasCC', function(cc, ccList, options) {
 		if (!_.isUndefined(cc) || (!_.isUndefined(ccList) && ccList.length > 0)) {
 			return options.fn(this);
 		} else {
@@ -90,7 +92,7 @@ define(function(require) {
 		}
 	});
 
-	Handlebars.registerHelper("unlessHasCC", function(cc, ccList, options) {
+	Handlebars.registerHelper('unlessHasCC', function(cc, ccList, options) {
 		if (_.isUndefined(cc) && (_.isUndefined(ccList) || ccList.length === 0)) {
 			return options.fn(this);
 		} else {
@@ -102,17 +104,17 @@ define(function(require) {
 	//TODO: remove once OC 8.0 support has been dropped
 	window.getScrollBarWidth = window.getScrollBarWidth || function() {
 		var inner = document.createElement('p');
-		inner.style.width = "100%";
-		inner.style.height = "200px";
+		inner.style.width = '100%';
+		inner.style.height = '200px';
 
 		var outer = document.createElement('div');
-		outer.style.position = "absolute";
-		outer.style.top = "0px";
-		outer.style.left = "0px";
-		outer.style.visibility = "hidden";
-		outer.style.width = "200px";
-		outer.style.height = "150px";
-		outer.style.overflow = "hidden";
+		outer.style.position = 'absolute';
+		outer.style.top = '0px';
+		outer.style.left = '0px';
+		outer.style.visibility = 'hidden';
+		outer.style.width = '200px';
+		outer.style.height = '150px';
+		outer.style.overflow = 'hidden';
 		outer.appendChild(inner);
 
 		document.body.appendChild(outer);
diff --git a/js/views/message.js b/js/views/message.js
index d0c42dd65..ce4b7f62a 100644
--- a/js/views/message.js
+++ b/js/views/message.js
@@ -1,5 +1,5 @@
 /**
- * ownCloud - require('app')
+ * ownCloud  Mail
  *
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
@@ -8,22 +8,25 @@
  * @copyright Christoph Wurst 2015
  */
 
+/*
+
+ */
 define(function(require) {
 	'use strict';
 
-	var Marionette = require('marionette'),
-		OC = require('OC');
+	var Marionette = require('marionette');
+	var OC = require('OC');
 
 	return Marionette.ItemView.extend({
-		template: "#mail-messages-template",
+		template: '#mail-messages-template',
 		ui: {
 			iconDelete: '.action.delete',
 			star: '.star'
 		},
 		events: {
-			"click .action.delete": "deleteMessage",
-			"click .mail-message-header": "openMessage",
-			"click .star": "toggleMessageStar"
+			'click .action.delete': 'deleteMessage',
+			'click .mail-message-header': 'openMessage',
+			'click .star': 'toggleMessageStar'
 		},
 		onRender: function() {
 			// Get rid of that pesky wrapping-div.
diff --git a/js/views/messages.js b/js/views/messages.js
index e0d154d1c..f784b9210 100644
--- a/js/views/messages.js
+++ b/js/views/messages.js
@@ -11,10 +11,10 @@
 define(function(require) {
 	'use strict';
 
-	var Backbone = require('backbone'),
-		MessageCollection = require('models/messagecollection'),
-		MessageView = require('views/message'),
-		NoSearchResultMessageListView = require('views/nosearchresultmessagelistview');
+	var Backbone = require('backbone');
+	var MessageCollection = require('models/messagecollection');
+	var MessageView = require('views/message');
+	var NoSearchResultMessageListView = require('views/nosearchresultmessagelistview');
 
 	return Backbone.Marionette.CompositeView.extend({
 		collection: null,
@@ -22,11 +22,11 @@ define(function(require) {
 		childViewContainer: '#mail-message-list',
 		currentMessageId: null,
 		events: {
-			"click #load-new-mail-messages": "loadNew",
-			"click #load-more-mail-messages": "loadMore"
+			'click #load-new-mail-messages': 'loadNew',
+			'click #load-more-mail-messages': 'loadMore'
 		},
 		filterCriteria: null,
-		template: "#message-list-template",
+		template: '#message-list-template',
 		initialize: function() {
 			this.collection = new MessageCollection();
 			this.collection.on('change:flags', this.changeFlags, this);
@@ -116,7 +116,7 @@ define(function(require) {
 				.val(t('mail', 'Loading …'))
 				.prop('disabled', true);
 
-			var self = this;
+			var _this = this;
 			require('app').Communication.fetchMessageList(
 				require('app').State.currentAccountId,
 				require('app').State.currentFolderId,
@@ -129,10 +129,10 @@ define(function(require) {
 					replace: reload,
 					onSuccess: function(jsondata) {
 						if (reload) {
-							self.collection.reset();
+							_this.collection.reset();
 						}
 						// Add messages
-						self.collection.add(jsondata);
+						_this.collection.add(jsondata);
 
 						$('#app-content').removeClass('icon-loading');
 
diff --git a/js/views/nosearchresultmessagelistview.js b/js/views/nosearchresultmessagelistview.js
index ea4a73a8b..2f970171b 100644
--- a/js/views/nosearchresultmessagelistview.js
+++ b/js/views/nosearchresultmessagelistview.js
@@ -15,9 +15,9 @@ define(function(require) {
 
 	return Marionette.ItemView.extend({
 		initialize: function(options) {
-			this.model.set('searchTerm', options.filterCriteria.text || "");
+			this.model.set('searchTerm', options.filterCriteria.text || '');
 		},
-		template: "#no-search-results-message-list-template",
+		template: '#no-search-results-message-list-template',
 		onRender: function() {
 			this.$('#load-more-mail-messages').hide();
 		}
diff --git a/package.json b/package.json
index ad443542d..338d3018c 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
   },
   "homepage": "https://github.com/owncloud/mail",
   "devDependencies": {
+    "grunt-cli": "^0.1.13",
     "grunt-contrib-jshint": "^0.11.2",
     "grunt-jscs": "^1.8.0",
     "jscs-jsdoc": "^1.0.1",