Adjust use of clear method on layerObj.

jorix · Aug 11, 2013 · b6c9614 · b6c9614
1 parent d95e3c8
commit b6c9614
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/lib/FeaturePopups.js b/lib/FeaturePopups.js
@@ -832,7 +832,7 @@ OpenLayers.Control.FeaturePopups = OpenLayers.Class(OpenLayers.Control, {
         var layerObj = this.getLayerObj(layer);
         if (layerObj) {
             if (this.active) {
-                this.active && layerObj.clear();
+                layerObj.clear();
                 this.controls.hover && this.controls.hover.setLayer(
                                                            this.layers.slice());
                 this.controls.select && this.controls.select.setLayer(
@@ -2022,6 +2022,7 @@ OpenLayers.Control.FeaturePopups.Layer = OpenLayers.Class({
      */
     destroy: function() {
         this.deactivate();
+        this.clear();
         this.popupObj && this.popupObj.destroy();
         this.eventListeners && this.events.un(this.eventListeners);
         this.events.destroy();
@@ -2055,7 +2056,7 @@ OpenLayers.Control.FeaturePopups.Layer = OpenLayers.Class({
     },
 
     /**
-     * APIMethod: clear
+     * Method: clear
      * Clear selection stored if <safeSelection> is true.
      */
     clear: function() {
@@ -2064,22 +2065,6 @@ OpenLayers.Control.FeaturePopups.Layer = OpenLayers.Class({
         this.selectionHash = '';
         this.staticSelectionHash = '';
         this.featuresHash = '';
-        if (this.active) {
-            if (this.selectionHash !== '') {
-                this.events.triggerEvent('selectionchanged', {
-                    layer: this.layer,
-                    control: this.control,
-                    selection: []
-                });
-            }
-            if (this.featuresHash !== '') {
-                this.events.triggerEvent('featureschanged', {
-                    layer: this.layer,
-                    control: this.control,
-                    features: []
-                });
-            }
-        }
     },
 
     /**