Changeset 809073

Timestamp:

11/22/2013 10:15:56 PM (11 years ago)

Author:

pbaylies

Message:

Bugfix release - fixed conflict with new Google API rollout, marker bubble size and position fixed, bumped version to 2.4.6.

Location:

simplemap

Files:

• tags/2.4.6 (added)
• tags/2.4.6/GNU-GPL.txt (copied) (copied from simplemap/trunk/GNU-GPL.txt)
• tags/2.4.6/classes (copied) (copied from simplemap/trunk/classes)
• tags/2.4.6/classes/simplemap.php (modified) (4 diffs)
• tags/2.4.6/inc (copied) (copied from simplemap/trunk/inc)
• tags/2.4.6/inc/images/black-dot.png (modified) (previous)
• tags/2.4.6/inc/images/blue-dot.png (modified) (previous)
• tags/2.4.6/inc/images/blue-grad.png (modified) (previous)
• tags/2.4.6/inc/images/button-red-grad-active.png (modified) (previous)
• tags/2.4.6/inc/images/button-red-grad.png (modified) (previous)
• tags/2.4.6/inc/images/green-dot.png (modified) (previous)
• tags/2.4.6/inc/images/pink-dot.png (modified) (previous)
• tags/2.4.6/inc/images/purple-dot.png (modified) (previous)
• tags/2.4.6/inc/images/red-dot.png (modified) (previous)
• tags/2.4.6/inc/images/star.png (modified) (previous)
• tags/2.4.6/inc/images/teal-dot.png (modified) (previous)
• tags/2.4.6/inc/images/white-dot.png (modified) (previous)
• tags/2.4.6/inc/images/yellow-dot.png (modified) (previous)
• tags/2.4.6/lang (copied) (copied from simplemap/trunk/lang)
• tags/2.4.6/readme.txt (copied) (copied from simplemap/trunk/readme.txt) (2 diffs)
• tags/2.4.6/screenshot-1.png (copied) (copied from simplemap/trunk/screenshot-1.png)
• tags/2.4.6/screenshot-2.png (copied) (copied from simplemap/trunk/screenshot-2.png)
• tags/2.4.6/screenshot-3.png (copied) (copied from simplemap/trunk/screenshot-3.png)
• tags/2.4.6/screenshot-4.png (copied) (copied from simplemap/trunk/screenshot-4.png)
• tags/2.4.6/screenshot-5.png (copied) (copied from simplemap/trunk/screenshot-5.png)
• tags/2.4.6/simplemap.php (copied) (copied from simplemap/trunk/simplemap.php) (2 diffs)
• trunk/classes/simplemap.php (modified) (4 diffs)
• trunk/inc/images/black-dot.png (modified) (previous)
• trunk/inc/images/blue-dot.png (modified) (previous)
• trunk/inc/images/blue-grad.png (modified) (previous)
• trunk/inc/images/button-red-grad-active.png (modified) (previous)
• trunk/inc/images/button-red-grad.png (modified) (previous)
• trunk/inc/images/green-dot.png (modified) (previous)
• trunk/inc/images/pink-dot.png (modified) (previous)
• trunk/inc/images/purple-dot.png (modified) (previous)
• trunk/inc/images/red-dot.png (modified) (previous)
• trunk/inc/images/star.png (modified) (previous)
• trunk/inc/images/teal-dot.png (modified) (previous)
• trunk/inc/images/white-dot.png (modified) (previous)
• trunk/inc/images/yellow-dot.png (modified) (previous)
• trunk/readme.txt (modified) (2 diffs)
• trunk/screenshot-1.png (modified) (previous)
• trunk/screenshot-2.png (modified) (previous)
• trunk/screenshot-3.png (modified) (previous)
• trunk/screenshot-5.png (modified) (previous)
• trunk/simplemap.php (modified) (2 diffs)

simplemap/tags/2.4.6/classes/simplemap.php

@@ -1140 +1140 @@
                         map.setZoom(parseInt(zoom_level));
                     }
-
+                    
+                    // Paranoia - fix container sizing bug -- pdb
+                    google.maps.event.addListener(map, "idle", function(){
+                        google.maps.event.trigger(map, 'resize');
+                    });
                 });
             }
@@ -1177 +1181 @@
                 markersArray.push(marker);
 
-                var mapwidth = Number(stringFilter(map_width));
-                var mapheight = Number(stringFilter(map_height));
-
-                var maxbubblewidth = Math.round(mapwidth / 1.5);
-                var maxbubbleheight = Math.round(mapheight / 2.2);
+                var mapwidth;
+                var mapheight;
+                var maxbubblewidth;
+                var maxbubbleheight;
+                
+                mapwidth = document.getElementById("simplemap");
+                if ( typeof mapwidth != 'undefined' ) {
+                    mapwidth = mapwidth.offsetWidth;
+                } else {
+                    if ( typeof map_width != 'undefined' ) {
+                        mapwidth = Number(stringFilter(map_width));                     
+                    } else {
+                        mapwidth = 400;
+                    }
+                }
+                
+                mapheight = document.getElementById("simplemap");
+                if ( typeof mapheight != 'undefined' ) {
+                    mapheight = mapheight.offsetHeight;
+                } else {
+                    if ( typeof map_height != 'undefined' ) {
+                        mapheight = Number(stringFilter(map_height));                       
+                    } else {
+                        mapheight = 200;
+                    }
+                }
+                maxbubblewidth = Math.round(mapwidth / 1.5);
+                maxbubbleheight = Math.round(mapheight / 2.2);
 
                 var fontsize = 12;
@@ -1224 +1251 @@
                     totalheight = maxbubbleheight;
                 }
