diff --git a/js/service/ApiService.js b/js/service/ApiService.js
index f3fa850e3..dbb1b56e9 100644
--- a/js/service/ApiService.js
+++ b/js/service/ApiService.js
@@ -20,152 +20,152 @@
  *  
  */
 
-app.factory('ApiService', function($http, $q){
-    var ApiService = function(http, endpoint) {
-        this.endpoint = endpoint;
-        this.baseUrl = OC.generateUrl('/apps/deck/' + endpoint);
-        this.http = http;
-        this.q = $q;
-        this.data = {};
-        this.id = null;
-        this.sorted = [];
-    };
+/** global: oc_defaults */
+app.factory('ApiService', function ($http, $q) {
+	var ApiService = function (http, endpoint) {
+		this.endpoint = endpoint;
+		this.baseUrl = OC.generateUrl('/apps/deck/' + endpoint);
+		this.http = http;
+		this.q = $q;
+		this.data = {};
+		this.id = null;
+		this.sorted = [];
+	};
 
-    ApiService.prototype.fetchAll = function(){
-        var deferred = $q.defer();
-        var self = this;
-        $http.get(this.baseUrl).then(function (response) {
-            var objects = response.data;
-            objects.forEach(function (obj) {
-                self.data[obj.id] = obj;
-            });
-            deferred.resolve(self.data);
-        }, function (error) {
-            deferred.reject('Fetching ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-    };
+	ApiService.prototype.fetchAll = function () {
+		var deferred = $q.defer();
+		var self = this;
+		$http.get(this.baseUrl).then(function (response) {
+			var objects = response.data;
+			objects.forEach(function (obj) {
+				self.data[obj.id] = obj;
+			});
+			deferred.resolve(self.data);
+		}, function (error) {
+			deferred.reject('Fetching ' + self.endpoint + ' failed');
+		});
+		return deferred.promise;
+	};
 
-    ApiService.prototype.fetchOne = function (id) {
+	ApiService.prototype.fetchOne = function (id) {
 
-        this.id = id;
-        var deferred = $q.defer();
+		this.id = id;
+		var deferred = $q.defer();
 
-        if(id===undefined) {
-            return deferred.promise;
-        }
+		if (id === undefined) {
+			return deferred.promise;
+		}
 
-        var self = this;
-        $http.get(this.baseUrl + '/' + id).then(function (response) {
-            data = response.data;
-            if(self.data[data.id]===undefined) {
-                self.data[data.id] = response.data;
-            }
-            $.each(response.data, function(key, value) {
-                self.data[data.id][key] = value;
-            });
-            deferred.resolve(response.data);
+		var self = this;
+		$http.get(this.baseUrl + '/' + id).then(function (response) {
+			var data = response.data;
+			if (self.data[data.id] === undefined) {
+				self.data[data.id] = response.data;
+			}
+			$.each(response.data, function (key, value) {
+				self.data[data.id][key] = value;
+			});
+			deferred.resolve(response.data);
 
-        }, function (error) {
-            deferred.reject('Fetching ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-    };
+		}, function (error) {
+			deferred.reject('Fetching ' + self.endpoint + ' failed');
+		});
+		return deferred.promise;
+	};
 
-    ApiService.prototype.create = function (entity) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.post(this.baseUrl, entity).then(function (response) {
-            self.add(response.data);
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Fetching' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
-    };
+	ApiService.prototype.create = function (entity) {
+		var deferred = $q.defer();
+		var self = this;
+		$http.post(this.baseUrl, entity).then(function (response) {
+			self.add(response.data);
+			deferred.resolve(response.data);
+		}, function (error) {
+			deferred.reject('Fetching' + self.endpoint + ' failed');
+		});
+		return deferred.promise;
+	};
 
-    ApiService.prototype.update = function (entity) {
-        var deferred = $q.defer();
-        var self = this;
-        $http.put(this.baseUrl + '/' + entity.id, entity).then(function (response) {
-            self.add(response.data);
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Updating ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
+	ApiService.prototype.update = function (entity) {
+		var deferred = $q.defer();
+		var self = this;
+		$http.put(this.baseUrl + '/' + entity.id, entity).then(function (response) {
+			self.add(response.data);
+			deferred.resolve(response.data);
+		}, function (error) {
+			deferred.reject('Updating ' + self.endpoint + ' failed');
+		});
+		return deferred.promise;
 
-    };
+	};
 
-    ApiService.prototype.delete = function (id) {
-        var deferred = $q.defer();
-        var self = this;
+	ApiService.prototype.delete = function (id) {
+		var deferred = $q.defer();
+		var self = this;
 
-        $http.delete(this.baseUrl + '/' + id).then(function (response) {
-            self.remove(id);
-            deferred.resolve(response.data);
+		$http.delete(this.baseUrl + '/' + id).then(function (response) {
+			self.remove(id);
+			deferred.resolve(response.data);
 
-        }, function (error) {
-            deferred.reject('Deleting ' + self.endpoint + ' failed');
-        });
-        return deferred.promise;
+		}, function (error) {
+			deferred.reject('Deleting ' + self.endpoint + ' failed');
+		});
+		return deferred.promise;
 
-    };
-    
+	};
 
-    // methods for managing data
-    ApiService.prototype.clear = function() {
-        this.data = {};
-    };
-    ApiService.prototype.add = function (entity) {
-        var element = this.data[entity.id];
-        if(element===undefined) {
-            this.data[entity.id] = entity;
-        } else {
-            Object.keys(entity).forEach(function (key) {
-                element[key] = entity[key];
-            });
-            element.status = {};
-        }
-    };
-    ApiService.prototype.remove = function(id) {
-        if (this.data[id] !== undefined) {
-            delete this.data[id];
-        }
-    };
-    ApiService.prototype.addAll = function (entities) {
-        var self = this;
-        angular.forEach(entities, function(entity) {
-            self.add(entity);
-        });
-    };
 
-    ApiService.prototype.getCurrent = function () {
-        return this.data[this.id];
-    };
+	// methods for managing data
+	ApiService.prototype.clear = function () {
+		this.data = {};
+	};
+	ApiService.prototype.add = function (entity) {
+		var element = this.data[entity.id];
+		if (element === undefined) {
+			this.data[entity.id] = entity;
+		} else {
+			Object.keys(entity).forEach(function (key) {
+				element[key] = entity[key];
+			});
+			element.status = {};
+		}
+	};
+	ApiService.prototype.remove = function (id) {
+		if (this.data[id] !== undefined) {
+			delete this.data[id];
+		}
+	};
+	ApiService.prototype.addAll = function (entities) {
+		var self = this;
+		angular.forEach(entities, function (entity) {
+			self.add(entity);
+		});
+	};
+
+	ApiService.prototype.getCurrent = function () {
+		return this.data[this.id];
+	};
 
 	ApiService.prototype.unsetCurrrent = function () {
 		this.id = null;
 	};
 
 
+	ApiService.prototype.getData = function () {
+		return $.map(this.data, function (value, index) {
+			return [value];
+		});
+	};
 
-	ApiService.prototype.getData = function() {
-        return $.map(this.data, function(value, index) {
-            return [value];
-        });
-    };
+	ApiService.prototype.getAll = function () {
+		return this.data;
+	};
 
-    ApiService.prototype.getAll = function () {
-        return this.data;
-    };
+	ApiService.prototype.getName = function () {
+		var funcNameRegex = /function (.{1,})\(/;
+		var results = (funcNameRegex).exec((this).constructor.toString());
+		return (results && results.length > 1) ? results[1] : "";
+	};
 
-    ApiService.prototype.getName = function() {
-        var funcNameRegex = /function (.{1,})\(/;
-        var results = (funcNameRegex).exec((this).constructor.toString());
-        return (results && results.length > 1) ? results[1] : "";
-    };
-
-    return ApiService;
+	return ApiService;
 
 });
diff --git a/js/service/BoardService.js b/js/service/BoardService.js
index 7c7461d2a..5af2b529c 100644
--- a/js/service/BoardService.js
+++ b/js/service/BoardService.js
@@ -20,11 +20,12 @@
  *  
  */
 
-app.factory('BoardService', function(ApiService, $http, $q){
-    var BoardService = function($http, ep, $q) {
-        ApiService.call(this, $http, ep, $q);
-    };
-    BoardService.prototype = angular.copy(ApiService.prototype);
+/** global: OC */
+app.factory('BoardService', function (ApiService, $http, $q) {
+	var BoardService = function ($http, ep, $q) {
+		ApiService.call(this, $http, ep, $q);
+	};
+	BoardService.prototype = angular.copy(ApiService.prototype);
 
 	BoardService.prototype.delete = function (id) {
 		var deferred = $q.defer();
@@ -113,7 +114,7 @@ app.factory('BoardService', function(ApiService, $http, $q){
 		return deferred.promise;
 	};
 
-	BoardService.prototype.generateAcl = function(type, ocsItem) {
+	BoardService.prototype.generateAcl = function (type, ocsItem) {
 		return {
 			boardId: null,
 			id: null,
@@ -148,74 +149,73 @@ app.factory('BoardService', function(ApiService, $http, $q){
 		return deferred.promise;
 	};
 
-    BoardService.prototype.deleteAcl = function(acl) {
-        var board = this.getCurrent();
-        var deferred = $q.defer();
-        var self = this;
-        $http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) {
-            delete board.acl[response.data.id];
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error deleting ACL ' + acl.id);
-        });
-        acl = null;
-        return deferred.promise;
-    };
+	BoardService.prototype.deleteAcl = function (acl) {
+		var board = this.getCurrent();
+		var deferred = $q.defer();
+		var self = this;
+		$http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) {
+			delete board.acl[response.data.id];
+			deferred.resolve(response.data);
+		}, function (error) {
+			deferred.reject('Error deleting ACL ' + acl.id);
+		});
+		acl = null;
+		return deferred.promise;
+	};
 
-    BoardService.prototype.updateAcl = function(acl) {
-        var board = this.getCurrent();
-        var deferred = $q.defer();
-        var self = this;
-        var _acl = acl;
-        $http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
-            board.acl[_acl.id] = response.data;
-            deferred.resolve(response.data);
-        }, function (error) {
-            deferred.reject('Error updating ACL ' + _acl);
-        });
-        acl = null;
-        return deferred.promise;
-    };
+	BoardService.prototype.updateAcl = function (acl) {
+		var board = this.getCurrent();
+		var deferred = $q.defer();
+		var self = this;
+		var _acl = acl;
+		$http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
+			board.acl[_acl.id] = response.data;
+			deferred.resolve(response.data);
+		}, function (error) {
+			deferred.reject('Error updating ACL ' + _acl);
+		});
+		acl = null;
+		return deferred.promise;
+	};
 
-    BoardService.prototype.canRead = function() {
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_READ'];
-    };
+	BoardService.prototype.canRead = function () {
+		if (!this.getCurrent() || !this.getCurrent().permissions) {
+			return false;
+		}
+		return this.getCurrent().permissions['PERMISSION_READ'];
+	};
 
-    BoardService.prototype.canEdit = function() {
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_EDIT'];
-    };
+	BoardService.prototype.canEdit = function () {
+		if (!this.getCurrent() || !this.getCurrent().permissions) {
+			return false;
+		}
+		return this.getCurrent().permissions['PERMISSION_EDIT'];
+	};
 
-    BoardService.prototype.canManage = function(board) {
-    	if(board !== null && board !== undefined) {
+	BoardService.prototype.canManage = function (board) {
+		if (board !== null && board !== undefined) {
 			return board.permissions['PERMISSION_MANAGE'];
 		}
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_MANAGE'];
-    };
+		if (!this.getCurrent() || !this.getCurrent().permissions) {
+			return false;
+		}
+		return this.getCurrent().permissions['PERMISSION_MANAGE'];
+	};
 
-    BoardService.prototype.canShare = function() {
-        if(!this.getCurrent() || !this.getCurrent().permissions) {
-            return false;
-        }
-        return this.getCurrent().permissions['PERMISSION_SHARE'];
-    };
+	BoardService.prototype.canShare = function () {
+		if (!this.getCurrent() || !this.getCurrent().permissions) {
+			return false;
+		}
+		return this.getCurrent().permissions['PERMISSION_SHARE'];
+	};
 
-    BoardService.prototype.isArchived = function () {
-		if(!this.getCurrent() || this.getCurrent().archived) {
+	BoardService.prototype.isArchived = function () {
+		if (!this.getCurrent() || this.getCurrent().archived) {
 			return true;
 		}
 		return false;
 	};
 
-    service = new BoardService($http, 'boards', $q);
-    return service;
-    
+	return new BoardService($http, 'boards', $q);
+
 });
diff --git a/js/service/LabelService.js b/js/service/LabelService.js
index c116c1880..2d788fcc3 100644
--- a/js/service/LabelService.js
+++ b/js/service/LabelService.js
@@ -20,11 +20,10 @@
  *  
  */
 
-app.factory('LabelService', function(ApiService, $http, $q){
-    var LabelService = function($http, ep, $q) {
-        ApiService.call(this, $http, ep, $q);
-    };
-    LabelService.prototype = angular.copy(ApiService.prototype);
-    service = new LabelService($http, 'labels', $q);
-    return service;
+app.factory('LabelService', function (ApiService, $http, $q) {
+	var LabelService = function ($http, ep, $q) {
+		ApiService.call(this, $http, ep, $q);
+	};
+	LabelService.prototype = angular.copy(ApiService.prototype);
+	return new LabelService($http, 'labels', $q);
 });
\ No newline at end of file