Merge pull request #3 from contao-estatemanager/support/1.0

Support/1.0
contao-estatemanager · Oct 27, 2022 · 07e292e · 07e292e
2 parents cc2c89a + 1782d01
commit 07e292e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,8 @@
   ],
   "require":{
     "php":"^7.4 || ^8.0",
-    "contao/core-bundle":"^4.4",
+    "ext-mbstring": "*",
+    "contao/core-bundle":"^4.9",
     "contao-estatemanager/core": "^1.0",
     "contao-estatemanager/google-services": "^1.0"
   },

diff --git a/src/Resources/contao/modules/ExposeModuleGoogleMap.php b/src/Resources/contao/modules/ExposeModuleGoogleMap.php
@@ -16,7 +16,6 @@
 use Contao\BackendTemplate;
 use Contao\Config;
 use ContaoEstateManager\ExposeModule;
-use Patchwork\Utf8;
 
 /**
  * Expose module "google map".
@@ -33,7 +32,7 @@ class ExposeModuleGoogleMap extends ExposeModule
     protected $strTemplate = 'expose_mod_googlemap';
 
     /**
-     * Do not display the module if there are no real etates.
+     * Do not display the module if there are no real estates.
      *
      * @return string
      */
@@ -42,7 +41,7 @@ public function generate()
         if (TL_MODE === 'BE')
         {
             $objTemplate = new BackendTemplate('be_wildcard');
-            $objTemplate->wildcard = '### '.Utf8::strtoupper($GLOBALS['TL_LANG']['FMD']['virtual_tour'][0]).' ###';
+            $objTemplate->wildcard = '### '. mb_strtoupper($GLOBALS['TL_LANG']['FMD']['virtual_tour'][0], 'UTF-8') . ' ###';
             $objTemplate->title = $this->headline;
             $objTemplate->id = $this->id;
             $objTemplate->link = $this->name;

diff --git a/src/Resources/contao/modules/ModuleRealEstateGoogleMap.php b/src/Resources/contao/modules/ModuleRealEstateGoogleMap.php
@@ -14,8 +14,8 @@
 namespace ContaoEstateManager\GoogleMaps;
 
 use Contao\BackendTemplate;
+use Contao\Config;
 use ContaoEstateManager\ModuleRealEstate;
-use Patchwork\Utf8;
 
 /**
  * Front end module "real estate google map".
@@ -41,7 +41,7 @@ public function generate()
         if (TL_MODE === 'BE')
         {
             $objTemplate = new BackendTemplate('be_wildcard');
-            $objTemplate->wildcard = '### '.Utf8::strtoupper($GLOBALS['TL_LANG']['FMD']['realEstateGoogleMap'][0]).' ###';
+            $objTemplate->wildcard = '### '. mb_strtoupper($GLOBALS['TL_LANG']['FMD']['realEstateGoogleMap'][0], 'UTF-8') . ' ###';
             $objTemplate->title = $this->headline;
             $objTemplate->id = $this->id;
             $objTemplate->link = $this->name;
@@ -103,7 +103,7 @@ protected function compile(): void
                     'filterMode' => $this->filterMode,
                     'groups' => $this->realEstateGroups,
                     'pageId' => $objPage->id,
-                    'moduleId' => $this->id,
+                    'moduleId' => $this->id
                 ],
             ],
             'popup' => [

diff --git a/src/Resources/public/google-maps-viewer/google-maps-viewer.js b/src/Resources/public/google-maps-viewer/google-maps-viewer.js
@@ -491,23 +491,3 @@ var GoogleMapsViewer = (function () {
 
     return Constructor;
 })();
-
-/**
- * Listen to Google Callback for start building the map
- */
-function onGoogleMapsApiReady (e){
-    if (document.readyState !== 'complete') {
-        var stateCheck = setInterval(function() {
-            if (document.readyState === 'complete') {
-                clearInterval(stateCheck);
-                onGoogleMapsApiReady(e);
-            }
-        }, 100);
-
-        return false;
-    }
-
-    var customOnReadyEvent = new CustomEvent('googlemaps.onApiReady', {detail: e});
-
-    document.dispatchEvent(customOnReadyEvent);
-}