From 17c2f1819317e19ea0f18fa1c3e4252d2967ea48 Mon Sep 17 00:00:00 2001
From: Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>
Date: Wed, 24 Feb 2016 12:28:24 +0100
Subject: [PATCH] Cleans the javascript

---
 .jshintrc                           |  2 +-
 webapp/js/components/album/album.js |  4 ++--
 webapp/js/controllers.js            |  6 +++---
 webapp/js/satbd.satellite.bar.js    |  4 ++--
 webapp/js/services.js               | 12 ++++++------
 webapp/js/views/authors/authors.js  |  7 ++++---
 webapp/js/views/recents/recents.js  | 11 ++++++-----
 webapp/js/views/search/search.js    | 14 ++++++++------
 webapp/js/views/series/series.js    |  4 ++--
 9 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 10a002b..9ecb16a 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,3 +1,3 @@
 {
-    "varstmt" : true
+    "varstmt" : false
 } 
\ No newline at end of file
diff --git a/webapp/js/components/album/album.js b/webapp/js/components/album/album.js
index 036c682..f680634 100644
--- a/webapp/js/components/album/album.js
+++ b/webapp/js/components/album/album.js
@@ -38,7 +38,7 @@ album.component('album', {
 		id: '<albumId',
 		ratio: '<'
 	}
-})
+});
 
 album.controller('AlbumModalInstanceCtrl', function($scope,$uibModalInstance,album) {
 	$scope.album = album;
@@ -47,5 +47,5 @@ album.controller('AlbumModalInstanceCtrl', function($scope,$uibModalInstance,alb
 	};
 	$scope.getLink = function(n) {
 		return $scope.album[n];
-	}
+	};
 });
