Merge pull request #290 from kabalin/fix-admin-region-check

Fix error when Nominatim region check was aborted.
PastVu · Nov 19, 2020 · 02227b8 · 02227b8
2 parents 260add9 + 76f6f9d
commit 02227b8
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/public/js/module/admin/regionCheck.js b/public/js/module/admin/regionCheck.js
@@ -187,17 +187,14 @@ define([
         updateRegionAbort: function () {
             if (this.ownRegionsDeffered) {
                 this.ownRegionsDeffered.reject();
-                this.ownRegionsDeffered = null;
             }
 
             if (this.nominatimRegionsDeffered) {
                 this.nominatimRegionsDeffered.reject();
-                this.nominatimRegionsDeffered = null;
             }
 
             if (requestNominatim) {
                 requestNominatim.abort();
-                requestNominatim = null;
             }
         },
         updateRegion: function (geo) {
@@ -257,14 +254,21 @@ define([
                 '&accept-language=' + P.settings.lang,
                 {
                     crossDomain: true,
+
                     dataType: 'json',
                     cache: false,
                     context: this,
                 }
             );
             requestNominatim
                 .fail(function (jqXHR, textStatus, errorThrown) {
-                    if (jqXHR.responseJSON.hasOwnProperty('error')) {
+                    if (textStatus === 'abort') {
+                        // We must have clicked before previous request
+                        // finished.
+                        return;
+                    }
+
+                    if (jqXHR.responseJSON && jqXHR.responseJSON.hasOwnProperty('error')) {
                         tplObj.narr.push({ 'err': jqXHR.responseJSON.error.message });
                         console.warn('Error: ' + jqXHR.responseText);
                     } else {