Refactoring according to pull request feedback

camptocamp · Dec 19, 2017 · de494df · de494df
1 parent cb33299
commit de494df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/query/bboxquerycomponent.js b/src/query/bboxquerycomponent.js
@@ -36,7 +36,7 @@ goog.require('ol.events.condition');
  * @ngdoc directive
  * @ngname ngeoBboxQuery
  */
-ngeo.query.bboxQueryComponent = function(ngeoMapQuerent) {
+ngeo.query.bboxQueryComponent.directive_ = function(ngeoMapQuerent) {
   return {
     restrict: 'A',
     scope: false,
@@ -84,10 +84,10 @@ ngeo.query.bboxQueryComponent = function(ngeoMapQuerent) {
   };
 };
 
-ngeo.query.bboxQueryComponent.module = angular.module('ngeoBboxQuery', [
+ngeo.query.bboxQueryComponent = angular.module('ngeoBboxQuery', [
   ngeo.query.MapQuerent.module.name,
 ]);
 
-ngeo.module.requires.push(ngeo.query.bboxQueryComponent.module.name);
+ngeo.module.requires.push(ngeo.query.bboxQueryComponent.name);
 
-ngeo.query.bboxQueryComponent.module.directive('ngeoBboxQuery', ngeo.query.bboxQueryComponent);
+ngeo.query.bboxQueryComponent.directive('ngeoBboxQuery', ngeo.query.bboxQueryComponent.directive_);
diff --git a/src/query/mapquerycomponent.js b/src/query/mapquerycomponent.js
@@ -35,7 +35,7 @@ goog.require('ol.events');
  * @ngdoc directive
  * @ngname ngeoMapQuery
  */
-ngeo.query.mapQueryComponent = function(ngeoMapQuerent, $injector) {
+ngeo.query.mapQueryComponent.directive_ = function(ngeoMapQuerent, $injector) {
   return {
     restrict: 'A',
     scope: false,
@@ -121,10 +121,10 @@ ngeo.query.mapQueryComponent = function(ngeoMapQuerent, $injector) {
 };
 
 
-ngeo.query.mapQueryComponent.module = angular.module('ngeoMapQuery', [
+ngeo.query.mapQueryComponent = angular.module('ngeoMapQuery', [
   ngeo.query.MapQuerent.module.name,
 ]);
 
-ngeo.module.requires.push(ngeo.query.mapQueryComponent.module.name);
+ngeo.module.requires.push(ngeo.query.mapQueryComponent.name);
 
-ngeo.query.mapQueryComponent.module.directive('ngeoMapQuery', ngeo.query.mapQueryComponent);
+ngeo.query.mapQueryComponent.directive('ngeoMapQuery', ngeo.query.mapQueryComponent.directive_);
diff --git a/src/query/module.js b/src/query/module.js
@@ -15,6 +15,6 @@ ngeo.query.module = angular.module('ngeoQueryModule', [
   ngeo.query.Service.module.name,
   ngeo.query.Querent.module.name,
   ngeo.query.MapQuerent.module.name,
-  ngeo.query.mapQueryComponent.module.name,
-  ngeo.query.bboxQueryComponent.module.name,
+  ngeo.query.mapQueryComponent.name,
+  ngeo.query.bboxQueryComponent.name,
 ]);