-
-                var html = '<div class="markertext" style="height: ' + totalheight + 'px; overflow-y: auto; overflow-x: hidden;">';
+                
+                if ( isNaN( totalheight ) || totalheight > maxbubbleheight ) {
+                    totalheight = maxbubbleheight;
+                }
+
+                var html = '<div class="markertext" style="max-width: ' + maxbubblewidth + 'px; height: ' + totalheight + 'px; overflow-y: auto; overflow-x: hidden;">';
                 html += '<h3 style="margin-top: 0; padding-top: 0; border-top: none;">';
 
@@ -1336 +1367 @@
                 google.maps.event.addListener(marker, 'click', function() {
                     clearInfoWindows();
+
+
+
+
+
+
+
+
+
+
+
+
                     var infowindow = new google.maps.InfoWindow({
-                        maxWidth: maxbubblewidth,
+                        maxWidth: width,
                         content: html
-                    });
+                    });
                     infowindow.open(map, marker);
                     infowindowsArray.push(infowindow);

simplemap/tags/2.4.6/readme.txt

@@ -6 +6 @@
 Requires at least: 2.8
 Tested up to: 3.7.1
-Stable tag: 2.4.5
+Stable tag: 2.4.
 
 SimpleMap is an easy-to-use international store locator plugin that uses Google Maps to display information directly on your WordPress site.
@@ -82 +82 @@
 
 == Changelog ==
+
+
+
+
 
 = 2.4.5 =

simplemap/tags/2.4.6/simplemap.php

@@ -2 +2 @@
 /*
 Plugin Name: SimpleMap
-Version: 2.4.5
+Version: 2.4.
 Plugin URI: http://simplemap-plugin.com/
 Author: Michael Torbert
@@ -20 +20 @@
 
     // Plugin Version Number
-    define( 'SIMPLEMAP_VERSION', '2.4.5' );
+    define( 'SIMPLEMAP_VERSION', '2.4.' );
 
     if ( !defined( 'WP_PLUGIN_DIR' ) ) {

simplemap/trunk/classes/simplemap.php

@@ -1140 +1140 @@
                         map.setZoom(parseInt(zoom_level));
                     }
-
+                    
+                    // Paranoia - fix container sizing bug -- pdb
+                    google.maps.event.addListener(map, "idle", function(){
+                        google.maps.event.trigger(map, 'resize');
+                    });
                 });
             }
@@ -1177 +1181 @@
                 markersArray.push(marker);
 
-                var mapwidth = Number(stringFilter(map_width));
-                var mapheight = Number(stringFilter(map_height));
-
-                var maxbubblewidth = Math.round(mapwidth / 1.5);
-                var maxbubbleheight = Math.round(mapheight / 2.2);
+                var mapwidth;
+                var mapheight;
+                var maxbubblewidth;
+                var maxbubbleheight;
+                
+                mapwidth = document.getElementById("simplemap");
+                if ( typeof mapwidth != 'undefined' ) {
+                    mapwidth = mapwidth.offsetWidth;
+                } else {
+                    if ( typeof map_width != 'undefined' ) {
+                        mapwidth = Number(stringFilter(map_width));                     
+                    } else {
+                        mapwidth = 400;
+                    }
+                }
+                
+                mapheight = document.getElementById("simplemap");
+                if ( typeof mapheight != 'undefined' ) {
+                    mapheight = mapheight.offsetHeight;
+                } else {
+                    if ( typeof map_height != 'undefined' ) {
+                        mapheight = Number(stringFilter(map_height));                       
+                    } else {
+                        mapheight = 200;
+                    }
+                }
+                maxbubblewidth = Math.round(mapwidth / 1.5);
+                maxbubbleheight = Math.round(mapheight / 2.2);
 
                 var fontsize = 12;
@@ -1224 +1251 @@
                     totalheight = maxbubbleheight;
                 }
-
-                var html = '<div class="markertext" style="height: ' + totalheight + 'px; overflow-y: auto; overflow-x: hidden;">';
+                
+                if ( isNaN( totalheight ) || totalheight > maxbubbleheight ) {
+                    totalheight = maxbubbleheight;
+                }
+
+                var html = '<div class="markertext" style="max-width: ' + maxbubblewidth + 'px; height: ' + totalheight + 'px; overflow-y: auto; overflow-x: hidden;">';
                 html += '<h3 style="margin-top: 0; padding-top: 0; border-top: none;">';
 
@@ -1336 +1367 @@
                 google.maps.event.addListener(marker, 'click', function() {
                     clearInfoWindows();
+
+
+
+
+
+
+
+
+
+
+
+
                     var infowindow = new google.maps.InfoWindow({
-                        maxWidth: maxbubblewidth,
+                        maxWidth: width,
                         content: html
-                    });
+                    });
                     infowindow.open(map, marker);
                     infowindowsArray.push(infowindow);

simplemap/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 2.8
 Tested up to: 3.7.1
-Stable tag: 2.4.5
+Stable tag: 2.4.
 
 SimpleMap is an easy-to-use international store locator plugin that uses Google Maps to display information directly on your WordPress site.
@@ -82 +82 @@
 
 == Changelog ==
+
+
+
+
 
 = 2.4.5 =

simplemap/trunk/simplemap.php

@@ -2 +2 @@
 /*
 Plugin Name: SimpleMap
-Version: 2.4.5
+Version: 2.4.
 Plugin URI: http://simplemap-plugin.com/
 Author: Michael Torbert
@@ -20 +20 @@
 
     // Plugin Version Number
-    define( 'SIMPLEMAP_VERSION', '2.4.5' );
+    define( 'SIMPLEMAP_VERSION', '2.4.' );
 
     if ( !defined( 'WP_PLUGIN_DIR' ) ) {