WP Google Maps - Version 7.10.34

Version Description

:- 2018-09-17 :- Low priority = * Added descriptive error messages when Google API is required but not loaded * Added "I agree" translation to German files * Added getPluginScripts to Scriptloader module * jQuery 3.x document ready compatibility * Changed wpgmza_google_api_status to be passed via wp_localize_script to prevent redirection issues in some circumstances * Prevented UGM e-mail address being transmitted in WPGMZA_localized_data * Removed redundant locationSelect dropdown

Download this release

Release Info

Developer perryrylance
Plugin Icon 128x128 WP Google Maps
Version 7.10.34
Comparing to
See all releases

Code changes from version 7.10.33 to 7.10.34

Files changed (68) hide show
  1. base/includes/wp-google-maps-polygons.php +2 -2
  2. base/includes/wp-google-maps-polylines.php +2 -2
  3. includes/build.log +136 -136
  4. includes/class.auto-loader.php +0 -2
  5. includes/class.google-maps-api-loader.php +2 -1
  6. includes/class.plugin.php +5 -1
  7. includes/class.script-loader.php +41 -26
  8. includes/class.strings.php +2 -0
  9. js/admin-basic.js +126 -129
  10. js/media.js +1 -1
  11. js/usage_tracking.js +1 -1
  12. js/v8/circle.js +2 -2
  13. js/v8/compatibility.js +2 -2
  14. js/v8/compatibility/google-ui-compatibility.js +2 -2
  15. js/v8/core.js +3 -3
  16. js/v8/distance.js +2 -2
  17. js/v8/event-dispatcher.js +2 -2
  18. js/v8/event.js +2 -2
  19. js/v8/friendly-error.js +2 -2
  20. js/v8/geocoder.js +2 -2
  21. js/v8/google-api-error-handler.js +5 -2
  22. js/v8/google-maps/google-circle.js +2 -2
  23. js/v8/google-maps/google-geocoder.js +2 -2
  24. js/v8/google-maps/google-info-window.js +2 -2
  25. js/v8/google-maps/google-map.js +4 -3
  26. js/v8/google-maps/google-marker.js +2 -2
  27. js/v8/google-maps/google-modern-store-locator-circle.js +2 -2
  28. js/v8/google-maps/google-modern-store-locator.js +2 -2
  29. js/v8/google-maps/google-polygon.js +2 -2
  30. js/v8/google-maps/google-polyline.js +2 -2
  31. js/v8/google-maps/google-vertex-context-menu.js +2 -2
  32. js/v8/info-window.js +2 -2
  33. js/v8/latlng.js +10 -2
  34. js/v8/latlngbounds.js +2 -2
  35. js/v8/map-object.js +2 -2
  36. js/v8/map-settings-page.js +3 -3
  37. js/v8/map-settings.js +2 -2
  38. js/v8/map.js +2 -2
  39. js/v8/maps-engine-dialog.js +2 -2
  40. js/v8/marker.js +2 -2
  41. js/v8/modern-store-locator-circle.js +2 -2
  42. js/v8/modern-store-locator.js +2 -2
  43. js/v8/open-layers/ol-circle.js +2 -2
  44. js/v8/open-layers/ol-geocoder.js +3 -3
  45. js/v8/open-layers/ol-info-window.js +2 -2
  46. js/v8/open-layers/ol-map.js +2 -2
  47. js/v8/open-layers/ol-marker.js +2 -2
  48. js/v8/open-layers/ol-modern-store-locator-circle.js +2 -2
  49. js/v8/open-layers/ol-modern-store-locator.js +2 -2
  50. js/v8/open-layers/ol-polygon.js +2 -2
  51. js/v8/open-layers/ol-polyline.js +2 -2
  52. js/v8/polygon.js +2 -2
  53. js/v8/polyline.js +2 -2
  54. js/v8/rest-api.js +2 -2
  55. js/v8/version.js +2 -2
  56. js/wp-google-maps-full-screen-map.js +1 -1
  57. js/wp-google-maps.js +15 -19
  58. js/wpgmaps-admin-core.js +10 -1
  59. js/wpgmaps.js +67 -62
  60. js/wpgmaps_osm.js +32 -34
  61. js/wpgmaps_plugin_row.js +1 -1
  62. js/wpgmaps_tabs.js +2 -6
  63. languages/wp-google-maps-de_DE.mo +0 -0
  64. languages/wp-google-maps-de_DE.po +3 -0
  65. lib/codecabin/deactivate-feedback-form.js +7 -11
  66. readme.txt +12 -0
  67. upload.js +2 -1
  68. wpGoogleMaps.php +27 -9