diff --git a/webapp/js/controllers.js b/webapp/js/controllers.js
index 38a8528..172220c 100644
--- a/webapp/js/controllers.js
+++ b/webapp/js/controllers.js
@@ -1,11 +1,11 @@
-'use strict';
-
 var controllers = angular.module('satbd.satellite.bar.controllers',[
 	'ui.bootstrap',
 	'ngAnimate'
 ]);
 
 controllers.controller('NavBarCtrl',function($scope,$location,$uibModal) {
+    "use strict";
+
 	$scope.isCollapsed = true;
 	$scope.isActive = function(loc) {
 		return loc === $location.path();
@@ -15,7 +15,7 @@ controllers.controller('NavBarCtrl',function($scope,$location,$uibModal) {
 		if (searchTerms) {
 			$location.url('/search?q='+ encodeURIComponent(searchTerms));
 		}
-	}
+	};
 
 	$scope.openHelpModal = function () {
 		var modalInstance = $uibModal.open({
diff --git a/webapp/js/satbd.satellite.bar.js b/webapp/js/satbd.satellite.bar.js
index 37cddc7..aac8808 100644
--- a/webapp/js/satbd.satellite.bar.js
+++ b/webapp/js/satbd.satellite.bar.js
@@ -1,5 +1,3 @@
-'use strict';
-
 angular.module('satbd.satellite.bar',[
 	'ngRoute',
 	'satbd.satellite.bar.controllers',
@@ -9,5 +7,7 @@ angular.module('satbd.satellite.bar',[
 	'satbd.satellite.bar.views.authors',
 	'satbd.satellite.bar.views.search'
 ]).config(function($routeProvider) {
+    'use strict';
+
 	$routeProvider.otherwise({redirectTo: '/recents'});
 });
diff --git a/webapp/js/services.js b/webapp/js/services.js
index a2cf8e8..f1d14b9 100644
--- a/webapp/js/services.js
+++ b/webapp/js/services.js
@@ -1,4 +1,4 @@
-var services = angular.module('satbd.satellite.bar.services',[])
+var services = angular.module('satbd.satellite.bar.services',[]);
 
 services.factory('albumService',['$http','$log','$q', function($http,$log,$q) {
 	var determinantRegexp = /^(.*) \(([Ll][eas']+)\)$/;
@@ -6,11 +6,11 @@ services.factory('albumService',['$http','$log','$q', function($http,$log,$q) {
 	var removeSerie = /^\(.*\) .*$/;
 
 	function cleanupName(name) {
-		var matchesStr = name.match(determinantRegexp);
-		if (matchesStr == null) {
+		var matches = name.match(determinantRegexp);
+		if (matches === null) {
 			return name;
 		}
-		return matchesStr[2] + ' ' + matchesStr[1];
+		return matches[2] + ' ' + matches[1];
 	}
 
     function cleanupFields(album) {
@@ -18,7 +18,7 @@ services.factory('albumService',['$http','$log','$q', function($http,$log,$q) {
 		album.série = undefined;
 		album.editeur = album.éditeur;
 		album.éditeur = undefined;
-		if (removeSerie.test(album.serie) == true) {
+		if (removeSerie.test(album.serie) === true) {
 			album.serieDisplay = '';
 		} else {
 			album.serieDisplay = cleanupName(album.serie);
@@ -64,7 +64,7 @@ services.factory('albumService',['$http','$log','$q', function($http,$log,$q) {
 				"query": terms
 			}
 		}).then(function(response) {
-			if ( fuzzify == true && response.data.total_hits == 0) {
+			if ( fuzzify === true && response.data.total_hits === 0) {
 				return search(fuzzifyTerms(terms),from,false,response.data.took);
 			}
 			return processResult(response.data,previousTime);
diff --git a/webapp/js/views/authors/authors.js b/webapp/js/views/authors/authors.js
index ddcc7bf..a6dc787 100644
--- a/webapp/js/views/authors/authors.js
+++ b/webapp/js/views/authors/authors.js
@@ -1,9 +1,10 @@
-'use strict';
-
 angular.module('satbd.satellite.bar.views.authors',[
 	'ngRoute'
 ]).config(function($routeProvider) {
+    'use strict';
+
+
 	$routeProvider.when('/authors', {
 		templateUrl: 'js/views/authors/authors.html',
 	});
-})
+});
diff --git a/webapp/js/views/recents/recents.js b/webapp/js/views/recents/recents.js
index 427b650..ec2b1ab 100644
--- a/webapp/js/views/recents/recents.js
+++ b/webapp/js/views/recents/recents.js
@@ -1,15 +1,17 @@
-'use strict';
-
 angular.module('satbd.satellite.bar.views.recents',[
 	'ngRoute',
 	'satbd.satellite.bar.components.album',
 	'angular-inview'
 ]).config(function($routeProvider) {
+    'use strict';
+
 	$routeProvider.when('/recents', {
 		templateUrl: 'js/views/recents/recents.html',
 		controller: 'RecentsCtrl'
 	});
 }).controller('RecentsCtrl', function( $scope, $http, $log) {
+    'use strict';
+
 	$scope.albumIDs = [];
 	$scope.allAlbums = [];
 	$scope.scrollMore = false;
@@ -29,13 +31,12 @@ angular.module('satbd.satellite.bar.views.recents',[
 		$log.info('Loading more components');
 		if (!$scope.scrollMore || $scope.albumIDs.length >= $scope.allAlbums.length) {
 			$scope.scrollMore = false;
-			$log.info('reached the end of albums')
+			$log.info('reached the end of albums');
 			return;
 		}
 		var newSize = Math.min($scope.albumIDs.length + batchSize, $scope.allAlbums.length);
 		for( var i = $scope.albumIDs.length; i < newSize; i++) {
 			$scope.albumIDs.push($scope.allAlbums[i]);
 		}
-	}
-
+	};
 });
diff --git a/webapp/js/views/search/search.js b/webapp/js/views/search/search.js
index 91eda58..59c40c9 100644
--- a/webapp/js/views/search/search.js
+++ b/webapp/js/views/search/search.js
@@ -1,5 +1,3 @@
-'use strict';
-
 angular.module('satbd.satellite.bar.views.search',[
 	'ngRoute',
 	'ngSanitize',
@@ -7,11 +5,15 @@ angular.module('satbd.satellite.bar.views.search',[
 	'satbd.satellite.bar.components.album',
 	'angular-inview'
 ]).config(function($routeProvider) {
+    'use strict';
+
 	$routeProvider.when('/search', {
 		templateUrl: 'js/views/search/search.html',
 		controller: 'SearchCtrl'
 	});
 }).controller('SearchCtrl', function($scope,$routeParams,$log,$sce,albumService) {
+    'use strict';
+
 	$scope.terms=$routeParams.q;
 	$scope.scrollMore = false;
 	$scope.allHits = [];
@@ -43,14 +45,14 @@ angular.module('satbd.satellite.bar.views.search',[
 	};
 
 	$scope.inSecond= function(bleveValue) {
-		return bleveValue / 1e9;
-	}
+		return bleveValue / 1e6;
+	};
 
 	$scope.trustedFragment = function(f) {
 		return $sce.trustAsHtml(f);
-	}
+	};
 
 	$scope.round4Dec = function(value) {
 		return Math.round(value * 10000) / 10000;
-	}
+	};
 });
diff --git a/webapp/js/views/series/series.js b/webapp/js/views/series/series.js
index 6682a77..b911e2c 100644
--- a/webapp/js/views/series/series.js
+++ b/webapp/js/views/series/series.js
@@ -1,9 +1,9 @@
-'use strict';
-
 angular.module('satbd.satellite.bar.views.series',[
 	'ngRoute',
     'satbd.satellite.bar.directives.responsive-ratio'
 ]).config(function($routeProvider) {
+    'use strict';
+
 	$routeProvider.when('/series', {
 		templateUrl: 'js/views/series/series.html'
 	});