Merge pull request #4440 from camptocamp/injector_type

Fix angular.auto.IInjectorService typing
camptocamp · Dec 4, 2018 · 997f320 · 997f320
2 parents af67aa8 + 2459b43
commit 997f320
Show file tree

Hide file tree

Showing 36 changed files with 39 additions and 39 deletions.
diff --git a/contribs/gmf/apps/desktop/Controller.js b/contribs/gmf/apps/desktop/Controller.js
@@ -26,7 +26,7 @@ if (!window.requestAnimationFrame) {
 
 /**
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractDesktopController}
  * @ngInject

diff --git a/contribs/gmf/apps/desktop_alt/Controller.js b/contribs/gmf/apps/desktop_alt/Controller.js
@@ -30,7 +30,7 @@ if (!window.requestAnimationFrame) {
 
 /**
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {ngeo.misc.File} ngeoFile The file service.
  * @param {gettext} gettext The gettext service
  * @param {angular.IQService} $q Angular $q.

diff --git a/contribs/gmf/apps/iframe_api/Controller.js b/contribs/gmf/apps/iframe_api/Controller.js
@@ -26,7 +26,7 @@ if (!window.requestAnimationFrame) {
 
 /**
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractAPIController}
  * @ngInject

diff --git a/contribs/gmf/apps/mobile/Controller.js b/contribs/gmf/apps/mobile/Controller.js
@@ -26,7 +26,7 @@ if (!window.requestAnimationFrame) {
 
 /**
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractMobileController}
  * @ngInject

diff --git a/contribs/gmf/apps/mobile_alt/Controller.js b/contribs/gmf/apps/mobile_alt/Controller.js
@@ -30,7 +30,7 @@ if (!window.requestAnimationFrame) {
 
 /**
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractMobileController}
  * @ngInject

diff --git a/contribs/gmf/apps/oeedit/Controller.js b/contribs/gmf/apps/oeedit/Controller.js
@@ -31,7 +31,7 @@ if (!window.requestAnimationFrame) {
 
 /**
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {angular.ITimeoutService} $timeout Angular timeout service.
  * @constructor
  * @extends {gmf.controllers.AbstractDesktopController}

diff --git a/contribs/gmf/apps/oeview/Controller.js b/contribs/gmf/apps/oeview/Controller.js
@@ -26,7 +26,7 @@ if (!window.requestAnimationFrame) {
 
 /**
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractDesktopController}
  * @ngInject

diff --git a/contribs/gmf/src/authentication/Service.js b/contribs/gmf/src/authentication/Service.js
@@ -22,7 +22,7 @@ const exports = class extends olEventsEventTarget {
 
   /**
    * @param {angular.IHttpService} $http Angular http service.
-   * @param {angular.IInjectorService} $injector Main injector.
+   * @param {angular.auto.IInjectorService} $injector Main injector.
    * @param {angular.Scope} $rootScope The directive's scope.
    * @param {string} authenticationBaseUrl URL to "authentication" web service.
    * @param {gmfx.User} gmfUser User.

diff --git a/contribs/gmf/src/controllers/AbstractAPIController.js b/contribs/gmf/src/controllers/AbstractAPIController.js
@@ -21,7 +21,7 @@ import * as olInteraction from 'ol/interaction.js';
  *
  * @param {gmfx.Config} config A part of the application config.
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractAppController}
  * @ngdoc controller

diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js
@@ -43,7 +43,7 @@ import gmfThemeThemes from 'gmf/theme/Themes.js';
  *
  * @param {gmfx.Config} config A part of the application config.
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @ngdoc controller
  * @ngInject

diff --git a/contribs/gmf/src/controllers/AbstractDesktopController.js b/contribs/gmf/src/controllers/AbstractDesktopController.js
@@ -29,7 +29,7 @@ import olStyleText from 'ol/style/Text.js';
  *
  * @param {gmfx.Config} config A part of the application config.
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractAppController}
  * @ngdoc controller

diff --git a/contribs/gmf/src/controllers/AbstractMobileController.js b/contribs/gmf/src/controllers/AbstractMobileController.js
@@ -27,7 +27,7 @@ import olStyleStyle from 'ol/style/Style.js';
  *
  * @param {gmfx.Config} config A part of the application config.
  * @param {angular.IScope} $scope Scope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @extends {gmf.controllers.AbstractAppController}
  * @ngdoc controller

diff --git a/contribs/gmf/src/datasource/ExternalDataSourcesManager.js b/contribs/gmf/src/datasource/ExternalDataSourcesManager.js
@@ -29,7 +29,7 @@ const exports = class {
    * creating, storing and managing them.
    *
    * @param {!angular.gettext.gettextCatalog} gettextCatalog service.
-   * @param {!angular.IInjectorService} $injector Main injector.
+   * @param {!angular.auto.IInjectorService} $injector Main injector.
    * @param {!angular.IQService} $q The Angular $q service.
    * @param {!angular.IScope} $rootScope The rootScope provider.
    * @param {!ngeo.datasource.DataSources} ngeoDataSources Ngeo data sources service.
@@ -45,7 +45,7 @@ const exports = class {
     // === Injected properties ===
 
     /**
-     * @type {!angular.IInjectorService}
+     * @type {!angular.auto.IInjectorService}
      * @private
      */
     this.injector_ = $injector;

diff --git a/contribs/gmf/src/import/importdatasourceComponent.js b/contribs/gmf/src/import/importdatasourceComponent.js
@@ -56,7 +56,7 @@ exports.Controller_ = class {
   /**
    * @param {!jQuery} $element Element.
    * @param {!angular.IFilterService} $filter Angular filter.
-   * @param {!angular.IInjectorService} $injector Main injector.
+   * @param {!angular.auto.IInjectorService} $injector Main injector.
    * @param {!angular.IScope} $scope Angular scope.
    * @param {!angular.ITimeoutService} $timeout Angular timeout service.
    * @param {!gmf.datasource.ExternalDataSourcesManager}

diff --git a/contribs/gmf/src/layertree/TreeManager.js b/contribs/gmf/src/layertree/TreeManager.js
@@ -24,7 +24,7 @@ import * as olEvents from 'ol/events.js';
  * Thought to be the tree source of the gmf layertree directive.
  * @constructor
  * @param {angular.ITimeoutService} $timeout Angular timeout service.
- * @param {angular.IInjectorService} $injector Angular injector service.
+ * @param {angular.auto.IInjectorService} $injector Angular injector service.
  * @param {angular.gettext.gettextCatalog} gettextCatalog Gettext catalog.
  * @param {ngeo.map.LayerHelper} ngeoLayerHelper Ngeo Layer Helper.
  * @param {ngeo.message.Notification} ngeoNotification Ngeo notification service.
@@ -44,7 +44,7 @@ const exports = function($timeout, $injector, gettextCatalog, ngeoLayerHelper,
   this.$timeout_ = $timeout;
 
   /**
-   * @type {angular.IInjectorService}
+   * @type {angular.auto.IInjectorService}
    * @private
    */
   this.$injector_ = $injector;

diff --git a/contribs/gmf/src/objectediting/toolsComponent.js b/contribs/gmf/src/objectediting/toolsComponent.js
@@ -109,7 +109,7 @@ exports.directive('gmfObjecteditingtools',
 
 
 /**
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {!angular.IScope} $scope Scope.
  * @param {ngeo.misc.ToolActivateMgr} ngeoToolActivateMgr Ngeo ToolActivate manager
  *     service.

diff --git a/contribs/gmf/src/permalink/Permalink.js b/contribs/gmf/src/permalink/Permalink.js
@@ -54,7 +54,7 @@ import olLayerGroup from 'ol/layer/Group.js';
  * @param {!angular.IQService} $q The Angular $q service.
  * @param {angular.ITimeoutService} $timeout Angular timeout service.
  * @param {angular.IScope} $rootScope Angular rootScope.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {ngeox.miscDebounce} ngeoDebounce ngeo Debounce factory.
  * @param {angular.gettext.gettextCatalog} gettextCatalog Gettext service.
  * @param {ngeo.misc.EventHelper} ngeoEventHelper Ngeo event helper service

diff --git a/contribs/gmf/src/print/component.js b/contribs/gmf/src/print/component.js
@@ -202,7 +202,7 @@ exports.Controller_ = class {
    * @param {angular.IScope} $scope Angular scope.
    * @param {angular.ITimeoutService} $timeout Angular timeout service.
    * @param {angular.IQService} $q The Angular $q service.
-   * @param {angular.IInjectorService} $injector Main injector.
+   * @param {angular.auto.IInjectorService} $injector Main injector.
    * @param {angular.gettext.gettextCatalog} gettextCatalog Gettext catalog.
    * @param {ngeo.map.LayerHelper} ngeoLayerHelper The ngeo Layer Helper service.
    * @param {ngeo.map.FeatureOverlayMgr} ngeoFeatureOverlayMgr Ngeo Feature Overlay

diff --git a/contribs/gmf/src/query/gridComponent.js b/contribs/gmf/src/query/gridComponent.js
@@ -129,7 +129,7 @@ exports.component('gmfDisplayquerygrid', component);
 /**
  * Controller for the query grid.
  *
- * @param {!angular.IInjectorService} $injector Main injector.
+ * @param {!angular.auto.IInjectorService} $injector Main injector.
  * @param {!angular.IScope} $scope Angular scope.
  * @param {!ngeox.QueryResult} ngeoQueryResult ngeo query result.
  * @param {!ngeo.query.MapQuerent} ngeoMapQuerent ngeo map querent service.

diff --git a/contribs/gmf/src/search/FulltextSearch.js b/contribs/gmf/src/search/FulltextSearch.js
@@ -5,7 +5,7 @@ import ngeoUtils from 'ngeo/utils.js';
 
 /**
  * Provides the c2c-geoportal full-text search.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {angular.IHttpService} $http Angular http service.
  * @constructor
  * @ngInject

diff --git a/contribs/gmf/src/search/component.js b/contribs/gmf/src/search/component.js
@@ -192,7 +192,7 @@ exports.SearchController_ = class {
    * @param {angular.IScope} $scope The component's scope.
    * @param {angular.ICompileService} $compile Angular compile service.
    * @param {angular.ITimeoutService} $timeout Angular timeout service.
-   * @param {angular.IInjectorService} $injector Main injector.
+   * @param {angular.auto.IInjectorService} $injector Main injector.
    * @param {angular.gettext.gettextCatalog} gettextCatalog Gettext catalog.
    * @param {ngeo.misc.AutoProjection} ngeoAutoProjection The ngeo coordinates service.
    * @param {ngeo.search.createGeoJSONBloodhound.Function} ngeoSearchCreateGeoJSONBloodhound The ngeo

diff --git a/contribs/gmf/src/theme/Themes.js b/contribs/gmf/src/theme/Themes.js
@@ -20,7 +20,7 @@ import olLayerTile from 'ol/layer/Tile.js';
  * @constructor
  * @extends {ol.events.EventTarget}
  * @param {angular.IHttpService} $http Angular http service.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {angular.IQService} $q Angular q service
  * @param {ngeo.map.LayerHelper} ngeoLayerHelper Ngeo Layer Helper.
  * @param {angular.gettext.gettextCatalog} gettextCatalog Gettext catalog.

diff --git a/options/ngeox.js b/options/ngeox.js
@@ -1312,7 +1312,7 @@ ngeox.datasource.FileGroupOptions = function() {};
 
 /**
  * Angular main injector.
- * @type {!angular.IInjectorService}
+ * @type {!angular.auto.IInjectorService}
  */
 ngeox.datasource.FileGroupOptions.prototype.injector;
 
@@ -1344,7 +1344,7 @@ ngeox.datasource.WMSGroupOptions = function() {};
 
 /**
  * Angular main injector.
- * @type {!angular.IInjectorService}
+ * @type {!angular.auto.IInjectorService}
  */
 ngeox.datasource.WMSGroupOptions.prototype.injector;
 

diff --git a/src/download/Csv.js b/src/download/Csv.js
@@ -7,7 +7,7 @@ import ngeoDownloadService from 'ngeo/download/service.js';
  * Service to generate and download a CSV file from tabular data.
  * Column headers are translated using {@link angular.gettext.gettextCatalog}.
  *
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {angular.gettext.gettextCatalog} gettextCatalog Gettext service.
  * @constructor
  * @ngdoc service

diff --git a/src/editing/exportfeaturesComponent.js b/src/editing/exportfeaturesComponent.js
@@ -50,7 +50,7 @@ exports.directive('ngeoExportfeatures', exports.directive_);
 
 /**
  * @param {angular.JQLite} $element Element.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {!angular.IScope} $scope Angular scope.
  * @param {ngeo.misc.FeatureHelper} ngeoFeatureHelper Ngeo feature helper service.
  * @constructor

diff --git a/src/measure/area.js b/src/measure/area.js
@@ -19,7 +19,7 @@ const exports = angular.module('ngeoMeasurearea', [
  * @param {!angular.ICompileService} $compile Angular compile service.
  * @param {!angular.gettext.gettextCatalog} gettextCatalog Gettext service.
  * @param {!angular.IFilterService} $filter Angular filter
- * @param {!angular.IInjectorService} $injector Main injector.
+ * @param {!angular.auto.IInjectorService} $injector Main injector.
  * @return {!angular.IDirective} The directive specs.
  * @ngInject
  * @ngdoc directive

diff --git a/src/measure/azimut.js b/src/measure/azimut.js
@@ -23,7 +23,7 @@ const exports = angular.module('ngeoMeasureazimut', [
  * @param {!angular.ICompileService} $compile Angular compile service.
  * @param {!angular.gettext.gettextCatalog} gettextCatalog Gettext catalog.
  * @param {!angular.IFilterService} $filter Angular filter
- * @param {!angular.IInjectorService} $injector Main injector.
+ * @param {!angular.auto.IInjectorService} $injector Main injector.
  * @return {!angular.IDirective} The directive specs.
  * @ngInject
  * @ngdoc directive

diff --git a/src/measure/length.js b/src/measure/length.js
@@ -21,7 +21,7 @@ const exports = angular.module('ngeoMeasurelength', [
  * @param {!angular.ICompileService} $compile Angular compile service.
  * @param {!angular.gettext.gettextCatalog} gettextCatalog Gettext catalog.
  * @param {!angular.IFilterService} $filter Angular filter.
- * @param {!angular.IInjectorService} $injector Main injector.
+ * @param {!angular.auto.IInjectorService} $injector Main injector.
  * @return {!angular.IDirective} The directive specs.
  * @ngInject
  * @ngdoc directive

diff --git a/src/misc/FeatureHelper.js b/src/misc/FeatureHelper.js
@@ -36,7 +36,7 @@ import olStyleText from 'ol/style/Text.js';
  *  - export
  *
  * @constructor
- * @param {!angular.IInjectorService} $injector Main injector.
+ * @param {!angular.auto.IInjectorService} $injector Main injector.
  * @param {!angular.IFilterService} $filter Angular filter.
  * @ngdoc service
  * @ngname ngeoFeatureHelper

diff --git a/src/misc/datepickerComponent.js b/src/misc/datepickerComponent.js
@@ -110,7 +110,7 @@ exports.directive('ngeoDatePicker', exports.component_);
 /**
  * DatePickerController - directive conttroller
  * @param {!angular.IScope} $scope Angular scope.
- * @param {!angular.IInjectorService} $injector injector.
+ * @param {!angular.auto.IInjectorService} $injector injector.
  * @param {!ngeo.misc.Time} ngeoTime time service.
  * @param {!angular.gettext.gettextCatalog} gettextCatalog service.
  * @constructor

diff --git a/src/query/MapQuerent.js b/src/query/MapQuerent.js
@@ -13,7 +13,7 @@ const exports = class {
    * queries using the Querent service. The result is stored inside this
    * service.
    *
-   * @param {angular.IInjectorService} $injector Main injector.
+   * @param {angular.auto.IInjectorService} $injector Main injector.
    * @param {ngeo.datasource.DataSources} ngeoDataSources Ngeo data sources service.
    * @param {ngeo.datasource.Helper} ngeoDataSourcesHelper Ngeo data
    *     sources helper service.

diff --git a/src/query/mapQueryComponent.js b/src/query/mapQueryComponent.js
@@ -33,7 +33,7 @@ const exports = angular.module('ngeoMapQuery', [
  * See our live example: [../examples/mapquery.html](../examples/mapquery.html)
  *
  * @param {ngeo.query.MapQuerent} ngeoMapQuerent The ngeo map querent service.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @return {angular.IDirective} The Directive Definition Object.
  * @ngInject
  * @ngdoc directive

diff --git a/src/routing/NominatimInputComponent.js b/src/routing/NominatimInputComponent.js
@@ -45,7 +45,7 @@ function ngeoRoutingNominatimInputComponentTemplateUrl($attrs, ngeoRoutingNomina
 
 /**
  * @param {!angular.JQLite} $element Element.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {!angular.IScope} $scope Scope.
  * @param {!ngeo.routing.NominatimService} ngeoNominatimService service for Nominatim
  * @constructor

diff --git a/src/routing/NominatimService.js b/src/routing/NominatimService.js
@@ -7,7 +7,7 @@ import ngeoMiscDebounce from 'ngeo/misc/debounce.js';
  * Service to provide access to Nominatim, which allows to search for
  * OSM data by name and address.
  * @param {angular.IHttpService} $http Angular http service.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {ngeox.miscDebounce} ngeoDebounce ngeo Debounce service.
  * @constructor
  * @ngdoc service

diff --git a/src/routing/RoutingComponent.js b/src/routing/RoutingComponent.js
@@ -58,7 +58,7 @@ function ngeoRoutingTemplateUrl($attrs, ngeoRoutingTemplateUrl) {
 
 /**
  * The controller for the routing directive.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @param {!angular.IScope} $scope Scope.
  * @param {!ngeo.routing.RoutingService} ngeoRoutingService service for OSRM routing
  * @param {!ngeo.routing.NominatimService} ngeoNominatimService service for Nominatim

diff --git a/src/routing/RoutingService.js b/src/routing/RoutingService.js
@@ -5,7 +5,7 @@
  * Service to provide access to a [Open Source Routing Machine (OSRM) backend](https://github.com/Project-OSRM/osrm-backend)
  * of version 5.8 and higher and its features.
  * @param {angular.IHttpService} $http Angular http service.
- * @param {angular.IInjectorService} $injector Main injector.
+ * @param {angular.auto.IInjectorService} $injector Main injector.
  * @constructor
  * @ngdoc service
  * @ngInject