base/includes/wp-google-maps-polygons.php CHANGED
@@ -249,7 +249,7 @@ function wpgmaps_b_admin_add_poly_javascript($mapid) {
249
  ?>
250
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
251
  <script type="text/javascript" >
252
- jQuery(document).ready(function(){
253
  function wpgmza_InitMap() {
254
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
255
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);
@@ -464,7 +464,7 @@ function wpgmaps_b_admin_edit_poly_javascript($mapid,$polyid) {
464
  var poly_markers = [];
465
  var poly_path = new google.maps.MVCArray;
466
 
467
- jQuery(document).ready(function(){
468
 
469
  function wpgmza_InitMap() {
470
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
249
  ?>
250
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
251
  <script type="text/javascript" >
252
+ jQuery(function($) {
253
  function wpgmza_InitMap() {
254
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
255
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);
464
  var poly_markers = [];
465
  var poly_path = new google.maps.MVCArray;
466
 
467
+ jQuery(function($) {
468
 
469
  function wpgmza_InitMap() {
470
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
base/includes/wp-google-maps-polylines.php CHANGED
@@ -249,7 +249,7 @@ function wpgmaps_b_admin_add_polyline_javascript($mapid) {
249
  ?>
250
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
251
  <script type="text/javascript" >
252
- jQuery(document).ready(function(){
253
  function wpgmza_InitMap() {
254
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
255
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);
@@ -472,7 +472,7 @@ function wpgmaps_b_admin_edit_polyline_javascript($mapid,$polyid) {
472
  var poly_path = new google.maps.MVCArray;
473
  var path;
474
 
475
- jQuery(document).ready(function(){
476
 
477
  function wpgmza_InitMap() {
478
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
249
  ?>
250
  <link rel='stylesheet' id='wpgooglemaps-css' href='<?php echo wpgmaps_get_plugin_url(); ?>/css/wpgmza_style.css' type='text/css' media='all' />
251
  <script type="text/javascript" >
252
+ jQuery(function($) {
253
  function wpgmza_InitMap() {
254
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
255
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);
472
  var poly_path = new google.maps.MVCArray;
473
  var path;
474
 
475
+ jQuery(function($) {
476
 
477
  function wpgmza_InitMap() {
478
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
includes/build.log CHANGED
@@ -1,136 +1,136 @@
1
- 2018-09-05 13:28:13 :- Scanning dependencies
2
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/circle.js
3
- 2018-09-05 13:28:13 :- Found wpgmza-circle
4
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-map-object
5
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/compatibility.js
6
- 2018-09-05 13:28:13 :- Found wpgmza-compatibility
7
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
8
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/core.js
9
- 2018-09-05 13:28:13 :- Found wpgmza
10
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/css-escape.js
11
- 2018-09-05 13:28:13 :- Found wpgmza-wpgmza-css
12
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
13
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/distance.js
14
- 2018-09-05 13:28:13 :- Found wpgmza-distance
15
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
16
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/event-dispatcher.js
17
- 2018-09-05 13:28:13 :- Found wpgmza-event-dispatcher
18
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
19
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/event.js
20
- 2018-09-05 13:28:13 :- Found wpgmza-event
21
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
22
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/friendly-error.js
23
- 2018-09-05 13:28:13 :- Found wpgmza-friendly-error
24
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
25
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/geocoder.js
26
- 2018-09-05 13:28:13 :- Found wpgmza-geocoder
27
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
28
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-api-error-handler.js
29
- 2018-09-05 13:28:13 :- Found wpgmza-google-api-error-handler
30
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
31
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/info-window.js
32
- 2018-09-05 13:28:13 :- Found wpgmza-info-window
33
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-event-dispatcher
34
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/latlng.js
35
- 2018-09-05 13:28:13 :- Found wpgmza-lat-lng
36
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
37
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/latlngbounds.js
38
- 2018-09-05 13:28:13 :- Found wpgmza-lat-lng-bounds
39
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
40
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map-object.js
41
- 2018-09-05 13:28:13 :- Found wpgmza-map-object
42
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-event-dispatcher
43
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map-settings-page.js
44
- 2018-09-05 13:28:13 :- Found wpgmza-map-settings-page
45
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
46
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map-settings.js
47
- 2018-09-05 13:28:13 :- Found wpgmza-map-settings
48
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
49
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map.js
50
- 2018-09-05 13:28:13 :- Found wpgmza-map
51
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-event-dispatcher
52
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/maps-engine-dialog.js
53
- 2018-09-05 13:28:13 :- Found wpgmza-maps-engine-dialog
54
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
55
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/marker.js
56
- 2018-09-05 13:28:13 :- Found wpgmza-marker
57
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
58
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator-circle.js
59
- 2018-09-05 13:28:13 :- Found wpgmza-modern-store-locator-circle
60
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
61
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator.js
62
- 2018-09-05 13:28:13 :- Found wpgmza-modern-store-locator
63
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
64
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/polygon.js
65
- 2018-09-05 13:28:13 :- Found wpgmza-polygon
66
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-map-object
67
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/polyline.js
68
- 2018-09-05 13:28:13 :- Found wpgmza-polyline
69
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-map-object
70
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/rest-api.js
71
- 2018-09-05 13:28:13 :- Found wpgmza-wpgmza-rest-api
72
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
73
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/v7-custom-script.js
74
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/version.js
75
- 2018-09-05 13:28:13 :- Found wpgmza-version
76
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
77
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/compatibility/google-ui-compatibility.js
78
- 2018-09-05 13:28:13 :- Found wpgmza-google-ui-compatibility
79
- 2018-09-05 13:28:13 :- Adding dependency wpgmza
80
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-circle.js
81
- 2018-09-05 13:28:13 :- Found wpgmza-google-circle
82
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-circle
83
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-geocoder.js
84
- 2018-09-05 13:28:13 :- Found wpgmza-google-geocoder
85
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-geocoder
86
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-info-window.js
87
- 2018-09-05 13:28:13 :- Found wpgmza-google-info-window
88
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-info-window
89
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-map.js
90
- 2018-09-05 13:28:13 :- Found wpgmza-google-map
91
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-map
92
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-marker.js
93
- 2018-09-05 13:28:13 :- Found wpgmza-google-marker
94
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-marker
95
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator-circle.js
96
- 2018-09-05 13:28:13 :- Found wpgmza-google-modern-store-locator-circle
97
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-modern-store-locator-circle
98
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator.js
99
- 2018-09-05 13:28:13 :- Found wpgmza-google-modern-store-locator
100
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-modern-store-locator
101
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polygon.js
102
- 2018-09-05 13:28:13 :- Found wpgmza-google-polygon
103
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-polygon
104
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polyline.js
105
- 2018-09-05 13:28:13 :- Found wpgmza-google-polyline
106
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-polyline
107
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-vertex-context-menu.js
108
- 2018-09-05 13:28:13 :- Found wpgmza-google-vertex-context-menu
109
- 2018-09-05 13:28:13 :- Adding dependency wpgmza_api_call
110
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-circle.js
111
- 2018-09-05 13:28:13 :- Found wpgmza-ol-circle
112
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-circle
113
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-geocoder.js
114
- 2018-09-05 13:28:13 :- Found wpgmza-ol-geocoder
115
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-geocoder
116
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-info-window.js
117
- 2018-09-05 13:28:13 :- Found wpgmza-ol-info-window
118
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-info-window
119
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-map.js
120
- 2018-09-05 13:28:13 :- Found wpgmza-ol-map
121
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-map
122
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-marker.js
123
- 2018-09-05 13:28:13 :- Found wpgmza-ol-marker
124
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-marker
125
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator-circle.js
126
- 2018-09-05 13:28:13 :- Found wpgmza-ol-modern-store-locator-circle
127
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-modern-store-locator-circle
128
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator.js
129
- 2018-09-05 13:28:13 :- Found wpgmza-ol-modern-store-locator
130
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-modern-store-locator
131
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polygon.js
132
- 2018-09-05 13:28:13 :- Found wpgmza-ol-polygon
133
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-polygon
134
- 2018-09-05 13:28:13 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polyline.js
135
- 2018-09-05 13:28:13 :- Found wpgmza-ol-polyline
136
- 2018-09-05 13:28:13 :- Adding dependency wpgmza-polyline
1
+ 2018-09-17 09:40:54 :- Scanning dependencies
2
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/circle.js
3
+ 2018-09-17 09:40:54 :- Found wpgmza-circle
4
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-map-object
5
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/compatibility.js
6
+ 2018-09-17 09:40:54 :- Found wpgmza-compatibility
7
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
8
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/core.js
9
+ 2018-09-17 09:40:54 :- Found wpgmza
10
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/css-escape.js
11
+ 2018-09-17 09:40:54 :- Found wpgmza-wpgmza-css
12
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
13
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/distance.js
14
+ 2018-09-17 09:40:54 :- Found wpgmza-distance
15
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
16
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/event-dispatcher.js
17
+ 2018-09-17 09:40:54 :- Found wpgmza-event-dispatcher
18
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
19
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/event.js
20
+ 2018-09-17 09:40:54 :- Found wpgmza-event
21
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
22
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/friendly-error.js
23
+ 2018-09-17 09:40:54 :- Found wpgmza-friendly-error
24
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
25
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/geocoder.js
26
+ 2018-09-17 09:40:54 :- Found wpgmza-geocoder
27
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
28
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-api-error-handler.js
29
+ 2018-09-17 09:40:54 :- Found wpgmza-google-api-error-handler
30
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
31
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/info-window.js
32
+ 2018-09-17 09:40:54 :- Found wpgmza-info-window
33
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-event-dispatcher
34
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/latlng.js
35
+ 2018-09-17 09:40:54 :- Found wpgmza-lat-lng
36
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
37
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/latlngbounds.js
38
+ 2018-09-17 09:40:54 :- Found wpgmza-lat-lng-bounds
39
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
40
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/map-object.js
41
+ 2018-09-17 09:40:54 :- Found wpgmza-map-object
42
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-event-dispatcher
43
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/map-settings-page.js
44
+ 2018-09-17 09:40:54 :- Found wpgmza-map-settings-page
45
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
46
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/map-settings.js
47
+ 2018-09-17 09:40:54 :- Found wpgmza-map-settings
48
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
49
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/map.js
50
+ 2018-09-17 09:40:54 :- Found wpgmza-map
51
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-event-dispatcher
52
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/maps-engine-dialog.js
53
+ 2018-09-17 09:40:54 :- Found wpgmza-maps-engine-dialog
54
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
55
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/marker.js
56
+ 2018-09-17 09:40:54 :- Found wpgmza-marker
57
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
58
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator-circle.js
59
+ 2018-09-17 09:40:54 :- Found wpgmza-modern-store-locator-circle
60
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
61
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator.js
62
+ 2018-09-17 09:40:54 :- Found wpgmza-modern-store-locator
63
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
64
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/polygon.js
65
+ 2018-09-17 09:40:54 :- Found wpgmza-polygon
66
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-map-object
67
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/polyline.js
68
+ 2018-09-17 09:40:54 :- Found wpgmza-polyline
69
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-map-object
70
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/rest-api.js
71
+ 2018-09-17 09:40:54 :- Found wpgmza-wpgmza-rest-api
72
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
73
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/v7-custom-script.js
74
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/version.js
75
+ 2018-09-17 09:40:54 :- Found wpgmza-version
76
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
77
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/compatibility/google-ui-compatibility.js
78
+ 2018-09-17 09:40:54 :- Found wpgmza-google-ui-compatibility
79
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza
80
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-circle.js
81
+ 2018-09-17 09:40:54 :- Found wpgmza-google-circle
82
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-circle
83
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-geocoder.js
84
+ 2018-09-17 09:40:54 :- Found wpgmza-google-geocoder
85
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-geocoder
86
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-info-window.js
87
+ 2018-09-17 09:40:54 :- Found wpgmza-google-info-window
88
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-info-window
89
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-map.js
90
+ 2018-09-17 09:40:54 :- Found wpgmza-google-map
91
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-map
92
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-marker.js
93
+ 2018-09-17 09:40:54 :- Found wpgmza-google-marker
94
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-marker
95
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator-circle.js
96
+ 2018-09-17 09:40:54 :- Found wpgmza-google-modern-store-locator-circle
97
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-modern-store-locator-circle
98
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator.js
99
+ 2018-09-17 09:40:54 :- Found wpgmza-google-modern-store-locator
100
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-modern-store-locator
101
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polygon.js
102
+ 2018-09-17 09:40:54 :- Found wpgmza-google-polygon
103
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-polygon
104
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polyline.js
105
+ 2018-09-17 09:40:54 :- Found wpgmza-google-polyline
106
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-polyline
107
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-vertex-context-menu.js
108
+ 2018-09-17 09:40:54 :- Found wpgmza-google-vertex-context-menu
109
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza_api_call
110
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-circle.js
111
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-circle
112
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-circle
113
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-geocoder.js
114
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-geocoder
115
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-geocoder
116
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-info-window.js
117
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-info-window
118
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-info-window
119
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-map.js
120
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-map
121
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-map
122
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-marker.js
123
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-marker
124
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-marker
125
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator-circle.js
126
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-modern-store-locator-circle
127
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-modern-store-locator-circle
128
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator.js
129
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-modern-store-locator
130
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-modern-store-locator
131
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polygon.js
132
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-polygon
133
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-polygon
134
+ 2018-09-17 09:40:54 :- Reading E:\Programming\Code Cabin\htdocs-7.10.x\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polyline.js
135
+ 2018-09-17 09:40:54 :- Found wpgmza-ol-polyline
136
+ 2018-09-17 09:40:54 :- Adding dependency wpgmza-polyline
includes/class.auto-loader.php CHANGED
@@ -2,8 +2,6 @@
2
 
3
  namespace WPGMZA;
4
 
5
- //var_dump("Autoloader included");
6
-
7
  class AutoLoader
8
  {
9
  protected $filenamesByClass;
2
 
3
  namespace WPGMZA;
4
 
 
 
5
  class AutoLoader
6
  {
7
  protected $filenamesByClass;
includes/class.google-maps-api-loader.php CHANGED
@@ -31,7 +31,8 @@ class GoogleMapsAPILoader
31
  $include_allowed = $this->isIncludeAllowed($status);
32
  $isAllowed = $this->isIncludeAllowed($status);
33
 
34
- echo "<script>var wpgmza_google_api_status = " . json_encode($status) . "</script>";
 
35
  }
36
 
37
  public static function _createInstance()
31
  $include_allowed = $this->isIncludeAllowed($status);
32
  $isAllowed = $this->isIncludeAllowed($status);
33
 
34
+ wp_enqueue_script('wpgmza_data', plugin_dir_url(__DIR__) . 'wpgmza_data.js');
35
+ wp_localize_script('wpgmza_data', 'wpgmza_google_api_status', (array)$status);
36
  }
37
 
38
  public static function _createInstance()
includes/class.plugin.php CHANGED
@@ -158,6 +158,10 @@ class Plugin
158
 
159
  $strings = new Strings();
160
 
 
 
 
 
161
  return apply_filters('wpgmza_plugin_get_localized_data', array(
162
  'ajaxurl' => admin_url('admin-ajax.php'),
163
  'resturl' => get_rest_url(null, 'wpgmza/v1'),
@@ -166,7 +170,7 @@ class Plugin
166
  'googleMapsAPIErrorDialog' => $googleMapsAPIErrorDialogHTML
167
  ),
168
 
169
- 'settings' => $this->settings,
170
  'currentPage' => $this->getCurrentPage(),
171
  'userCanAdministrator' => (current_user_can('administrator') ? 1 : 0),
172
 
158
 
159
  $strings = new Strings();
160
 
161
+ $settings = clone $this->settings;
162
+ if(isset($settings->wpgmza_settings_ugm_email_address))
163
+ unset($settings->wpgmza_settings_ugm_email_address);
164
+
165
  return apply_filters('wpgmza_plugin_get_localized_data', array(
166
  'ajaxurl' => admin_url('admin-ajax.php'),
167
  'resturl' => get_rest_url(null, 'wpgmza/v1'),
170
  'googleMapsAPIErrorDialog' => $googleMapsAPIErrorDialogHTML
171
  ),
172
 
173
+ 'settings' => $settings,
174
  'currentPage' => $this->getCurrentPage(),
175
  'userCanAdministrator' => (current_user_can('administrator') ? 1 : 0),
176
 
includes/class.script-loader.php CHANGED
@@ -309,33 +309,14 @@ class ScriptLoader
309
  wp_enqueue_style('remodal-default-theme', plugin_dir_url(__DIR__) . 'lib/remodal-default-theme.css');
310
  }
311
 
312
- public function enqueueScripts()
 
 
 
 
313
  {
314
  global $wpgmza;
315
 
316
- // Get library scripts
317
- $libraries = $this->getLibraryScripts();
318
-
319
- // Enqueue Google API call if necessary
320
- switch($wpgmza->settings->engine)
321
- {
322
- case 'google-maps':
323
- $loader = ($wpgmza->isProVersion() ? new GoogleProMapsLoader() : new GoogleMapsLoader());
324
- $loader->loadGoogleMaps();
325
- break;
326
-
327
- default:
328
- $loader = new OLLoader();
329
- $loader->loadOpenLayers();
330
- break;
331
- }
332
-
333
- // Enqueue library scripts first
334
- foreach($libraries as $handle => $src)
335
- {
336
- wp_enqueue_script($handle, $src, array('jquery'));
337
- }
338
-
339
  if($wpgmza->isUsingMinifiedScripts())
340
  {
341
  $dir = ($this->proMode ? plugin_dir_path(WPGMZA_PRO_FILE) : plugin_dir_path(__DIR__));
@@ -353,7 +334,7 @@ class ScriptLoader
353
  if(!$minified_file_exists || $delta > 0)
354
  $src = $combined;
355
 
356
- $this->scripts = array('wpgmza' =>
357
  (object)array(
358
  'src' => $src,
359
  'pro' => $this->proMode
@@ -363,7 +344,37 @@ class ScriptLoader
363
  else
364
  {
365
  // Enqueue core object with library dependencies
366
- $this->scripts = (array)json_decode(file_get_contents($this->scriptsFileLocation));
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
367
  }
368
 
369
  // FontAwesome?
@@ -385,9 +396,13 @@ class ScriptLoader
385
  break;
386
  }
387
 
 
 
 
388
  // Give the core script library dependencies
389
  $dependencies = array_keys($libraries);
390
 
 
391
  $apiLoader = new GoogleMapsAPILoader();
392
  if($apiLoader->isIncludeAllowed())
393
  $dependencies[] = 'wpgmza_api_call';
309
  wp_enqueue_style('remodal-default-theme', plugin_dir_url(__DIR__) . 'lib/remodal-default-theme.css');
310
  }
311
 
312
+ /**
313
+ * Returns an array of objects representing all scripts used by the plugin
314
+ * @return array
315
+ */
316
+ public function getPluginScripts()
317
  {
318
  global $wpgmza;
319
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
320
  if($wpgmza->isUsingMinifiedScripts())
321
  {
322
  $dir = ($this->proMode ? plugin_dir_path(WPGMZA_PRO_FILE) : plugin_dir_path(__DIR__));
334
  if(!$minified_file_exists || $delta > 0)
335
  $src = $combined;
336
 
337
+ $scripts = array('wpgmza' =>
338
  (object)array(
339
  'src' => $src,
340
  'pro' => $this->proMode
344
  else
345
  {
346
  // Enqueue core object with library dependencies
347
+ $scripts = (array)json_decode(file_get_contents($this->scriptsFileLocation));
348
+ }
349
+
350
+ return $scripts;
351
+ }
352
+
353
+ public function enqueueScripts()
354
+ {
355
+ global $wpgmza;
356
+
357
+ // Get library scripts
358
+ $libraries = $this->getLibraryScripts();
359
+
360
+ // Enqueue Google API call if necessary
361
+ switch($wpgmza->settings->engine)
362
+ {
363
+ case 'google-maps':
364
+ $loader = ($wpgmza->isProVersion() ? new GoogleProMapsLoader() : new GoogleMapsLoader());
365
+ $loader->loadGoogleMaps();
366
+ break;
367
+
368
+ default:
369
+ $loader = new OLLoader();
370
+ $loader->loadOpenLayers();
371
+ break;
372
+ }
373
+
374
+ // Enqueue library scripts first
375
+ foreach($libraries as $handle => $src)
376
+ {
377
+ wp_enqueue_script($handle, $src, array('jquery'));
378
  }
379
 
380
  // FontAwesome?
396
  break;
397
  }
398
 
399
+ // Scripts
400
+ $this->scripts = $this->getPluginScripts();
401
+
402
  // Give the core script library dependencies
403
  $dependencies = array_keys($libraries);
404
 
405
+ // Sometimes we need to load the plugin JS files but not the maps API. The following code stops the API being loaded as a dependency of the plugin JS files when that is the case.
406
  $apiLoader = new GoogleMapsAPILoader();
407
  if($apiLoader->isIncludeAllowed())
408
  $dependencies[] = 'wpgmza_api_call';
includes/class.strings.php CHANGED
@@ -9,6 +9,8 @@ class Strings
9
  return apply_filters('wpgmza_localized_strings', array(
10
  'unsecure_geolocation' => __('Many browsers are no longer allowing geolocation from unsecured origins. You will need to secure your site with an SSL certificate (HTTPS) or this feature may not work for your visitors', 'wp-google-maps'),
11
 
 
 
12
  'documentation' => __('Documentation', 'wp-google-maps'),
13
  'api_dashboard' => __('API Dashboard', 'wp-google-maps'),
14
  'verify_project' => __('Verify Project', 'wp-google-maps')
9
  return apply_filters('wpgmza_localized_strings', array(
10
  'unsecure_geolocation' => __('Many browsers are no longer allowing geolocation from unsecured origins. You will need to secure your site with an SSL certificate (HTTPS) or this feature may not work for your visitors', 'wp-google-maps'),
11
 
12
+ 'google_api_not_loaded' => __('The map cannot be initialized because the Maps API has not been loaded. Please check your settings.', 'wp-google-maps'),
13
+
14
  'documentation' => __('Documentation', 'wp-google-maps'),
15
  'api_dashboard' => __('API Dashboard', 'wp-google-maps'),
16
  'verify_project' => __('Verify Project', 'wp-google-maps')
js/admin-basic.js CHANGED
@@ -1,159 +1,156 @@
1
- (function($) {
2
- $(document).ready(function(){
 
3
 
4
- $("button[data-fit-bounds-to-shape]").each(function(index, el) {
5
 
6
- $(el).on("click", function(event) {
7
-
8
- var name = $(el).attr("data-fit-bounds-to-shape");
9
- var shape = window[name];
10
- var bounds;
11
-
12
- if(shape instanceof google.maps.Polygon || shape instanceof google.maps.Polyline)
13
- {
14
- bounds = new google.maps.LatLngBounds();
15
- shape.getPath().forEach(function(element, index) {
16
- bounds.extend(element);
17
- });
18
- }
19
- else
20
- bounds = shape.getBounds();
21
 
22
- MYMAP.map.fitBounds(bounds);
23
- });
24
-
25
- });
 
 
 
 
 
26
 
27
- $(document.body).on("click", "#wpgmza-gdpr-privacy-policy-notice .notice-dismiss", function(event) {
28
-
29
- $.ajax(WPGMZA.ajaxurl, {
30
- data: {
31
- action: "wpgmza_gdpr_privacy_policy_notice_dismissed"
32
- }
33
- })
34
-
35
  });
36
 
37
- $("body").on("click",".wpgmza_copy_shortcode", function() {
38
- var $temp = $('<input>');
39
- var $tmp2 = $('<span id="wpgmza_tmp" style="display:none; width:100%; text-align:center;">');
40
- $("body").append($temp);
41
- $temp.val($(this).val()).select();
42
- document.execCommand("copy");
43
- $temp.remove();
44
- $(this).after($tmp2);
45
- $($tmp2).html(wpgmaps_localize_strings["wpgm_copy_string"]);
46
- $($tmp2).fadeIn();
47
- setTimeout(function(){ $($tmp2).fadeOut(); }, 1000);
48
- setTimeout(function(){ $($tmp2).remove(); }, 1500);
49
- });
50
-
51
- $('#wpgmza_settings_enable_usage_tracking').change(function(event) {
 
 
 
 
 
 
 
 
 
 
52
 
53
- var usage_tracking = $(this);
54
 
55
- if (usage_tracking.is (':checked')){
56
- var enabled = true;
57
- } else {
58
- var enabled = false;
59
- }
60
- var email = $("#wpgmza_admin_email_coupon").val();
61
 
62
- var data = {
63
- action: 'request_coupon',
64
- email: email,
65
- status: enabled
66
- }
67
- $.post(ajaxurl, data, function(response){
68
- });
69
 
 
 
 
 
 
 
70
  });
71
 
72
- var radiusStoreLocator = $('.wpgmza-store-locator-default-radius'),
73
- radiusStoreLocatorKm = $('#wpgmza_store_locator_default_radius_km'),
74
- radiusStoreLocatorMi = $('#wpgmza_store_locator_default_radius_mi');
75
 
76
- radiusStoreLocator.on('change', function() {
77
- radiusStoreLocator.val($(this).val());
78
- });
79
 
80
- $('#wpgmza_store_locator_distance').on('change', function() {
81
- radiusStoreLocator.removeClass('active');
 
82
 
83
- if ($(this).attr('checked')){
84
- radiusStoreLocatorMi.addClass('active');
85
- } else {
86
- radiusStoreLocatorKm.addClass('active');
87
- }
88
- });
 
 
 
 
 
 
 
 
 
89
 
90
- // If the store locator radii aren't valid when trying to save, switch to that tab so the error message is visible
91
- $("input[name='wpgmza_save_settings']").on("click", function() {
92
- var input = $("input.wpgmza_store_locator_radii");
93
- var value = input.val();
94
- var regex = new RegExp(input.attr("pattern"));
95
 
96
- if(!value.match(regex))
97
- $("#wpgmaps_tabs").tabs({active: 3});
98
- });
99
 
100
- $("#wpgmza_store_locator_distance").on("change", function(event) {
101
-
102
- var units = $(this).prop("checked") ? "mi" : "km";
103
 
104
- $(".wpgmza-store-locator-default-radius option").each(function(index, el) {
105
-
106
- $(el).html(
107
- $(el).html().match(/\d+/) + units
108
- );
109
-
110
- });
111
 
112
  });
113
-
114
- });
 
 
 
 
115
 
116
- $(window).on("load", function(event) {
 
 
 
117
 
118
- if(WPGMZA.settings.engine == "google-maps")
119
- return;
 
120
 
121
- $(".wpgmza-open-layers-feature-unavailable:not(.notice)").each(function(index, el) {
122
-
123
- var warning = $($(".notice.wpgmza-open-layers-feature-unavailable")[0]).clone();
124
- $(warning).show();
125
- $(el).prepend(warning);
126
-
127
- $.merge(
128
- $(el).find("input, select, textarea, button, .button-primary"),
129
- $(el).siblings("input, select, textarea, button, .button-primary")
130
- ).each(function(index, el) {
131
- if($(el).hasClass("button-primary"))
132
- $(el).attr("href", "javascript: ;");
133
- else
134
- $(el).prop("disabled", true);
135
- });
136
-
137
  });
138
 
139
- $(".wpgmza-open-layers-feature-coming-soon:not(.notice)").each(function(index, el) {
140
-
141
- var warning = $($(".notice.wpgmza-open-layers-feature-coming-soon")[0]).clone();
142
- $(warning).show();
143
- $(el).prepend(warning);
144
-
145
- $.merge(
146
- $(el).find("input, select, textarea, button, .button-primary"),
147
- $(el).siblings("input, select, textarea, button, .button-primary")
148
- ).each(function(index, el) {
149
- if($(el).hasClass("button-primary"))
150
- $(el).attr("href", "javascript: ;");
151
- else
152
- $(el).prop("disabled", true);
153
- });
154
-
155
  });
156
 
157
  });
158
 
159
- })(jQuery);
1
+ jQuery(function($) {
2
+
3
+ $("button[data-fit-bounds-to-shape]").each(function(index, el) {
4
 
5
+ $(el).on("click", function(event) {
6
 
7
+ var name = $(el).attr("data-fit-bounds-to-shape");
8
+ var shape = window[name];
9
+ var bounds;
 
 
 
 
 
 
 
 
 
 
 
 
10
 
11
+ if(shape instanceof google.maps.Polygon || shape instanceof google.maps.Polyline)
12
+ {
13
+ bounds = new google.maps.LatLngBounds();
14
+ shape.getPath().forEach(function(element, index) {
15
+ bounds.extend(element);
16
+ });
17
+ }
18
+ else
19
+ bounds = shape.getBounds();
20
 
21
+ MYMAP.map.fitBounds(bounds);
 
 
 
 
 
 
 
22
  });
23
 
24
+ });
25
+
26
+ $(document.body).on("click", "#wpgmza-gdpr-privacy-policy-notice .notice-dismiss", function(event) {
27
+
28
+ $.ajax(WPGMZA.ajaxurl, {
29
+ data: {
30
+ action: "wpgmza_gdpr_privacy_policy_notice_dismissed"
31
+ }
32
+ })
33
+
34
+ });
35
+
36
+ $("body").on("click",".wpgmza_copy_shortcode", function() {
37
+ var $temp = $('<input>');
38
+ var $tmp2 = $('<span id="wpgmza_tmp" style="display:none; width:100%; text-align:center;">');
39
+ $("body").append($temp);
40
+ $temp.val($(this).val()).select();
41
+ document.execCommand("copy");
42
+ $temp.remove();
43
+ $(this).after($tmp2);
44
+ $($tmp2).html(wpgmaps_localize_strings["wpgm_copy_string"]);
45
+ $($tmp2).fadeIn();
46
+ setTimeout(function(){ $($tmp2).fadeOut(); }, 1000);
47
+ setTimeout(function(){ $($tmp2).remove(); }, 1500);
48
+ });
49
 
50
+ $('#wpgmza_settings_enable_usage_tracking').change(function(event) {
51
 
52
+ var usage_tracking = $(this);
 
 
 
 
 
53
 
54
+ if (usage_tracking.is (':checked')){
55
+ var enabled = true;
56
+ } else {
57
+ var enabled = false;
58
+ }
59
+ var email = $("#wpgmza_admin_email_coupon").val();
 
60
 
61
+ var data = {
62
+ action: 'request_coupon',
63
+ email: email,
64
+ status: enabled
65
+ }
66
+ $.post(ajaxurl, data, function(response){
67
  });
68
 
69
+ });
 
 
70
 
71
+ var radiusStoreLocator = $('.wpgmza-store-locator-default-radius'),
72
+ radiusStoreLocatorKm = $('#wpgmza_store_locator_default_radius_km'),
73
+ radiusStoreLocatorMi = $('#wpgmza_store_locator_default_radius_mi');
74
 
75
+ radiusStoreLocator.on('change', function() {
76
+ radiusStoreLocator.val($(this).val());
77
+ });
78
 
79
+ $('#wpgmza_store_locator_distance').on('change', function() {
80
+ radiusStoreLocator.removeClass('active');
81
+
82
+ if ($(this).attr('checked')){
83
+ radiusStoreLocatorMi.addClass('active');
84
+ } else {
85
+ radiusStoreLocatorKm.addClass('active');
86
+ }
87
+ });
88
+
89
+ // If the store locator radii aren't valid when trying to save, switch to that tab so the error message is visible
90
+ $("input[name='wpgmza_save_settings']").on("click", function() {
91
+ var input = $("input.wpgmza_store_locator_radii");
92
+ var value = input.val();
93
+ var regex = new RegExp(input.attr("pattern"));
94
 
95
+ if(!value.match(regex))
96
+ $("#wpgmaps_tabs").tabs({active: 3});
97
+ });
98
+
99
+ $("#wpgmza_store_locator_distance").on("change", function(event) {
100
 
101
+ var units = $(this).prop("checked") ? "mi" : "km";
 
 
102
 
103
+ $(".wpgmza-store-locator-default-radius option").each(function(index, el) {
 
 
104
 
105
+ $(el).html(
106
+ $(el).html().match(/\d+/) + units
107
+ );
 
 
 
 
108
 
109
  });
110
+
111
+ });
112
+
113
+ });
114
+
115
+ $(window).on("load", function(event) {
116
 
117
+ if(WPGMZA.settings.engine == "google-maps")
118
+ return;
119
+
120
+ $(".wpgmza-open-layers-feature-unavailable:not(.notice)").each(function(index, el) {
121
 
122
+ var warning = $($(".notice.wpgmza-open-layers-feature-unavailable")[0]).clone();
123
+ $(warning).show();
124
+ $(el).prepend(warning);
125
 
126
+ $.merge(
127
+ $(el).find("input, select, textarea, button, .button-primary"),
128
+ $(el).siblings("input, select, textarea, button, .button-primary")
129
+ ).each(function(index, el) {
130
+ if($(el).hasClass("button-primary"))
131
+ $(el).attr("href", "javascript: ;");
132
+ else
133
+ $(el).prop("disabled", true);
 
 
 
 
 
 
 
 
134
  });
135
 
136
+ });
137
+
138
+ $(".wpgmza-open-layers-feature-coming-soon:not(.notice)").each(function(index, el) {
139
+
140
+ var warning = $($(".notice.wpgmza-open-layers-feature-coming-soon")[0]).clone();
141
+ $(warning).show();
142
+ $(el).prepend(warning);
143
+
144
+ $.merge(
145
+ $(el).find("input, select, textarea, button, .button-primary"),
146
+ $(el).siblings("input, select, textarea, button, .button-primary")
147
+ ).each(function(index, el) {
148
+ if($(el).hasClass("button-primary"))
149
+ $(el).attr("href", "javascript: ;");
150
+ else
151
+ $(el).prop("disabled", true);
152
  });
153
 
154
  });
155
 
156
+ });
js/media.js CHANGED
@@ -1,4 +1,4 @@
1
- jQuery(document).ready(function($){
2
 
3
  var tgm_media_frame_default;
4
 
1
+ jQuery(function($) {
2
 
3
  var tgm_media_frame_default;
4
 
js/usage_tracking.js CHANGED
@@ -1,4 +1,4 @@
1
- jQuery(document).ready(function(){
2
 
3
  var mapid = jQuery("#wpgmza_id").val();
4
 
1
+ jQuery(function($) {
2
 
3
  var mapid = jQuery("#wpgmza_id").val();
4
 
js/v8/circle.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Circle
4
  * @requires WPGMZA.MapObject
5
  */
6
- (function($) {
7
 
8
  var Parent = WPGMZA.MapObject;
9
 
@@ -110,4 +110,4 @@
110
 
111
  }
112
 
113
- })(jQuery);
3
  * @module Circle
4
  * @requires WPGMZA.MapObject
5
  */
6
+ jQuery(function($) {
7
 
8
  var Parent = WPGMZA.MapObject;
9
 
110
 
111
  }
112
 
113
+ });
js/v8/compatibility.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Compatibility
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.Compatibility = function()
9
  {
@@ -25,4 +25,4 @@
25
 
26
  WPGMZA.compatiblityModule = new WPGMZA.Compatibility();
27
 
28
- })(jQuery);
3
  * @module Compatibility
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.Compatibility = function()
9
  {
25
 
26
  WPGMZA.compatiblityModule = new WPGMZA.Compatibility();
27
 
28
+ });
js/v8/compatibility/google-ui-compatibility.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GoogleUICompatibility
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.GoogleUICompatibility = function()
9
  {
@@ -22,4 +22,4 @@
22
 
23
  WPGMZA.googleUICompatibility = new WPGMZA.GoogleUICompatibility();
24
 
25
- })(jQuery);
3
  * @module GoogleUICompatibility
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.GoogleUICompatibility = function()
9
  {
22
 
23
  WPGMZA.googleUICompatibility = new WPGMZA.GoogleUICompatibility();
24
 
25
+ });
js/v8/core.js CHANGED
@@ -2,7 +2,7 @@
2
  * @module WPGMZA
3
  * @summary This is the core Javascript module. Some code exists in ../core.js, the functionality there will slowly be handed over to this module.
4
  */
5
- (function($) {
6
  var core = {
7
  maps: [],
8
  events: null,
@@ -385,7 +385,7 @@
385
  WPGMZA[key] = value;
386
  }
387
 
388
- $(document).ready(function(event) {
389
 
390
  // Combined script warning
391
  if($("script[src*='wp-google-maps.combined.js'], script[src*='wp-google-maps-pro.combined.js']").length)
@@ -427,4 +427,4 @@
427
 
428
 
429
 
430
- })(jQuery);
2
  * @module WPGMZA
3
  * @summary This is the core Javascript module. Some code exists in ../core.js, the functionality there will slowly be handed over to this module.
4
  */
5
+ jQuery(function($) {
6
  var core = {
7
  maps: [],
8
  events: null,
385
  WPGMZA[key] = value;
386
  }
387
 
388
+ jQuery(function($) {
389
 
390
  // Combined script warning
391
  if($("script[src*='wp-google-maps.combined.js'], script[src*='wp-google-maps-pro.combined.js']").length)
427
 
428
 
429
 
430
+ });
js/v8/distance.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Distance
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.Distance = {
9
 
@@ -51,4 +51,4 @@
51
 
52
  };
53
 
54
- })(jQuery);
3
  * @module Distance
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.Distance = {
9
 
51
 
52
  };
53
 
54
+ });
js/v8/event-dispatcher.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module EventDispatcher
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.EventDispatcher = function()
9
  {
@@ -148,4 +148,4 @@
148
 
149
  WPGMZA.events = new WPGMZA.EventDispatcher();
150
 
151
- })(jQuery);
3
  * @module EventDispatcher
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.EventDispatcher = function()
9
  {
148
 
149
  WPGMZA.events = new WPGMZA.EventDispatcher();
150
 
151
+ });
js/v8/event.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Event
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.Event = function(options)
9
  {
@@ -31,4 +31,4 @@
31
  this._cancelled = true;
32
  }
33
 
34
- })(jQuery);
3
  * @module Event
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.Event = function(options)
9
  {
31
  this._cancelled = true;
32
  }
33
 
34
+ });
js/v8/friendly-error.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module FriendlyError
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  /*var template = '\
9
  <div class="notice notice-error"> \
@@ -29,4 +29,4 @@
29
  this.element.find("pre").html(nativeError.message + "\r\n" + nativeError.stack + "\r\n\r\n on " + window.location.href);
30
  }*/
31
 
32
- })(jQuery);
3
  * @module FriendlyError
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  /*var template = '\
9
  <div class="notice notice-error"> \
29
  this.element.find("pre").html(nativeError.message + "\r\n" + nativeError.stack + "\r\n\r\n on " + window.location.href);
30
  }*/
31
 
32
+ });
js/v8/geocoder.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Geocoder
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.Geocoder = function()
9
  {
@@ -63,4 +63,4 @@
63
  throw new Error("You must supply either a latLng or address");
64
  }
65
 
66
- })(jQuery);
3
  * @module Geocoder
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.Geocoder = function()
9
  {
63
  throw new Error("You must supply either a latLng or address");
64
  }
65
 
66
+ });
js/v8/google-api-error-handler.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GoogleAPIErrorHandler
4
  * @requires WPGMZA
5
  */
6
- (function($){
7
 
8
  WPGMZA.GoogleAPIErrorHandler = function() {
9
 
@@ -27,6 +27,9 @@
27
 
28
  this.messagesAlreadyDisplayed = {};
29
 
 
 
 
30
  // Override error function
31
  var _error = console.error;
32
 
@@ -122,4 +125,4 @@
122
 
123
  WPGMZA.googleAPIErrorHandler = new WPGMZA.GoogleAPIErrorHandler();
124
 
125
- })(jQuery);
3
  * @module GoogleAPIErrorHandler
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.GoogleAPIErrorHandler = function() {
9
 
27
 
28
  this.messagesAlreadyDisplayed = {};
29
 
30
+ if(WPGMZA.settings.developer_mode)
31
+ return;
32
+
33
  // Override error function
34
  var _error = console.error;
35
 
125
 
126
  WPGMZA.googleAPIErrorHandler = new WPGMZA.GoogleAPIErrorHandler();
127
 
128
+ });
js/v8/google-maps/google-circle.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GoogleCircle
4
  * @requires WPGMZA.Circle
5
  */
6
- (function($) {
7
 
8
  WPGMZA.GoogleCircle = function(options, googleCircle)
9
  {
@@ -49,4 +49,4 @@
49
  WPGMZA.GoogleCircle.prototype = Object.create(WPGMZA.Circle.prototype);
50
  WPGMZA.GoogleCircle.prototype.constructor = WPGMZA.GoogleCircle;
51
 
52
- })(jQuery);
3
  * @module GoogleCircle
4
  * @requires WPGMZA.Circle
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.GoogleCircle = function(options, googleCircle)
9
  {
49
  WPGMZA.GoogleCircle.prototype = Object.create(WPGMZA.Circle.prototype);
50
  WPGMZA.GoogleCircle.prototype.constructor = WPGMZA.GoogleCircle;
51
 
52
+ });
js/v8/google-maps/google-geocoder.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GoogleGeocoder
4
  * @requires WPGMZA.Geocoder
5
  */
6
- (function($) {
7
 
8
  WPGMZA.GoogleGeocoder = function()
9
  {
@@ -91,4 +91,4 @@
91
  });
92
  }
93
 
94
- })(jQuery);
3
  * @module GoogleGeocoder
4
  * @requires WPGMZA.Geocoder
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.GoogleGeocoder = function()
9
  {
91
  });
92
  }
93
 
94
+ });
js/v8/google-maps/google-info-window.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.InfoWindow
5
  * @pro-requires WPGMZA.ProInfoWindow
6
  */
7
- (function($) {
8
 
9
  var Parent;
10
 
@@ -128,4 +128,4 @@
128
  this.googleInfoWindow.setOptions(options);
129
  }
130
 
131
- })(jQuery);
4
  * @requires WPGMZA.InfoWindow
5
  * @pro-requires WPGMZA.ProInfoWindow
6
  */
7
+ jQuery(function($) {
8
 
9
  var Parent;
10
 
128
  this.googleInfoWindow.setOptions(options);
129
  }
130
 
131
+ });
js/v8/google-maps/google-map.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.Map
5
  * @pro-requires WPGMZA.ProMap
6
  */
7
- (function($) {
8
  var Parent;
9
 
10
  /**
@@ -27,10 +27,11 @@
27
 
28
  if(status.code == "USER_CONSENT_NOT_GIVEN")
29
  {
30
- console.log(WPGMZA.api_consent_html);
31
  return;
32
  }
33
 
 
 
34
  throw new Error(message);
35
  }
36
 
@@ -499,4 +500,4 @@
499
  google.maps.event.trigger(this.googleMap, "resize");
500
  }
501
 
502
- })(jQuery);
4
  * @requires WPGMZA.Map
5
  * @pro-requires WPGMZA.ProMap
6
  */
7
+ jQuery(function($) {
8
  var Parent;
9
 
10
  /**
27
 
28
  if(status.code == "USER_CONSENT_NOT_GIVEN")
29
  {
 
30
  return;
31
  }
32
 
33
+ $(element).html("<div class='notice notice-error'><p>" + WPGMZA.localized_strings.google_api_not_loaded + "<pre>" + message + "</pre></p></div>");
34
+
35
  throw new Error(message);
36
  }
37
 
500
  google.maps.event.trigger(this.googleMap, "resize");
501
  }
502
 
503
+ });
js/v8/google-maps/google-marker.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.Marker
5
  * @pro-requires WPGMZA.ProMarker
6
  */
7
- (function($) {
8
 
9
  var Parent;
10
 
@@ -171,4 +171,4 @@
171
  this.googleMarker.setDraggable(draggable);
172
  }
173
 
174
- })(jQuery);
4
  * @requires WPGMZA.Marker
5
  * @pro-requires WPGMZA.ProMarker
6
  */
7
+ jQuery(function($) {
8
 
9
  var Parent;
10
 
171
  this.googleMarker.setDraggable(draggable);
172
  }
173
 
174
+ });
js/v8/google-maps/google-modern-store-locator-circle.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GoogleModernStoreLocatorCircle
4
  * @requires WPGMZA.ModernStoreLocatorCircle
5
  */
6
- (function($) {
7
 
8
  WPGMZA.GoogleModernStoreLocatorCircle = function(map, settings)
9
  {
@@ -161,4 +161,4 @@
161
  clearInterval(this.intervalID);
162
  }
163
 
164
- })(jQuery);
3
  * @module GoogleModernStoreLocatorCircle
4
  * @requires WPGMZA.ModernStoreLocatorCircle
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.GoogleModernStoreLocatorCircle = function(map, settings)
9
  {
161
  clearInterval(this.intervalID);
162
  }
163
 
164
+ });
js/v8/google-maps/google-modern-store-locator.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GoogleModernStoreLocator
4
  * @requires WPGMZA.ModernStoreLocator
5
  */
6
- (function($) {
7
 
8
  WPGMZA.GoogleModernStoreLocator = function(map_id)
9
  {
@@ -22,4 +22,4 @@
22
  WPGMZA.GoogleModernStoreLocator.prototype = Object.create(WPGMZA.ModernStoreLocator.prototype);
23
  WPGMZA.GoogleModernStoreLocator.prototype.constructor = WPGMZA.GoogleModernStoreLocator;
24
 
25
- })(jQuery);
3
  * @module GoogleModernStoreLocator
4
  * @requires WPGMZA.ModernStoreLocator
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.GoogleModernStoreLocator = function(map_id)
9
  {
22
  WPGMZA.GoogleModernStoreLocator.prototype = Object.create(WPGMZA.ModernStoreLocator.prototype);
23
  WPGMZA.GoogleModernStoreLocator.prototype.constructor = WPGMZA.GoogleModernStoreLocator;
24
 
25
+ });
js/v8/google-maps/google-polygon.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.Polygon
5
  * @pro-requires WPGMZA.ProPolygon
6
  */
7
- (function($) {
8
 
9
  var Parent;
10
 
@@ -86,4 +86,4 @@
86
  return result;
87
  }
88
 
89
- })(jQuery);
4
  * @requires WPGMZA.Polygon
5
  * @pro-requires WPGMZA.ProPolygon
6
  */
7
+ jQuery(function($) {
8
 
9
  var Parent;
10
 
86
  return result;
87
  }
88
 
89
+ });
js/v8/google-maps/google-polyline.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GooglePolyline
4
  * @requires WPGMZA.Polyline
5
  */
6
- (function($) {
7
 
8
  WPGMZA.GooglePolyline = function(row, googlePolyline)
9
  {
@@ -64,4 +64,4 @@
64
  return result;
65
  }
66
 
67
- })(jQuery);
3
  * @module GooglePolyline
4
  * @requires WPGMZA.Polyline
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.GooglePolyline = function(row, googlePolyline)
9
  {
64
  return result;
65
  }
66
 
67
+ });
js/v8/google-maps/google-vertex-context-menu.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module GoogleVertexContextMenu
4
  * @requires wpgmza_api_call
5
  */
6
- (function($) {
7
 
8
  if(WPGMZA.settings.engine != "google-maps")
9
  return;
@@ -94,4 +94,4 @@
94
  this.close();
95
  }
96
 
97
- })(jQuery);
3
  * @module GoogleVertexContextMenu
4
  * @requires wpgmza_api_call
5
  */
6
+ jQuery(function($) {
7
 
8
  if(WPGMZA.settings.engine != "google-maps")
9
  return;
94
  this.close();
95
  }
96
 
97
+ });
js/v8/info-window.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module InfoWindow
4
  * @requires WPGMZA.EventDispatcher
5
  */
6
- (function($) {
7
 
8
  WPGMZA.InfoWindow = function(mapObject)
9
  {
@@ -116,4 +116,4 @@
116
  this.open();
117
  }
118
 
119
- })(jQuery);
3
  * @module InfoWindow
4
  * @requires WPGMZA.EventDispatcher
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.InfoWindow = function(mapObject)
9
  {
116
  this.open();
117
  }
118
 
119
+ });
js/v8/latlng.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module LatLng
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  /**
9
  * Constructor
@@ -88,6 +88,14 @@
88
  return this._lat + ", " + this._lng;
89
  }
90
 
 
 
 
 
 
 
 
 
91
  WPGMZA.LatLng.prototype.toGoogleLatLng = function()
92
  {
93
  return new google.maps.LatLng({
@@ -126,4 +134,4 @@
126
  this.lng = lambda2 * 180 / Math.PI;
127
  }
128
 
129
- })(jQuery);
3
  * @module LatLng
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  /**
9
  * Constructor
88
  return this._lat + ", " + this._lng;
89
  }
90
 
91
+ WPGMZA.LatLng.fromGoogleLatLng = function(googleLatLng)
92
+ {
93
+ return new WPGMZA.LatLng(
94
+ googleLatLng.lat(),
95
+ googleLatLng.lng()
96
+ );
97
+ }
98
+
99
  WPGMZA.LatLng.prototype.toGoogleLatLng = function()
100
  {
101
  return new google.maps.LatLng({
134
  this.lng = lambda2 * 180 / Math.PI;
135
  }
136
 
137
+ });
js/v8/latlngbounds.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module LatLngBounds
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.LatLngBounds = function(southWest, northEast)
9
  {
@@ -39,4 +39,4 @@
39
  this.east = latLng.lng;
40
  }
41
 
42
- })(jQuery);
3
  * @module LatLngBounds
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.LatLngBounds = function(southWest, northEast)
9
  {
39
  this.east = latLng.lng;
40
  }
41
 
42
+ });
js/v8/map-object.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module MapObject
4
  * @requires WPGMZA.EventDispatcher
5
  */
6
- (function($) {
7
 
8
  WPGMZA.MapObject = function(row)
9
  {
@@ -81,4 +81,4 @@
81
  };
82
  }
83
 
84
- })(jQuery);
3
  * @module MapObject
4
  * @requires WPGMZA.EventDispatcher
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.MapObject = function(row)
9
  {
81
  };
82
  }
83
 
84
+ });
js/v8/map-settings-page.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module MapSettingsPage
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.MapSettingsPage = function()
9
  {
@@ -59,7 +59,7 @@
59
  }
60
  }
61
 
62
- $(document).ready(function(event) {
63
 
64
  if(!window.location.href.match(/wp-google-maps-menu-settings/))
65
  return;
@@ -68,4 +68,4 @@
68
 
69
  });
70
 
71
- })(jQuery);
3
  * @module MapSettingsPage
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.MapSettingsPage = function()
9
  {
59
  }
