Merge pull request #4285 from camptocamp/merge_2.2_into_2.3

Merge 2.2 into 2.3
camptocamp · Oct 3, 2018 · 7a39b38 · 7a39b38
2 parents a927197 + e3adbf1
commit 7a39b38
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/contribs/gmf/src/objectediting/component.js b/contribs/gmf/src/objectediting/component.js
@@ -986,7 +986,7 @@ exports.Controller.prototype.refreshWMSLayer_ = function() {
  * Called before the window unloads. Show a confirmation message if there are
  * unsaved modifications.
  * @param {Event} e Event.
- * @return {string} Message
+ * @return {string|undefined} Message
  * @private
  */
 exports.Controller.prototype.handleWindowBeforeUnload_ = function(e) {
@@ -996,7 +996,7 @@ exports.Controller.prototype.handleWindowBeforeUnload_ = function(e) {
     (e || window.event).returnValue = msg;
     return msg;
   }
-  return '';
+  return undefined;
 };
 
 

diff --git a/src/misc/filters.js b/src/misc/filters.js
@@ -182,27 +182,22 @@ exports.filter('ngeoUnitPrefix', exports.UnitPrefix);
 /**
  * Format a couple of numbers as number coordinates.
  *
- * Example without parameters (en-US localization):
+ * Example without parameters:
  *
  *      <p>{{[7.1234, 46.9876] | ngeoNumberCoordinates}}</p>
  *      <!-- will Become 7 47 -->
  *
  * Example with defined fractionDigits and template (en-US localization):
  *
+ *      <!-- With en-US localization -->
  *      <p>{{[7.1234, 46.9876] | ngeoNumberCoordinates:2:'co {x} E; {y} N'}}</p>
  *      <!-- will Become co 7.12 E; 46.99 N -->
- *
- * Example without fractionDigits but with defined template and localize:
- *
- *      <!-- With en-US localization (opt_localize can be true or undefined) -->
- *      <p>{{[2600000, 1600000] | ngeoNumberCoordinates:0:'{x}, {y}'}}</p>
- *      <!-- will Become 2,600,000, 1,600,000 -->
  *      <br/>
- *      <!-- With fr-CH localization (opt_localize can be true or undefined) -->
+ *      <!-- With en-US localization -->
  *      <p>{{[2600000, 1600000] | ngeoNumberCoordinates:0:'{x}, {y}'}}</p>
- *      <!-- will Become 2'600'000, 1'600'000 -->
+ *      <!-- will Become 2,600,000, 1,600,000 -->
  *      <br/>
- *      <!-- With en-US localization but with localization to false -->
+ *      <!-- With fr-CH localization -->
  *      <p>{{[2600000, 1600000] | ngeoNumberCoordinates:0:'{x}, {y}'}}</p>
  *      <!-- will Become 2'600'000, 1'600'000 -->
  *