Merge pull request #79 from renato/main

FIX: location search debounce
paviliondev · May 9, 2023 · 5358bf5 · 5358bf5
2 parents 82c446a + 5772bd1
commit 5358bf5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/assets/javascripts/discourse/components/location-selector.js.es6 b/assets/javascripts/discourse/components/location-selector.js.es6
@@ -9,11 +9,6 @@ export default TextField.extend({
   classNames: 'location-selector',
   context: null,
 
-  settings() {
-    const rootElement = getOwner(this).get('rootElement');
-    return rootElement === '#custom-wizard-main' ? Wizard.SiteSettings : this.siteSettings;
-  },
-
   didInsertElement() {
     this._super();
     let self = this;
@@ -45,8 +40,8 @@ export default TextField.extend({
 
         self.set('loading', true);
 
-        return geoLocationSearch(request, self.get('settings.location_geocoding_debounce')).then((result) => {
-          const defaultProvider = self.get('settings.location_geocoding_provider');
+        return geoLocationSearch(request, self.siteSettings.location_geocoding_debounce).then((result) => {
+          const defaultProvider = self.siteSettings.location_geocoding_provider;
           const geoAttrs = self.get('geoAttrs');
           const showType = self.get('showType');
           let locations = [];

diff --git a/assets/javascripts/discourse/lib/location-utilities.js.es6 b/assets/javascripts/discourse/lib/location-utilities.js.es6
@@ -29,14 +29,14 @@ let geoLocationSearch = (request, location_geocoding_debounce) => {
   return new Promise(function (resolve, reject) {
     debounce(
       this,
-      function () {
-        locationSearch(request, function (r) {
-          if (r.error) {
-            reject(r.message);
-          } else {
-            resolve(r);
-          }
-        });
+      locationSearch,
+      request,
+      function (r) {
+        if (r.error) {
+          reject(r.message);
+        } else {
+          resolve(r);
+        }
       },
       location_geocoding_debounce
     );