60
  }
61
 
62
+ jQuery(function($) {
63
 
64
  if(!window.location.href.match(/wp-google-maps-menu-settings/))
65
  return;
68
 
69
  });
70
 
71
+ });
js/v8/map-settings.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module MapSettings
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.MapSettings = function(element)
9
  {
@@ -178,4 +178,4 @@
178
 
179
  return options;
180
  }
181
- })(jQuery);
3
  * @module MapSettings
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.MapSettings = function(element)
9
  {
178
 
179
  return options;
180
  }
181
+ });
js/v8/map.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Map
4
  * @requires WPGMZA.EventDispatcher
5
  */
6
- (function($) {
7
 
8
  /**
9
  * Constructor
@@ -468,4 +468,4 @@
468
  // Call again each second to load AJAX maps
469
  setInterval(createMaps, 1000);
470
  });*/
471
- })(jQuery);
3
  * @module Map
4
  * @requires WPGMZA.EventDispatcher
5
  */
6
+ jQuery(function($) {
7
 
8
  /**
9
  * Constructor
468
  // Call again each second to load AJAX maps
469
  setInterval(createMaps, 1000);
470
  });*/
471
+ });
js/v8/maps-engine-dialog.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module MapsEngineDialog
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  WPGMZA.MapsEngineDialog = function(element)
9
  {
@@ -60,4 +60,4 @@
60
 
61
  });
