Changeset 2956984

Timestamp:

08/22/2023 07:26:15 PM (2 years ago)

Author:

skirridsystems

Message:

Version 1.7.0 released

Location:

os-datahub-maps/trunk

Files:

• Changelog.txt (modified) (1 diff)
• Readme.txt (modified) (3 diffs)
• js/os-datahub-maps.js (modified) (4 diffs)
• os-datahub-maps.php (modified) (2 diffs)

os-datahub-maps/trunk/Changelog.txt

@@ -1 +1 @@
 == Changelog ==
+
+= 1.7.0 =
+Bug: Fix gesture handling always being turned on when map leaves fullscreen
+Change: Limit popup height on markers to height of map.
 
 = 1.6.2 =

os-datahub-maps/trunk/Readme.txt

@@ -4 +4 @@
 Requires PHP: 5.6.0
 Requires at least: 4.5
-Tested up to: 6.1
-Stable tag: 1.6.2
+Tested up to: 6.3
+Stable tag: 1.7.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -71 +71 @@
 == Changelog ==
 
-= 1.6.2 =
-Change: Always delay JS execution until page load is complete.
-
-= 1.6.1 =
-Bug: New files missing from 1.6.0 release added.
-
-= 1.6.0 =
-New: Add support for showing current location on map.
-Change: Move two items from global settings section to default settings section as they can be overridden.
+= 1.7.0 =
+Bug: Fix gesture handling always being turned on when map leaves fullscreen
+New: Limit popup height on markers to height of map.
 
 For previous versions please refer to Changelog.txt
@@ -85 +79 @@
 == Upgrade Notice ==
 
-= 1.6.0 =
+= 1.7.0 =
 New feature.

os-datahub-maps/trunk/js/os-datahub-maps.js

@@ -122 +122 @@
         }
         const mapIdent = 'os-datahub-map-' + options.mapId;
+        const mapDiv = document.getElementById(mapIdent);
         const gestures = (options.gestures === 'mobile') ? L.Browser.mobile : options.gestures;
         const mapOptions = {
@@ -173 +174 @@
                 if (map.isFullscreen()) {
                     map.gestureHandling.disable();
-                } else {
+                } else if (gestures) {
                     map.gestureHandling.enable();
                 }
@@ -284 +285 @@
         }
         // Add OS branding logo
-        const mapDiv = document.getElementById(mapIdent);
         const logoDiv = document.createElement('div');
         logoDiv.className = 'os-api-logo';
@@ -586 +586 @@
         // Handler for timed popups.
         function addPopup(layer, text) {
-            let popupTimer;
-            layer.bindPopup(text);
+            let popupOptions = {};
+            if (!options.popup) {
+                // This doesn't currently work within a popup window.
+                const popupMargin = 40;
+                popupOptions.maxHeight = mapDiv.clientHeight - popupMargin;
+                popupOptions.maxWidth = Math.min(mapDiv.clientWidth - popupMargin, 300);
+            };
+            layer.bindPopup(text, popupOptions);
             if (options.hover) {
+                let popupTimer;
                 layer.on('mouseover', function(e) {
                         clearTimeout(popupTimer);

os-datahub-maps/trunk/os-datahub-maps.php

@@ -5 +5 @@
  * Plugin URI:        https://skirridsystems.co.uk/os-datahub-maps/
  * Description:       Plugin for displaying OS Maps using the Data Hub Maps API.
- * Version:           1.6.2
+ * Version:           1.7.0
  * Author:            Simon Large
  * Author             URI: https://skirridsystems.co.uk/
@@ -20 +20 @@
  * Plugin version used for cache busting
  */
-define( 'OS_DATAHUB_MAPS_VERSION', '1.6.2' );
+define( 'OS_DATAHUB_MAPS_VERSION', '1.7.0' );
 
 /**