Use 'one' function from jQuery to close the ngeo-popover

camptocamp · Nov 14, 2017 · e8b8bb1 · e8b8bb1
1 parent e727fe4
commit e8b8bb1
Showing 1 changed file with 6 additions and 24 deletions.
diff --git a/src/ol-ext/popover.js b/src/ol-ext/popover.js
@@ -17,13 +17,6 @@ ngeo.Popover = function(opt_options) {
 
   const options = opt_options !== undefined ? opt_options : {};
 
-  /**
-   * The key for close button 'click' event
-   * @type {?goog.events.Key}
-   * @private
-   */
-  this.clickKey_ = null;
-
   let originalEl;
   if (options.element) {
     originalEl = options.element;
@@ -66,10 +59,6 @@ ngeo.Popover.prototype.setMap = function(map) {
 
   const currentMap = this.getMap();
   if (currentMap) {
-    if (this.clickKey_) {
-      goog.events.unlistenByKey(this.clickKey_);
-      this.clickKey_ = null;
-    }
     $(element).popover('destroy');
   }
 
@@ -95,18 +84,11 @@ ngeo.Popover.prototype.setMap = function(map) {
         .popover('show');
     }, 0);
 
-    this.clickKey_ = goog.events.listen(this.closeEl_[0],
-      'click', this.handleCloseElClick_, false, this);
-  }
-};
-
-
-/**
- * @private
- */
-ngeo.Popover.prototype.handleCloseElClick_ = function() {
-  const map = this.getMap();
-  if (map) {
-    map.removeOverlay(this);
+    this.closeEl_.one('click', () => {
+      const map = this.getMap();
+      if (map) {
+        map.removeOverlay(this);
+      }
+    });
   }
 };