62
 
63
- })(jQuery);
3
  * @module MapsEngineDialog
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.MapsEngineDialog = function(element)
9
  {
60
 
61
  });
62
 
63
+ });
js/v8/marker.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Marker
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
  /**
8
  * Constructor
9
  * @param json to load (optional)
@@ -277,4 +277,4 @@
277
  }
278
 
279
 
280
- })(jQuery);
3
  * @module Marker
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
  /**
8
  * Constructor
9
  * @param json to load (optional)
277
  }
278
 
279
 
280
+ });
js/v8/modern-store-locator-circle.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module ModernStoreLocatorCircle
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  /**
9
  * This module is the modern store locator circle
@@ -364,4 +364,4 @@
364
  }
365
  }
366
 
367
- })(jQuery);
3
  * @module ModernStoreLocatorCircle
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  /**
9
  * This module is the modern store locator circle
364
  }
365
  }
366
 
367
+ });
js/v8/modern-store-locator.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module ModernStoreLocator
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  /**
9
  * The new modern look store locator. It takes the elements
@@ -174,4 +174,4 @@
174
  return new WPGMZA.OLModernStoreLocator(map_id);
175
  }
176
 
177
- })(jQuery);
3
  * @module ModernStoreLocator
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  /**
9
  * The new modern look store locator. It takes the elements
174
  return new WPGMZA.OLModernStoreLocator(map_id);
175
  }
176
 
177
+ });
js/v8/open-layers/ol-circle.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module OLCircle
4
  * @requires WPGMZA.Circle
5
  */
