remove globals and warn for unused variables

.eslintrc.json

@@ -1,12 +1,10 @@
 {
 	"extends": "eslint:recommended",
 	"rules": {
-		"no-undef": "off",
-		"no-unused-vars": "off",
-
 		"eqeqeq": ["warn", "smart"],
 		"no-console": "warn",
 		"no-loop-func": "warn",
+		"no-unused-vars": "warn",
 
 		"block-spacing": "error",
 		"camelcase": "error",
@@ -20,6 +18,17 @@
 		"quotes": ["error", "single", "avoid-escape"],
 		"semi": "error",
 		"space-before-blocks": "error"
-
+	},
+	"env": {
+		"browser": true,
+		"jquery": true
+	},
+	"globals": {
+		"angular": false,
+		"vCard": false,
+		"_": false,
+		"OC": false,
+		"t": false,
+		"dav": false
 	}
 }

js/components/addressBook/addressBook_controller.js

@@ -1,4 +1,5 @@
-app.controller('addressbookCtrl', function($scope, AddressBookService) {
+angular.module('contactsApp')
+.controller('addressbookCtrl', function($scope, AddressBookService) {
 	var ctrl = this;
 
 	ctrl.urlBase = window.location.protocol + '//' + window.location.host;

js/components/addressBook/addressBook_directive.js

@@ -1,4 +1,5 @@
-app.directive('addressbook', function() {
+angular.module('contactsApp')
+.directive('addressbook', function() {
 	return {
 		restrict: 'A', // has to be an attribute to work with core css
 		scope: {},

js/components/addressBookList/addressBookList_controller.js

@@ -1,4 +1,5 @@
-app.controller('addressbooklistCtrl', function($scope, AddressBookService, SettingsService) {
+angular.module('contactsApp')
+.controller('addressbooklistCtrl', function($scope, AddressBookService, SettingsService) {
 	var ctrl = this;
 
 	ctrl.loading = true;

js/components/addressBookList/addressBookList_directive.js

@@ -1,4 +1,5 @@
-app.directive('addressbooklist', function() {
+angular.module('contactsApp')
+.directive('addressbooklist', function() {
 	return {
 		restrict: 'EA', // has to be an attribute to work with core css
 		scope: {},

js/components/contact/contact_controller.js

@@ -1,4 +1,5 @@
-app.controller('contactCtrl', function($route, $routeParams) {
+angular.module('contactsApp')
+.controller('contactCtrl', function($route, $routeParams) {
 	var ctrl = this;
 
 	ctrl.openContact = function() {

js/components/contact/contact_directive.js

@@ -1,4 +1,5 @@
-app.directive('contact', function() {
+angular.module('contactsApp')
+.directive('contact', function() {
 	return {
 		scope: {},
 		controller: 'contactCtrl',

js/components/contactDetails/contactDetails_controller.js

@@ -1,4 +1,5 @@
-app.controller('contactdetailsCtrl', function(ContactService, AddressBookService, vCardPropertiesService, $routeParams, $scope) {
+angular.module('contactsApp')
+.controller('contactdetailsCtrl', function(ContactService, AddressBookService, vCardPropertiesService, $routeParams, $scope) {
 	var ctrl = this;
 
 	ctrl.loading = true;

js/components/contactDetails/contactDetails_directive.js

@@ -1,4 +1,5 @@
-app.directive('contactdetails', function() {
+angular.module('contactsApp')
+.directive('contactdetails', function() {
 	return {
 		priority: 1,
 		scope: {},

js/components/contactList/contactList_controller.js

@@ -1,4 +1,5 @@
-app.controller('contactlistCtrl', function($scope, $filter, $route, $routeParams, ContactService, vCardPropertiesService, SearchService) {
+angular.module('contactsApp')
+.controller('contactlistCtrl', function($scope, $filter, $route, $routeParams, ContactService, vCardPropertiesService, SearchService) {
 	var ctrl = this;
 
 	ctrl.routeParams = $routeParams;

js/components/contactList/contactList_directive.js

@@ -1,4 +1,5 @@
-app.directive('contactlist', function() {
+angular.module('contactsApp')
+.directive('contactlist', function() {
 	return {
 		priority: 1,
 		scope: {},

js/components/datepicker_directive.js

@@ -1,4 +1,5 @@
-app.directive('datepicker', function() {
+angular.module('contactsApp')
+.directive('datepicker', function() {
 	return {
 		restrict: 'A',
 		require : 'ngModel',

js/components/detailsItem/detailsItem_controller.js

@@ -1,4 +1,5 @@
-app.controller('detailsItemCtrl', function($templateRequest, vCardPropertiesService, ContactService) {
+angular.module('contactsApp')
+.controller('detailsItemCtrl', function($templateRequest, vCardPropertiesService, ContactService) {
 	var ctrl = this;
 
 	ctrl.meta = vCardPropertiesService.getMeta(ctrl.name);

js/components/detailsItem/detailsItem_directive.js

@@ -1,4 +1,5 @@
-app.directive('detailsitem', ['$compile', function($compile) {
+angular.module('contactsApp')
+.directive('detailsitem', ['$compile', function($compile) {
 	return {
 		scope: {},
 		controller: 'detailsItemCtrl',

js/components/focus_directive.js

@@ -1,4 +1,5 @@
-app.directive('focusExpression', function ($timeout) {
+angular.module('contactsApp')
+.directive('focusExpression', function ($timeout) {
 	return {
 		restrict: 'A',
 		link: {

js/components/group/group_controller.js

@@ -1,3 +1,4 @@
-app.controller('groupCtrl', function() {
+angular.module('contactsApp')
+.controller('groupCtrl', function() {
 	var ctrl = this;
 });

js/components/group/group_directive.js

@@ -1,4 +1,5 @@
-app.directive('group', function() {
+angular.module('contactsApp')
+.directive('group', function() {
 	return {
 		restrict: 'A', // has to be an attribute to work with core css
 		scope: {},

js/components/groupList/groupList_controller.js

@@ -1,4 +1,5 @@
-app.controller('grouplistCtrl', function($scope, ContactService, SearchService, $routeParams) {
+angular.module('contactsApp')
+.controller('grouplistCtrl', function($scope, ContactService, SearchService, $routeParams) {
 	var ctrl = this;
 
 	var initialGroups = [t('contacts', 'All contacts'), t('contacts', 'Not grouped')];

js/components/groupList/groupList_directive.js

@@ -1,4 +1,5 @@
-app.directive('grouplist', function() {
+angular.module('contactsApp')
+.directive('grouplist', function() {
 	return {
 		restrict: 'EA', // has to be an attribute to work with core css
 		scope: {},

js/components/parsers/groupModel_directive.js

@@ -1,4 +1,5 @@
-app.directive('groupModel', function($filter) {
+angular.module('contactsApp')
+.directive('groupModel', function($filter) {
 	return{
 		restrict: 'A',
 		require: 'ngModel',

js/components/parsers/telModel_directive.js

@@ -1,4 +1,5 @@
-app.directive('telModel', function() {
+angular.module('contactsApp')
+.directive('telModel', function() {
 	return{
 		restrict: 'A',
 		require: 'ngModel',

js/filters/JSON2vCard_filter.js

@@ -1,5 +1,6 @@
-app.filter('JSON2vCard', function() {
+angular.module('contactsApp')
+.filter('JSON2vCard', function() {
 	return function(input) {
 		return vCard.generate(input);
 	};
-});
+});

js/filters/contactColor_filter.js

@@ -1,4 +1,5 @@
-app.filter('contactColor', function() {
+angular.module('contactsApp')
+.filter('contactColor', function() {
 	return function(input) {
 		var colors = [
 				'#001f3f',

js/filters/contactGroup_filter.js

@@ -1,4 +1,5 @@
-app.filter('contactGroupFilter', function() {
+angular.module('contactsApp')
+.filter('contactGroupFilter', function() {
 	'use strict';
 	return function (contacts, group) {
 		if (typeof contacts === 'undefined') {

js/filters/field_filter.js

@@ -1,4 +1,5 @@
-app.filter('fieldFilter', function() {
+angular.module('contactsApp')
+.filter('fieldFilter', function() {
 	'use strict';
 	return function (fields, contact) {
 		if (typeof fields === 'undefined') {

js/filters/firstCharacter_filter.js

@@ -1,4 +1,5 @@
-app.filter('firstCharacter', function() {
+angular.module('contactsApp')
+.filter('firstCharacter', function() {
 	return function(input) {
 		return input.charAt(0);
 	};

js/filters/orderDetailItems_filter.js

@@ -1,4 +1,5 @@
-app.filter('orderDetailItems', function(vCardPropertiesService) {
+angular.module('contactsApp')
+.filter('orderDetailItems', function(vCardPropertiesService) {
 	'use strict';
 	return function(items, field, reverse) {
 

js/filters/toArray_filter.js

@@ -1,4 +1,5 @@
-app.filter('toArray', function() {
+angular.module('contactsApp')
+.filter('toArray', function() {
 	return function(obj) {
 		if (!(obj instanceof Object)) return obj;
 		return _.map(obj, function(val, key) {

js/filters/vCard2JSON_filter.js

@@ -1,5 +1,6 @@
-app.filter('vCard2JSON', function() {
+angular.module('contactsApp')
+.filter('vCard2JSON', function() {
 	return function(input) {
 		return vCard.parse(input);
 	};
-});
+});

js/main.js

@@ -8,9 +8,8 @@
  * @copyright Hendrik Leppelsack 2015
  */
 
-var app = angular.module('contactsApp', ['uuid4', 'angular-cache', 'ngRoute', 'ui.bootstrap', 'ui.select', 'ngSanitize']);
-
-app.config(function($routeProvider) {
+angular.module('contactsApp', ['uuid4', 'angular-cache', 'ngRoute', 'ui.bootstrap', 'ui.select', 'ngSanitize'])
+.config(function($routeProvider) {
 
 	$routeProvider.when('/:gid', {
 		template: '<contactdetails></contactdetails>'

js/models/addressBook_model.js

@@ -1,4 +1,5 @@
-app.factory('AddressBook', function()
+angular.module('contactsApp')
+.factory('AddressBook', function()
 {
 	return function AddressBook(data) {
 		angular.extend(this, {

js/models/contact_model.js

@@ -1,4 +1,5 @@
-app.factory('Contact', function($filter) {
+angular.module('contactsApp')
+.factory('Contact', function($filter) {
 	return function Contact(addressBook, vCard) {
 		angular.extend(this, {
 

js/services/addressBook_service.js

@@ -1,4 +1,5 @@
-app.factory('AddressBookService', function(DavClient, DavService, SettingsService, AddressBook, Contact) {
+angular.module('contactsApp')
+.factory('AddressBookService', function(DavClient, DavService, SettingsService, AddressBook, Contact) {
 
 	var addressBooks = [];
 

js/services/contact_service.js

@@ -1,9 +1,9 @@
-var contacts;
-app.service('ContactService', function(DavClient, AddressBookService, Contact, $q, CacheFactory, uuid4) {
+angular.module('contactsApp')
+.service('ContactService', function(DavClient, AddressBookService, Contact, $q, CacheFactory, uuid4) {
 
 	var cacheFilled = false;
 
-	contacts = CacheFactory('contacts');
+	var contacts = CacheFactory('contacts');
 
 	var observerCallbacks = [];
 
@@ -29,7 +29,7 @@ app.service('ContactService', function(DavClient, AddressBookService, Contact, $
 				promises.push(
 					AddressBookService.sync(addressBook).then(function(addressBook) {
 						for(var i in addressBook.objects) {
-							contact = new Contact(addressBook, addressBook.objects[i]);
+							var contact = new Contact(addressBook, addressBook.objects[i]);
 							contacts.put(contact.uid(), contact);
 						}
 					})

js/services/davClient_service.js

@@ -1,6 +1,7 @@
-app.service('DavClient', function() {
+angular.module('contactsApp')
+.service('DavClient', function() {
 	var xhr = new dav.transport.Basic(
 		new dav.Credentials()
 	);
 	return new dav.Client(xhr);
-});
+});

js/services/dav_service.js

@@ -1,4 +1,5 @@
-app.service('DavService', function(DavClient) {
+angular.module('contactsApp')
+.service('DavService', function(DavClient) {
 	return DavClient.createAccount({
 		server: OC.linkToRemoteBase('dav/addressbooks'),
 		accountType: 'carddav',

js/services/search_service.js

@@ -1,4 +1,5 @@
-app.service('SearchService', function() {
+angular.module('contactsApp')
+.service('SearchService', function() {
 	var searchTerm = '';
 
 	var observerCallbacks = [];

js/services/settings_service.js

@@ -1,4 +1,5 @@
-app.service('SettingsService', function() {
+angular.module('contactsApp')
+.service('SettingsService', function() {
 	var settings = {
 		addressBooks: [
 			'testAddr'

js/services/vCardProperties.js

@@ -1,4 +1,5 @@
-app.service('vCardPropertiesService', function() {
+angular.module('contactsApp')
+.service('vCardPropertiesService', function() {
 	/**
 	 * map vCard attributes to internal attributes
 	 *