Fix function apply, better no value

camptocamp · Oct 25, 2018 · a125d41 · a125d41
1 parent b57022d
commit a125d41
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/contribs/gmf/src/raster/component.js b/contribs/gmf/src/raster/component.js
@@ -127,13 +127,14 @@ exports.directive('gmfElevation', exports.component_);
  * @param {!angular.$filter} $filter Angular filter.
  * @param {!ngeox.miscDebounce} ngeoDebounce Ngeo debounce factory
  * @param {!gmf.raster.RasterService} gmfRaster Gmf Raster service
+ * @param {!angularGettext.Catalog} gettextCatalog Gettext catalog.
  * @constructor
  * @private
  * @ngInject
  * @ngdoc controller
  * @ngname gmfElevationController
  */
-exports.Controller_ = function($scope, $filter, ngeoDebounce, gmfRaster) {
+exports.Controller_ = function($scope, $filter, ngeoDebounce, gmfRaster, gettextCatalog) {
 
   /**
    * @type {!angular.$filter}
@@ -153,6 +154,12 @@ exports.Controller_ = function($scope, $filter, ngeoDebounce, gmfRaster) {
    */
   this.gmfRaster_ = gmfRaster;
 
+  /**
+   * @type {angularGettext.Catalog}
+   * @private
+   */
+  this.gettextCatalog = gettextCatalog;
+
   /**
    * @type {!Object.<string, gmf.raster.component.LayerConfig>}
    * @private
@@ -281,9 +288,10 @@ exports.Controller_.prototype.getRasterSuccess_ = function(resp) {
     const separator = postfix.length > 0 ?
       (options.hasOwnProperty('separator') ? options.separator : '\u00a0') : '';
     const args = Array.prototype.concat([value], custom_args);
-    this.elevation = this.filter_(filter).apply(args) + separator + postfix;
+    this.elevation = this.filter_(filter)(...args) + separator + postfix;
   } else {
-    this.elevation = undefined;
+    const gettextCatalog = this.gettextCatalog;
+    this.elevation = gettextCatalog.getString('No value');
   }
   this.loading = false;
 };

diff --git a/contribs/gmf/src/raster/widgetComponent.html b/contribs/gmf/src/raster/widgetComponent.html
@@ -13,7 +13,7 @@
     <span class="gmf-elevationwidget-value">
       {{ctrl.elevationValue}}
       <span ng-show="ctrl.elevationLoading" class="fa fa-spinner"></span>
-      <span ng-show="!ctrl.elevationValue && !ctrl.elevationLoading" translate>Elevation…</span>
+      <span ng-show="!ctrl.elevationValue == undefined && !ctrl.elevationLoading" translate>Elevation…</span>
     </span><span class="caret" ng-if="::ctrl.layers.length > 1"></span>
   </a>
   <ul class="dropdown-menu dropdown-menu-right" role="menu"