6
- (function($) {
7
 
8
  var Parent = WPGMZA.Circle;
9
 
@@ -82,4 +82,4 @@
82
  this.layer.setStyle(this.olStyle);
83
  }
84
 
85
- })(jQuery);
3
  * @module OLCircle
4
  * @requires WPGMZA.Circle
5
  */
6
+ jQuery(function($) {
7
 
8
  var Parent = WPGMZA.Circle;
9
 
82
  this.layer.setStyle(this.olStyle);
83
  }
84
 
85
+ });
js/v8/open-layers/ol-geocoder.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module OLGeocoder
4
  * @requires WPGMZA.Geocoder
5
  */
6
- (function($) {
7
 
8
  /**
9
  * @class OLGeocoder
@@ -132,7 +132,7 @@
132
  lng: parseFloat(response[i].lon)
133
  };
134
 
135
- // Backward compatibility
136
  response[i].lng = response[i].lon;
137
  }
138
 
@@ -179,4 +179,4 @@
179
  });
180
  }
181
 
182
- })(jQuery);
3
  * @module OLGeocoder
4
  * @requires WPGMZA.Geocoder
5
  */
6
+ jQuery(function($) {
7
 
8
  /**
9
  * @class OLGeocoder
132
  lng: parseFloat(response[i].lon)
133
  };
134
 
135
+ // Backward compatibility with old UGM
136
  response[i].lng = response[i].lon;
137
  }
138
 
179
  });
180
  }
181
 
182
+ });
js/v8/open-layers/ol-info-window.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.InfoWindow
5
  * @pro-requires WPGMZA.ProInfoWindow
6
  */
7
- (function($) {
8
 
9
  var Parent;
10
 
@@ -90,4 +90,4 @@
90
  }
91
  }
92
 
93
- })(jQuery);
4
  * @requires WPGMZA.InfoWindow
5
  * @pro-requires WPGMZA.ProInfoWindow
6
  */
7
+ jQuery(function($) {
8
 
9
  var Parent;
10
 
90
  }
91
  }
92
 
93
+ });
js/v8/open-layers/ol-map.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.Map
5
  * @pro-requires WPGMZA.ProMap
6
  */
7
- (function($) {
8
 
9
  var Parent;
10
 
@@ -419,4 +419,4 @@
419
  return false;
420
  }
421
 
422
- })(jQuery);
4
  * @requires WPGMZA.Map
5
  * @pro-requires WPGMZA.ProMap
6
  */
7
+ jQuery(function($) {
8
 
9
  var Parent;
10
 
419
  return false;
420
  }
421
 
422
+ });
js/v8/open-layers/ol-marker.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.Marker
5
  * @pro-requires WPGMZA.ProMarker
6
  */
7
- (function($) {
8
 
9
  var Parent;
10
 
@@ -171,4 +171,4 @@
171
  this.trigger({type: "dragend", latLng: latLngAfterDrag});
172
  }
173
 
174
- })(jQuery);
4
  * @requires WPGMZA.Marker
5
  * @pro-requires WPGMZA.ProMarker
6
  */
7
+ jQuery(function($) {
8
 
9
  var Parent;
10
 
171
  this.trigger({type: "dragend", latLng: latLngAfterDrag});
172
  }
173
 
174
+ });
js/v8/open-layers/ol-modern-store-locator-circle.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module OLModernStoreLocatorCircle
4
  * @requires WPGMZA.ModernStoreLocatorCircle
5
  */
6
- (function($) {
7
 
8
  WPGMZA.OLModernStoreLocatorCircle = function(map, settings)
9
  {
@@ -106,4 +106,4 @@
106
  this.canvas = null;
107
  }
108
 
109
- })(jQuery);
3
  * @module OLModernStoreLocatorCircle
4
  * @requires WPGMZA.ModernStoreLocatorCircle
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.OLModernStoreLocatorCircle = function(map, settings)
9
  {
106
  this.canvas = null;
107
  }
108
 
109
+ });
js/v8/open-layers/ol-modern-store-locator.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module OLModernStoreLocator
4
  * @requires WPGMZA.ModernStoreLocator
5
  */
6
- (function($) {
7
 
8
  WPGMZA.OLModernStoreLocator = function(map_id)
9
  {
@@ -22,4 +22,4 @@
22
  WPGMZA.OLModernStoreLocator.prototype = Object.create(WPGMZA.ModernStoreLocator);
23
  WPGMZA.OLModernStoreLocator.prototype.constructor = WPGMZA.OLModernStoreLocator;
24
 
25
- })(jQuery);
3
  * @module OLModernStoreLocator
4
  * @requires WPGMZA.ModernStoreLocator
5
  */
6
+ jQuery(function($) {
7
 
8
  WPGMZA.OLModernStoreLocator = function(map_id)
9
  {
22
  WPGMZA.OLModernStoreLocator.prototype = Object.create(WPGMZA.ModernStoreLocator);
23
  WPGMZA.OLModernStoreLocator.prototype.constructor = WPGMZA.OLModernStoreLocator;
24
 
25
+ });
js/v8/open-layers/ol-polygon.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA.Polygon
5
  * @pro-requires WPGMZA.ProPolygon
6
  */
7
- (function($) {
8
 
9
  var Parent;
10
 
@@ -112,4 +112,4 @@
112
  return result;
113
  }
114
 
115
- })(jQuery);
4
  * @requires WPGMZA.Polygon
5
  * @pro-requires WPGMZA.ProPolygon
6
  */
7
+ jQuery(function($) {
8
 
9
  var Parent;
10
 
112
  return result;
113
  }
114
 
115
+ });
js/v8/open-layers/ol-polyline.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module OLPolyline
4
  * @requires WPGMZA.Polyline
