Correct operation of controls.select.unselectAll when using selection…

… storage.
jorix · Mar 19, 2012 · 23e4fc9 · 23e4fc9
1 parent bb86770
commit 23e4fc9
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/FeaturePopups.js b/lib/FeaturePopups.js
@@ -286,12 +286,16 @@ OpenLayers.Control.FeaturePopups = OpenLayers.Class(OpenLayers.Control, {
             var self = this;
             this.controls.select.unselectAll = OpenLayers.Function.bind(
                 function (options) {
-                    OpenLayers.Control.SelectFeature.prototype.unselectAll.apply(
-                                              this, arguments);
-                    if (!self.refreshSelection && self.safeSelection) {
+                    var safeSelection = (!self.refreshSelection && self.safeSelection);
+                    if (safeSelection) {
                         self.selectionStorage = {};
                     }
-                    if (options) {
+                    OpenLayers.Control.SelectFeature.prototype.unselectAll.apply(
+                                              this, arguments);
+                    if (options && options.except) {
+                        if (safeSelection) {
+                            self.storeAsSelected(options.except);
+                        }
                         self.showAllSelectedFeatures();
                     }
                 },