5
  */
6
- (function($) {
7
 
8
  var Parent;
9
 
@@ -125,4 +125,4 @@
125
  return result;
126
  }
127
 
128
- })(jQuery);
3
  * @module OLPolyline
4
  * @requires WPGMZA.Polyline
5
  */
6
+ jQuery(function($) {
7
 
8
  var Parent;
9
 
125
  return result;
126
  }
127
 
128
+ });
js/v8/polygon.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Polygon
4
  * @requires WPGMZA.MapObject
5
  */
6
- (function($) {
7
  WPGMZA.Polygon = function(row, enginePolygon)
8
  {
9
  var self = this;
@@ -58,4 +58,4 @@
58
  return result;
59
  }
60
 
61
- })(jQuery);
3
  * @module Polygon
4
  * @requires WPGMZA.MapObject
5
  */
6
+ jQuery(function($) {
7
  WPGMZA.Polygon = function(row, enginePolygon)
8
  {
9
  var self = this;
58
  return result;
59
  }
60
 
61
+ });
js/v8/polyline.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Polyline
4
  * @requires WPGMZA.MapObject
5
  */
6
- (function($) {
7
  WPGMZA.Polyline = function(row, googlePolyline)
8
  {
9
  var self = this;
@@ -53,4 +53,4 @@
53
  }
54
 
55
 
56
- })(jQuery);
3
  * @module Polyline
4
  * @requires WPGMZA.MapObject
5
  */
6
+ jQuery(function($) {
7
  WPGMZA.Polyline = function(row, googlePolyline)
8
  {
9
  var self = this;
53
  }
54
 
55
 
56
+ });
js/v8/rest-api.js CHANGED
@@ -4,7 +4,7 @@
4
  * @requires WPGMZA
5
  * @summary Wrapped for the rest API
6
  */
7
- (function($) {
8
 
9
  WPGMZA.RestAPI = function()
10
  {
@@ -24,4 +24,4 @@
24
  $.ajax(WPGMZA.RestAPI.URL + route, params);
25
  }
26
 
27
- })(jQuery);
4
  * @requires WPGMZA
5
  * @summary Wrapped for the rest API
6
  */
7
+ jQuery(function($) {
8
 
9
  WPGMZA.RestAPI = function()
10
  {
24
  $.ajax(WPGMZA.RestAPI.URL + route, params);
25
  }
26
 
27
+ });
js/v8/version.js CHANGED
@@ -3,7 +3,7 @@
3
  * @module Version
4
  * @requires WPGMZA
5
  */
6
- (function($) {
7
 
8
  function isPositiveInteger(x) {
9
  // http://stackoverflow.com/a/1019526/11236
@@ -68,4 +68,4 @@
68
  return 0;
69
  }
70
 
71
- })(jQuery);
3
  * @module Version
4
  * @requires WPGMZA
5
  */
6
+ jQuery(function($) {
7
 
8
  function isPositiveInteger(x) {
9
  // http://stackoverflow.com/a/1019526/11236
68
  return 0;
69
  }
70
 
71
+ });
js/wp-google-maps-full-screen-map.js CHANGED
@@ -1,5 +1,5 @@
1
  lightbox_open = new Array();
2
- jQuery(document).ready(function () {
3
 
4
  jQuery( document ).on( 'wpgooglemaps_loaded', '#wpgmza_map', function() {
5
  wpgooglemaps_load_full_screen_button(wpgmaps_localize[wpgmaps_mapid]['id'])
1
  lightbox_open = new Array();
2
+ jQuery(function($) {
3
 
4
  jQuery( document ).on( 'wpgooglemaps_loaded', '#wpgmza_map', function() {
5
  wpgooglemaps_load_full_screen_button(wpgmaps_localize[wpgmaps_mapid]['id'])
js/wp-google-maps.js CHANGED
@@ -18,25 +18,21 @@ if ('undefined' === typeof window.jQuery) {
18
 
19
  }
20
 
21
- jQuery(function() {
22
-
23
-
24
- jQuery(document).ready(function(){
25
- if (/1\.(0|1|2|3|4|5|6|7)\.(0|1|2|3|4|5|6|7|8|9)/.test(jQuery.fn.jquery)) {
26
- setTimeout(function(){
27
- for(var entry in wpgmaps_localize) {
28
- document.getElementById('wpgmza_map_'+entry).innerHTML = wpgmza_jquery_error_string_2;
29
- }
30
- }, 3000);
31
- } else {
32
-
33
- for(var entry in wpgmaps_localize) {
34
- InitMap(wpgmaps_localize[entry]['id'],false);
35
- }
36
-
37
- }
38
-
39
- });
40
 
41
  });
42
 
18
 
19
  }
20
 
21
+ jQuery(function($) {
22
+
23
+ if (/1\.(0|1|2|3|4|5|6|7)\.(0|1|2|3|4|5|6|7|8|9)/.test(jQuery.fn.jquery)) {
24
+ setTimeout(function(){
25
+ for(var entry in wpgmaps_localize) {
26
+ document.getElementById('wpgmza_map_'+entry).innerHTML = wpgmza_jquery_error_string_2;
27
+ }
28
+ }, 3000);
29
+ } else {
30
+
31
+ for(var entry in wpgmaps_localize) {
32
+ InitMap(wpgmaps_localize[entry]['id'],false);
33
+ }
34
+
35
+ }
 
 
 
 
36
 
37
  });
38
 
js/wpgmaps-admin-core.js CHANGED
@@ -166,7 +166,16 @@
166
  }
167
  }
168
 
169
- jQuery(document).ready(function(){
 
 
 
 
 
 
 
 
 
170
  $("input[type='submit'].button-primary").on("click", function() {
171
  unbindSaveReminder();
172
  });
166
  }
167
  }
168
 
169
+ jQuery(function($) {
170
+
171
+ if(WPGMZA.isProVersion())
172
+ {
173
+ if(console && console.warn)
174
+ console.warn("Unexpected plugin load order");
175
+
176
+ return;
177
+ }
178
+
179
  $("input[type='submit'].button-primary").on("click", function() {
180
  unbindSaveReminder();
181
  });
js/wpgmaps.js CHANGED
@@ -44,6 +44,8 @@ function wpgmza_open_info_window(infoWindow, content)
44
  var guid = wpgmza_get_guid();
45
  var div = $("<div hidden data-info-window-guid='" + guid + "'/>");
46
 
 
 
47
  infoWindow.setContent(div);
48
  infoWindow.open();
49
 
@@ -89,60 +91,58 @@ function InitMap() {
89
  wpgmza_create_places_autocomplete();
90
  }
91
  }
92
- jQuery(function() {
93
-
94
- jQuery(document).ready(function(){
95
- if (/1\.([0-7])\.([0-9])/.test(jQuery.fn.jquery)) {
96
- setTimeout(function(){
97
- document.getElementById('wpgmza_map').innerHTML = 'Error: Your version of jQuery is outdated. WP Google Maps requires jQuery version 1.7+ to function correctly. Go to Maps->Settings and check the box that allows you to over-ride your current jQuery to try eliminate this problem.';
98
- }, 6000);
99
- } else {
100
-
101
- // Fastclick adapation
102
- jQuery(document).on({'DOMNodeInserted': function() {
103
- jQuery('.pac-item, .pac-item span', this).addClass('needsclick');
104
- }
105
- }, '.pac-container');
106
-
107
- var temp;
108
- var selector = "#wpgmza_map";
109
- var mapElement = jQuery(selector);
110
-
111
- var width = wpgmaps_localize[wpgmaps_mapid]['map_width']+wpgmaps_localize[wpgmaps_mapid]['map_width_type'];
112
- var height = wpgmaps_localize[wpgmaps_mapid]['map_height']+wpgmaps_localize[wpgmaps_mapid]['map_height_type'];
113
-
114
- if((temp = mapElement.attr("data-shortcode-width")) != "inherit")
115
- width = temp;
116
- if((temp = mapElement.attr("data-shortcode-height")) != "inherit")
117
- height = temp;
118
-
119
- mapElement.css({
120
- width: width,
121
- height: height
122
- });
123
-
124
- InitMap();
125
- jQuery('body').on('tabsactivate', function(){setTimeout(function(){InitMap();}, 500); });
126
- jQuery('body').on('tabsshow', function(){setTimeout(function(){InitMap();}, 500); });
127
- jQuery('body').on('accordionactivate', function(){setTimeout(function(){InitMap();}, 500); });
128
- jQuery('body').on('click', '.wpb_tabs_nav li', function(){setTimeout(function(){InitMap();}, 500); });
129
- jQuery('body').on('click', '.ui-tabs-nav li', function(event, ui) { InitMap(); });
130
- jQuery('body').on('click', '.tp-tabs li a', function(event, ui) { InitMap(); });
131
- jQuery('body').on('click', '.nav-tabs li a', function(event, ui) { InitMap(); });
132
- jQuery('body').on('click', '.vc_tta-panel-heading', function(){setTimeout(function(){InitMap();}, 500); });
133
- jQuery('body').on('click', '.ult_exp_section',function(){setTimeout(function(){InitMap();}, 500); });
134
- jQuery('body').on('click', '.x-accordion-heading', function(){setTimeout(function(){InitMap();}, 500); });
135
- jQuery('body').on('click', '.x-nav-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
136
- jQuery('body').on('click', '.tab-title', function(){setTimeout(function(){InitMap();}, 500); });
137
- jQuery('body').on('click', '.tab-link', function(){setTimeout(function(){InitMap();}, 500); });
138
- jQuery('body').on('click', '.et_pb_tabs_controls li', function(){setTimeout(function(){InitMap();}, 500); });
139
- jQuery('body').on('click', '.fusion-tab-heading', function(){setTimeout(function(){InitMap();}, 500); });
140
- jQuery('body').on('click', '.et_pb_tab', function(){setTimeout(function(){InitMap();}, 500); });
141
- jQuery('body').on('click', '.tri-tabs-nav span', function(){setTimeout(function(){InitMap();}, 500); });
142
- jQuery('body').on('click', '.gdl-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
143
- jQuery('body').on('click', '#tabnav li', function(){setTimeout(function(){InitMap();}, 500); });
144
- }
145
- });
146
  });
147
 
148
  var MYMAP = {
@@ -356,17 +356,16 @@ MYMAP.init = function(selector, latLng, zoom) {
356
  });
357
  }
358
 
359
- //var infoWindow = new google.maps.InfoWindow();
360
- var infoWindow;
361
- jQuery(document).ready(function() {
362
-
363
  if(!window.WPGMZA)
364
  return;
365
 
366
- infoWindow = WPGMZA.InfoWindow.createInstance();
367
 
368
- if (typeof wpgmaps_localize_global_settings['wpgmza_settings_infowindow_width'] !== "undefined" && wpgmaps_localize_global_settings['wpgmza_settings_infowindow_width'] !== "") { infoWindow.setOptions({maxWidth:wpgmaps_localize_global_settings['wpgmza_settings_infowindow_width']}); }
369
- });
 
370
 
371
  function wpgmza_get_zoom_from_radius(radius, units)
372
  {
@@ -625,6 +624,8 @@ MYMAP.placeMarkers = function(filename,map_id,radius,searched_center,distance_ty
625
 
626
  var html='<span style=\'min-width:100px; display:block;\'>'+wpmgza_address+'</span>'+d_string;
627
  if (wpmgza_infoopen === "1" && !wpgmaps_localize_global_settings["wpgmza_settings_disable_infowindows"]) {
 
 
628
  infoWindow.setContent(html);
629
  infoWindow.open(MYMAP.map, marker);
630
  }
@@ -638,6 +639,8 @@ MYMAP.placeMarkers = function(filename,map_id,radius,searched_center,distance_ty
638
  infoWindow.close();
639
  if(!wpgmaps_localize_global_settings["wpgmza_settings_disable_infowindows"])
640
  {
 
 
641
  infoWindow.setContent(html);
642
  infoWindow.open(MYMAP.map, marker);
643
  }
@@ -767,7 +770,9 @@ function fillInAddress() {
767
  var place = autocomplete.getPlace();
768
  }
769
 
770
- wpgmza_create_places_autocomplete();
 
 
771
 
772
 
773
  function searchLocations(map_id) {
44
  var guid = wpgmza_get_guid();
45
  var div = $("<div hidden data-info-window-guid='" + guid + "'/>");
46
 
47
+ wpgmza_init_infowindow();
48
+
49
  infoWindow.setContent(div);
50
  infoWindow.open();
51
 
91
  wpgmza_create_places_autocomplete();
92
  }
93
  }
94
+
95
+ jQuery(function($) {
96
+ if (/1\.([0-7])\.([0-9])/.test(jQuery.fn.jquery)) {
97
+ setTimeout(function(){
98
+ document.getElementById('wpgmza_map').innerHTML = 'Error: Your version of jQuery is outdated. WP Google Maps requires jQuery version 1.7+ to function correctly. Go to Maps->Settings and check the box that allows you to over-ride your current jQuery to try eliminate this problem.';
99
+ }, 6000);
100
+ } else {
101
+
102
+ // Fastclick adapation
103
+ jQuery(document).on({'DOMNodeInserted': function() {
104
+ jQuery('.pac-item, .pac-item span', this).addClass('needsclick');
105
+ }
106
+ }, '.pac-container');
107
+
108
+ var temp;
109
+ var selector = "#wpgmza_map";
110
+ var mapElement = jQuery(selector);
111
+
112
+ var width = wpgmaps_localize[wpgmaps_mapid]['map_width']+wpgmaps_localize[wpgmaps_mapid]['map_width_type'];
113
+ var height = wpgmaps_localize[wpgmaps_mapid]['map_height']+wpgmaps_localize[wpgmaps_mapid]['map_height_type'];
114
+
115
+ if((temp = mapElement.attr("data-shortcode-width")) != "inherit")
116
+ width = temp;
117
+ if((temp = mapElement.attr("data-shortcode-height")) != "inherit")
118
+ height = temp;
119
+
120
+ mapElement.css({
121
+ width: width,
122
+ height: height
123
+ });
124
+
125
+ InitMap();
126
+ jQuery('body').on('tabsactivate', function(){setTimeout(function(){InitMap();}, 500); });
127
+ jQuery('body').on('tabsshow', function(){setTimeout(function(){InitMap();}, 500); });
128
+ jQuery('body').on('accordionactivate', function(){setTimeout(function(){InitMap();}, 500); });
129
+ jQuery('body').on('click', '.wpb_tabs_nav li', function(){setTimeout(function(){InitMap();}, 500); });
130
+ jQuery('body').on('click', '.ui-tabs-nav li', function(event, ui) { InitMap(); });
131
+ jQuery('body').on('click', '.tp-tabs li a', function(event, ui) { InitMap(); });
132
+ jQuery('body').on('click', '.nav-tabs li a', function(event, ui) { InitMap(); });
133
+ jQuery('body').on('click', '.vc_tta-panel-heading', function(){setTimeout(function(){InitMap();}, 500); });
134
+ jQuery('body').on('click', '.ult_exp_section',function(){setTimeout(function(){InitMap();}, 500); });
135
+ jQuery('body').on('click', '.x-accordion-heading', function(){setTimeout(function(){InitMap();}, 500); });
136
+ jQuery('body').on('click', '.x-nav-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
137
+ jQuery('body').on('click', '.tab-title', function(){setTimeout(function(){InitMap();}, 500); });
138
+ jQuery('body').on('click', '.tab-link', function(){setTimeout(function(){InitMap();}, 500); });
139
+ jQuery('body').on('click', '.et_pb_tabs_controls li', function(){setTimeout(function(){InitMap();}, 500); });
140
+ jQuery('body').on('click', '.fusion-tab-heading', function(){setTimeout(function(){InitMap();}, 500); });
141
+ jQuery('body').on('click', '.et_pb_tab', function(){setTimeout(function(){InitMap();}, 500); });
142
+ jQuery('body').on('click', '.tri-tabs-nav span', function(){setTimeout(function(){InitMap();}, 500); });
143
+ jQuery('body').on('click', '.gdl-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
144
+ jQuery('body').on('click', '#tabnav li', function(){setTimeout(function(){InitMap();}, 500); });
145
+ }
 
 
146
  });
147
 
148
  var MYMAP = {
356
  });
357
  }
358
 
359
+ function wpgmza_init_infowindow()
360
+ {
 
 
361
  if(!window.WPGMZA)
362
  return;
363
 
364
+ window.infoWindow = WPGMZA.InfoWindow.createInstance();
365
 
366
+ if(wpgmaps_localize_global_settings['wpgmza_settings_infowindow_width'] && wpgmaps_localize_global_settings['wpgmza_settings_infowindow_width'].length)
367
+ infoWindow.setOptions({maxWidth: wpgmaps_localize_global_settings['wpgmza_settings_infowindow_width']});
368
+ }
369
 
370
  function wpgmza_get_zoom_from_radius(radius, units)
371
  {
624
 
625
  var html='<span style=\'min-width:100px; display:block;\'>'+wpmgza_address+'</span>'+d_string;
626
  if (wpmgza_infoopen === "1" && !wpgmaps_localize_global_settings["wpgmza_settings_disable_infowindows"]) {
627
+ wpgmza_init_infowindow();
628
+
629
  infoWindow.setContent(html);
630
  infoWindow.open(MYMAP.map, marker);
631
  }
639
  infoWindow.close();
640
  if(!wpgmaps_localize_global_settings["wpgmza_settings_disable_infowindows"])
641
  {
642
+ wpgmza_init_infowindow();
643
+
644
  infoWindow.setContent(html);
645
  infoWindow.open(MYMAP.map, marker);
646
  }
770
  var place = autocomplete.getPlace();
771
  }
772
 
773
+ jQuery(window).on("load", function() {
774
+ wpgmza_create_places_autocomplete();
775
+ });
776
 
777
 
778
  function searchLocations(map_id) {
js/wpgmaps_osm.js CHANGED
@@ -19,41 +19,39 @@ function InitMap() {
19
 
20
  //MYMAP.placeMarkers(wpgmaps_markerurl+'?u='+UniqueCode,wpgmaps_localize[0].id,null,null,null);
21
  }
22
- jQuery(function() {
23
 
24
- jQuery(document).ready(function(){
25
- if (/1\.(0|1|2|3|4|5|6|7)\.(0|1|2|3|4|5|6|7|8|9)/.test(jQuery.fn.jquery)) {
26
- setTimeout(function(){
27
- document.getElementById('wpgmza_map').innerHTML = 'Error: Your version of jQuery is outdated. WP Google Maps requires jQuery version 1.7+ to function correctly. Go to Maps->Settings and check the box that allows you to over-ride your current jQuery to try eliminate this problem.';
28
- }, 6000);
29
- } else {
30
- jQuery("#wpgmza_map").css({
31
- height:wpgmaps_localize[0]['map_height']+''+wpgmaps_localize[0]['map_height_type'],
32
- width:wpgmaps_localize[0]['map_width']+''+wpgmaps_localize[0]['map_width_type'],
33
- overflow:'none'
34
- });
35
- InitMap();
36
- jQuery('body').on('tabsactivate', function(){setTimeout(function(){InitMap();}, 500); });
37
- jQuery('body').on('tabsshow', function(){setTimeout(function(){InitMap();}, 500); });
38
- jQuery('body').on('accordionactivate', function(){setTimeout(function(){InitMap();}, 500); });
39
- jQuery('body').on('click', '.wpb_tabs_nav li', function(){setTimeout(function(){InitMap();}, 500); });
40
- jQuery('body').on('click', '.ui-tabs-nav li', function(event, ui) { InitMap(); });
41
- jQuery('body').on('click', '.tp-tabs li a', function(event, ui) { InitMap(); });
42
- jQuery('body').on('click', '.nav-tabs li a', function(event, ui) { InitMap(); });
43
- jQuery('body').on('click', '.vc_tta-panel-heading', function(){setTimeout(function(){InitMap();}, 500); });
44
- jQuery('body').on('click', '.ult_exp_section',function(){setTimeout(function(){InitMap();}, 500); });
45
- jQuery('body').on('click', '.x-accordion-heading', function(){setTimeout(function(){InitMap();}, 500); });
46
- jQuery('body').on('click', '.x-nav-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
47
- jQuery('body').on('click', '.tab-title', function(){setTimeout(function(){InitMap();}, 500); });
48
- jQuery('body').on('click', '.tab-link', function(){setTimeout(function(){InitMap();}, 500); });
49
- jQuery('body').on('click', '.et_pb_tabs_controls li', function(){setTimeout(function(){InitMap();}, 500); });
50
- jQuery('body').on('click', '.fusion-tab-heading', function(){setTimeout(function(){InitMap();}, 500); });
51
- jQuery('body').on('click', '.et_pb_tab', function(){setTimeout(function(){InitMap();}, 500); });
52
- jQuery('body').on('click', '.tri-tabs-nav span', function(){setTimeout(function(){InitMap();}, 500); });
53
- jQuery('body').on('click', '.gdl-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
54
- jQuery('body').on('click', '#tabnav li', function(){setTimeout(function(){InitMap();}, 500); });
55
- }
56
- });
57
  });
58
 
59
  var MYMAP = {
19
 
20
  //MYMAP.placeMarkers(wpgmaps_markerurl+'?u='+UniqueCode,wpgmaps_localize[0].id,null,null,null);
21
  }
 
22
 
23
+ jQuery(function($) {
24
+ if (/1\.(0|1|2|3|4|5|6|7)\.(0|1|2|3|4|5|6|7|8|9)/.test(jQuery.fn.jquery)) {
25
+ setTimeout(function(){
26
+ document.getElementById('wpgmza_map').innerHTML = 'Error: Your version of jQuery is outdated. WP Google Maps requires jQuery version 1.7+ to function correctly. Go to Maps->Settings and check the box that allows you to over-ride your current jQuery to try eliminate this problem.';
27
+ }, 6000);
28
+ } else {
29
+ jQuery("#wpgmza_map").css({
30
+ height:wpgmaps_localize[0]['map_height']+''+wpgmaps_localize[0]['map_height_type'],
31
+ width:wpgmaps_localize[0]['map_width']+''+wpgmaps_localize[0]['map_width_type'],
32
+ overflow:'none'
33
+ });
34
+ InitMap();
35
+ jQuery('body').on('tabsactivate', function(){setTimeout(function(){InitMap();}, 500); });
36
+ jQuery('body').on('tabsshow', function(){setTimeout(function(){InitMap();}, 500); });
37
+ jQuery('body').on('accordionactivate', function(){setTimeout(function(){InitMap();}, 500); });
38
+ jQuery('body').on('click', '.wpb_tabs_nav li', function(){setTimeout(function(){InitMap();}, 500); });
39
+ jQuery('body').on('click', '.ui-tabs-nav li', function(event, ui) { InitMap(); });
40
+ jQuery('body').on('click', '.tp-tabs li a', function(event, ui) { InitMap(); });
41
+ jQuery('body').on('click', '.nav-tabs li a', function(event, ui) { InitMap(); });
42
+ jQuery('body').on('click', '.vc_tta-panel-heading', function(){setTimeout(function(){InitMap();}, 500); });
43
+ jQuery('body').on('click', '.ult_exp_section',function(){setTimeout(function(){InitMap();}, 500); });
44
+ jQuery('body').on('click', '.x-accordion-heading', function(){setTimeout(function(){InitMap();}, 500); });
45
+ jQuery('body').on('click', '.x-nav-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
46
+ jQuery('body').on('click', '.tab-title', function(){setTimeout(function(){InitMap();}, 500); });
47
+ jQuery('body').on('click', '.tab-link', function(){setTimeout(function(){InitMap();}, 500); });
48
+ jQuery('body').on('click', '.et_pb_tabs_controls li', function(){setTimeout(function(){InitMap();}, 500); });
49
+ jQuery('body').on('click', '.fusion-tab-heading', function(){setTimeout(function(){InitMap();}, 500); });
50
+ jQuery('body').on('click', '.et_pb_tab', function(){setTimeout(function(){InitMap();}, 500); });
51
+ jQuery('body').on('click', '.tri-tabs-nav span', function(){setTimeout(function(){InitMap();}, 500); });
52
+ jQuery('body').on('click', '.gdl-tabs li', function(){setTimeout(function(){InitMap();}, 500); });
53
+ jQuery('body').on('click', '#tabnav li', function(){setTimeout(function(){InitMap();}, 500); });
54
+ }
 
55
  });
56
 
57
  var MYMAP = {
js/wpgmaps_plugin_row.js CHANGED
@@ -1,4 +1,4 @@
1
- jQuery(document).ready(function(){
2
 
3
  // NB: GDPR
4
  /*jQuery("body").on("click", "#wpgmza_signup_newsletter_btn", function() {
1
+ jQuery(function($) {
2
 
3
  // NB: GDPR
4
  /*jQuery("body").on("click", "#wpgmza_signup_newsletter_btn", function() {
js/wpgmaps_tabs.js CHANGED
@@ -1,6 +1,4 @@
1
- (function($) {
2
-
3
- $("document").ready(function() {
4
 
5
  $("#wpgmaps_tabs").tabs();
6
  $("#wpgmaps_tabs_markers").tabs();
@@ -68,6 +66,4 @@ $("document").ready(function() {
68
  });
69
 
70
 
71
- });
72
-
73
- })(jQuery);
1
+ jQuery(function($) {
 
 
2
 
3
  $("#wpgmaps_tabs").tabs();
4
  $("#wpgmaps_tabs_markers").tabs();
66
  });
67
 
68
 
69
+ });
 
 
languages/wp-google-maps-de_DE.mo CHANGED
Binary file
languages/wp-google-maps-de_DE.po CHANGED
@@ -24,6 +24,9 @@ msgstr ""
24
  "X-Poedit-SearchPath-3: C:\\wamp\\www\\wordpress38\\wp-content\\plugins\\wp-"
25
  "google-maps-ugm\n"
26
 
 
 
 
27
  #: C:\wamp\www\wordpress38\wp-content\plugins\wp-google-maps-gold/wp-google-maps-gold.php:243
28
  #: C:\wamp\www\wordpress38\wp-content\plugins\wp-google-maps-pro/wp-google-maps-pro.php:3712
29
  #: C:\wamp\www\wordpress38\wp-content\plugins\wp-google-maps/wpGoogleMaps.php:764
24
  "X-Poedit-SearchPath-3: C:\\wamp\\www\\wordpress38\\wp-content\\plugins\\wp-"
25
  "google-maps-ugm\n"
26
 
27
+ msgid "I agree"
28
+ msgstr "Ich stimme zu"
29
+
30
  #: C:\wamp\www\wordpress38\wp-content\plugins\wp-google-maps-gold/wp-google-maps-gold.php:243
31
  #: C:\wamp\www\wordpress38\wp-content\plugins\wp-google-maps-pro/wp-google-maps-pro.php:3712
32
  #: C:\wamp\www\wordpress38\wp-content\plugins\wp-google-maps/wpGoogleMaps.php:764
lib/codecabin/deactivate-feedback-form.js CHANGED
@@ -1,4 +1,4 @@
1
- (function($) {
2
 
3
  if(!window.codecabin)
4
  window.codecabin = {};
@@ -106,15 +106,11 @@
106
  event.preventDefault();
107
  return false;
108
  }
109
-
110
- $(document).ready(function() {
111
-
112
- for(var i = 0; i < codecabin_deactivate_feedback_form_plugins.length; i++)
113
- {
114
- var plugin = codecabin_deactivate_feedback_form_plugins[i];
115
- new codecabin.DeactivateFeedbackForm(plugin);
116
- }
117
 
118
- });
 
 
 
 
119
 
120
- })(jQuery);
1
+ jQuery(function($) {
2
 
3
  if(!window.codecabin)
4
  window.codecabin = {};
106
  event.preventDefault();
107
  return false;
108
  }
 
 
 
 
 
 
 
 
109
 
110
+ for(var i = 0; i < codecabin_deactivate_feedback_form_plugins.length; i++)
111
+ {
112
+ var plugin = codecabin_deactivate_feedback_form_plugins[i];
113
+ new codecabin.DeactivateFeedbackForm(plugin);
114
+ }
115
 
116
+ });
readme.txt CHANGED
@@ -216,6 +216,18 @@ Please upgrade your version of WP Google Maps to version 6.0.27 as it includes m
216
 
217
  == Changelog ==
218
 
 
 
 
 
 
 
 
 
 
 
 
 
219
  = 7.10.32 :- 2018-08-31 :- Medium priority =
220
  * Fixed redundant setting wpgmza_gdpr_enabled causing "user consent not given" to be flagged erroneously
221
 
216
 
217
  == Changelog ==
218
 
219
+ = 7.10.34 :- 2018-09-17 :- Low priority =
220
+ * Added descriptive error messages when Google API is required but not loaded
221
+ * Added "I agree" translation to German files
222
+ * Added getPluginScripts to Scriptloader module
223
+ * jQuery 3.x document ready compatibility
224
+ * Changed wpgmza_google_api_status to be passed via wp_localize_script to prevent redirection issues in some circumstances
225
+ * Prevented UGM e-mail address being transmitted in WPGMZA_localized_data
226
+ * Removed redundant locationSelect dropdown
227
+
228
+ = 7.10.33 :- 2018-09-05 :- Medium priority =
229
+ * Fixed OpenLayers InfoWindow not opening
230
+
231
  = 7.10.32 :- 2018-08-31 :- Medium priority =
232
  * Fixed redundant setting wpgmza_gdpr_enabled causing "user consent not given" to be flagged erroneously
233
 
upload.js CHANGED
@@ -1,4 +1,5 @@
1
- jQuery(document).ready(function() {
 
2
 
3
  var clicked_on_imgbtn = false;
4
  var clicked_on_markerbtn = false;
1
+ jQuery(function($) {
2
+
3
 
4
  var clicked_on_imgbtn = false;
5
  var clicked_on_markerbtn = false;
wpGoogleMaps.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: WP Google Maps
4
  Plugin URI: https://www.wpgmaps.com
5
  Description: The easiest to use Google Maps plugin! Create custom Google Maps with high quality markers containing locations, descriptions, images and links. Add your customized map to your WordPress posts and/or pages quickly and easily with the supplied shortcode. No fuss.
6
- Version: 7.10.33
7
  Author: WP Google Maps
8
  Author URI: https://www.wpgmaps.com
9
  Text Domain: wp-google-maps
@@ -11,6 +11,15 @@ Domain Path: /languages
11
  */
12
 
13
  /*
 
 
 
 
 
 
 
 
 
14
  * 7.10.33 :- 2018-09-05 :- Medium priority
15
  * Fixed OpenLayers InfoWindow not opening
16
  *
@@ -520,7 +529,7 @@ if(!function_exists('wpgmza_show_php_version_error'))
520
  <div class="notice notice-error">
521
  <p>
522
  <?php
523
- _e('WP Google Maps: This plugin does not support PHP version 5.2 or below. Please use your cPanel or speak to your host to switch version.', 'wp-google-maps');
524
  ?>
525
  </p>
526
  </div>
@@ -1265,7 +1274,7 @@ function wpgmaps_admin_edit_marker_javascript() {
1265
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo wpgmaps_get_plugin_url(); ?>css/data_table.css" />
1266
  <script type="text/javascript" src="<?php echo wpgmaps_get_plugin_url(); ?>js/jquery.dataTables.min.js"></script>
1267
  <script type="text/javascript" >
1268
- jQuery(document).ready(function(){
1269
  function wpgmza_InitMap() {
1270
  var myLatLng = new WPGMZA.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
1271
  MYMAP.init('#wpgmza_map', myLatLng, 15);
@@ -2871,7 +2880,16 @@ function wpgmaps_tag_basic( $atts ) {
2871
  $googleMapsAPILoader->loadGoogleMaps();
2872
  });*/
2873
 
2874
- $core_dependencies = array('wpgmza');
 
 
 
 
 
 
 
 
 
2875
 
2876
  $apiLoader = new WPGMZA\GoogleMapsAPILoader();
2877
  // if(!empty($wpgmza_settings['wpgmza_settings_remove_api']))
@@ -3122,7 +3140,7 @@ function wpgmaps_sl_user_output_basic($map_id) {
3122
 
3123
  $ret_msg .= " <div class='wpgmza-not-found-msg js-not-found-msg'><p>" . $sl_not_found_message . "</p></div>";
3124
  $ret_msg .= " </div>";
3125
- $ret_msg .= " <div><select id=\"locationSelect\" style=\"width:100%;visibility:hidden\"></select></div>";
3126
 
3127
  return $ret_msg;
3128
 
@@ -3683,7 +3701,7 @@ function wpgmaps_head() {
3683
  ?>
3684
  <script type='text/javascript'>
3685
 
3686
- jQuery(document).ready(function() {
3687
  window.location.reload();
3688
  });
3689
 
@@ -3747,7 +3765,7 @@ function wpgmaps_head() {
3747
  ?>
3748
  <script type='text/javascript'>
3749
 
3750
- jQuery(document).ready(function() {
3751
  window.location.reload();
3752
  });
3753
 
@@ -7892,7 +7910,7 @@ function wpgmaps_b_admin_add_circle_javascript()
7892
  bounds: null
7893
  };
7894
 
7895
- $(document).ready(function(){
7896
  function wpgmza_InitMap() {
7897
 
7898
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);
@@ -8312,7 +8330,7 @@ function wpgmaps_b_admin_add_rectangle_javascript()
8312
 
8313
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
8314
 
8315
- $(document).ready(function(){
8316
  function wpgmza_InitMap() {
8317
 
8318
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);
3
  Plugin Name: WP Google Maps
4
  Plugin URI: https://www.wpgmaps.com
5
  Description: The easiest to use Google Maps plugin! Create custom Google Maps with high quality markers containing locations, descriptions, images and links. Add your customized map to your WordPress posts and/or pages quickly and easily with the supplied shortcode. No fuss.
6
+ Version: 7.10.34
7
  Author: WP Google Maps
8
  Author URI: https://www.wpgmaps.com
9
  Text Domain: wp-google-maps
11
  */
12
 
13
  /*
14
+ * 7.10.34 :- 2018-09-17 :- Low priority
15
+ * Added descriptive error messages when Google API is required but not loaded
16
+ * Added "I agree" translation to German files
17
+ * Added getPluginScripts to Scriptloader module
18
+ * jQuery 3.x document ready compatibility
19
+ * Changed wpgmza_google_api_status to be passed via wp_localize_script to prevent redirection issues in some circumstances
20
+ * Prevented UGM e-mail address being transmitted in WPGMZA_localized_data
21
+ * Removed redundant locationSelect dropdown
22
+ *
23
  * 7.10.33 :- 2018-09-05 :- Medium priority
24
  * Fixed OpenLayers InfoWindow not opening
25
  *
529
  <div class="notice notice-error">
530
  <p>
531
  <?php
532
+ _e('<strong>WP Google Maps:</strong> This plugin does not support PHP version 5.2 or below. Please use your cPanel or contact your host to switch version.', 'wp-google-maps');
533
  ?>
534
  </p>
535
  </div>
1274
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo wpgmaps_get_plugin_url(); ?>css/data_table.css" />
1275
  <script type="text/javascript" src="<?php echo wpgmaps_get_plugin_url(); ?>js/jquery.dataTables.min.js"></script>
1276
  <script type="text/javascript" >
1277
+ jQuery(function($) {
1278
  function wpgmza_InitMap() {
1279
  var myLatLng = new WPGMZA.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
1280
  MYMAP.init('#wpgmza_map', myLatLng, 15);
2880
  $googleMapsAPILoader->loadGoogleMaps();
2881
  });*/
2882
 
2883
+ //$core_dependencies = array('wpgmza');
2884
+
2885
+ $core_dependencies = array();
2886
+ $scriptLoader = new WPGMZA\ScriptLoader($wpgmza->isProVersion());
2887
+ $v8Scripts = $scriptLoader->getPluginScripts();
2888
+
2889
+ foreach($v8Scripts as $handle => $script)
2890
+ {
2891
+ $core_dependencies[] = $handle;
2892
+ }
2893
 
2894
  $apiLoader = new WPGMZA\GoogleMapsAPILoader();
2895
  // if(!empty($wpgmza_settings['wpgmza_settings_remove_api']))
3140
 
3141
  $ret_msg .= " <div class='wpgmza-not-found-msg js-not-found-msg'><p>" . $sl_not_found_message . "</p></div>";
3142
  $ret_msg .= " </div>";
3143
+ //$ret_msg .= " <div><select id=\"locationSelect\" style=\"width:100%;visibility:hidden\"></select></div>";
3144
 
3145
  return $ret_msg;
3146
 
3701
  ?>
3702
  <script type='text/javascript'>
3703
 
3704
+ jQuery(function($) {
3705
  window.location.reload();
3706
  });
3707
 
3765
  ?>
3766
  <script type='text/javascript'>
3767
 
3768
+ jQuery(function($) {
3769
  window.location.reload();
3770
  });
3771
 
7910
  bounds: null
7911
  };
7912
 
7913
+ jQuery(function($) {
7914
  function wpgmza_InitMap() {
7915
 
7916
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);
8330
 
8331
  var myLatLng = new google.maps.LatLng(<?php echo $wpgmza_lat; ?>,<?php echo $wpgmza_lng; ?>);
8332
 
8333
+ jQuery(function($) {
8334
  function wpgmza_InitMap() {
8335
 
8336
  MYMAP.init('#wpgmza_map', myLatLng, <?php echo $start_zoom; ?>);