Version Description
:- 2018-07-18 :- Medium priority = * Added filter wpgmza_localized_strings * Added beginnings for REST API * Added scroll animation when edit marker is clicked * Fixed UTF-8 characters not being decoded into PHPs native charset before passing them to loadHTML in GDPR compliance module * Fixed edit marker button not re-enabled following unsuccessful geocode
Download this release
Release Info
Developer | perryrylance |
Plugin | WP Google Maps |
Version | 7.10.22 |
Comparing to | |
See all releases |
Code changes from version 7.10.21 to 7.10.22
- includes/build.log +130 -124
- includes/class.crud.php +2 -4
- includes/class.gdpr-compliance.php +2 -2
- includes/class.marker.php +12 -1
- includes/class.plugin.php +7 -16
- includes/class.rest-api.php +52 -0
- includes/class.script-loader.php +6 -3
- includes/class.strings.php +9 -3
- js/v8/core.js +44 -0
- js/v8/css-escape.js +113 -0
- js/v8/rest-api.js +29 -0
- js/v8/scripts.json +14 -0
- js/wpgmaps-admin-core.js +21 -0
- readme.txt +7 -0
- wpGoogleMaps.php +14 -2
includes/build.log
CHANGED
@@ -1,124 +1,130 @@
|
|
1 |
-
2018-07-
|
2 |
-
2018-07-
|
3 |
-
2018-07-
|
4 |
-
2018-07-
|
5 |
-
2018-07-
|
6 |
-
2018-07-
|
7 |
-
2018-07-
|
8 |
-
2018-07-
|
9 |
-
2018-07-
|
10 |
-
2018-07-
|
11 |
-
2018-07-
|
12 |
-
2018-07-
|
13 |
-
2018-07-
|
14 |
-
2018-07-
|
15 |
-
2018-07-
|
16 |
-
2018-07-
|
17 |
-
2018-07-
|
18 |
-
2018-07-
|
19 |
-
2018-07-
|
20 |
-
2018-07-
|
21 |
-
2018-07-
|
22 |
-
2018-07-
|
23 |
-
2018-07-
|
24 |
-
2018-07-
|
25 |
-
2018-07-
|
26 |
-
2018-07-
|
27 |
-
2018-07-
|
28 |
-
2018-07-
|
29 |
-
2018-07-
|
30 |
-
2018-07-
|
31 |
-
2018-07-
|
32 |
-
2018-07-
|
33 |
-
2018-07-
|
34 |
-
2018-07-
|
35 |
-
2018-07-
|
36 |
-
2018-07-
|
37 |
-
2018-07-
|
38 |
-
2018-07-
|
39 |
-
2018-07-
|
40 |
-
2018-07-
|
41 |
-
2018-07-
|
42 |
-
2018-07-
|
43 |
-
2018-07-
|
44 |
-
2018-07-
|
45 |
-
2018-07-
|
46 |
-
2018-07-
|
47 |
-
2018-07-
|
48 |
-
2018-07-
|
49 |
-
2018-07-
|
50 |
-
2018-07-
|
51 |
-
2018-07-
|
52 |
-
2018-07-
|
53 |
-
2018-07-
|
54 |
-
2018-07-
|
55 |
-
2018-07-
|
56 |
-
2018-07-
|
57 |
-
2018-07-
|
58 |
-
2018-07-
|
59 |
-
2018-07-
|
60 |
-
2018-07-
|
61 |
-
2018-07-
|
62 |
-
2018-07-
|
63 |
-
2018-07-
|
64 |
-
2018-07-
|
65 |
-
2018-07-
|
66 |
-
2018-07-
|
67 |
-
2018-07-
|
68 |
-
2018-07-
|
69 |
-
2018-07-
|
70 |
-
2018-07-
|
71 |
-
2018-07-
|
72 |
-
2018-07-
|
73 |
-
2018-07-
|
74 |
-
2018-07-
|
75 |
-
2018-07-
|
76 |
-
2018-07-
|
77 |
-
2018-07-
|
78 |
-
2018-07-
|
79 |
-
2018-07-
|
80 |
-
2018-07-
|
81 |
-
2018-07-
|
82 |
-
2018-07-
|
83 |
-
2018-07-
|
84 |
-
2018-07-
|
85 |
-
2018-07-
|
86 |
-
2018-07-
|
87 |
-
2018-07-
|
88 |
-
2018-07-
|
89 |
-
2018-07-
|
90 |
-
2018-07-
|
91 |
-
2018-07-
|
92 |
-
2018-07-
|
93 |
-
2018-07-
|
94 |
-
2018-07-
|
95 |
-
2018-07-
|
96 |
-
2018-07-
|
97 |
-
2018-07-
|
98 |
-
2018-07-
|
99 |
-
2018-07-
|
100 |
-
2018-07-
|
101 |
-
2018-07-
|
102 |
-
2018-07-
|
103 |
-
2018-07-
|
104 |
-
2018-07-
|
105 |
-
2018-07-
|
106 |
-
2018-07-
|
107 |
-
2018-07-
|
108 |
-
2018-07-
|
109 |
-
2018-07-
|
110 |
-
2018-07-
|
111 |
-
2018-07-
|
112 |
-
2018-07-
|
113 |
-
2018-07-
|
114 |
-
2018-07-
|
115 |
-
2018-07-
|
116 |
-
2018-07-
|
117 |
-
2018-07-
|
118 |
-
2018-07-
|
119 |
-
2018-07-
|
120 |
-
2018-07-
|
121 |
-
2018-07-
|
122 |
-
2018-07-
|
123 |
-
2018-07-
|
124 |
-
2018-07-
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
2018-07-18 12:19:27 :- Scanning dependencies
|
2 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/circle.js
|
3 |
+
2018-07-18 12:19:27 :- Found wpgmza-circle
|
4 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-map-object
|
5 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/compatibility.js
|
6 |
+
2018-07-18 12:19:27 :- Found wpgmza-compatibility
|
7 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
8 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/core.js
|
9 |
+
2018-07-18 12:19:27 :- Found wpgmza
|
10 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/css-escape.js
|
11 |
+
2018-07-18 12:19:27 :- Found wpgmza-wpgmza-css
|
12 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
13 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/distance.js
|
14 |
+
2018-07-18 12:19:27 :- Found wpgmza-distance
|
15 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
16 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/event-dispatcher.js
|
17 |
+
2018-07-18 12:19:27 :- Found wpgmza-event-dispatcher
|
18 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
19 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/event.js
|
20 |
+
2018-07-18 12:19:27 :- Found wpgmza-event
|
21 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
22 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/friendly-error.js
|
23 |
+
2018-07-18 12:19:27 :- Found wpgmza-friendly-error
|
24 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
25 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/geocoder.js
|
26 |
+
2018-07-18 12:19:27 :- Found wpgmza-geocoder
|
27 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
28 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/info-window.js
|
29 |
+
2018-07-18 12:19:27 :- Found wpgmza-info-window
|
30 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-event-dispatcher
|
31 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/latlng.js
|
32 |
+
2018-07-18 12:19:27 :- Found wpgmza-lat-lng
|
33 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
34 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/latlngbounds.js
|
35 |
+
2018-07-18 12:19:27 :- Found wpgmza-lat-lng-bounds
|
36 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
37 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map-object.js
|
38 |
+
2018-07-18 12:19:27 :- Found wpgmza-map-object
|
39 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-event-dispatcher
|
40 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map-settings-page.js
|
41 |
+
2018-07-18 12:19:27 :- Found wpgmza-map-settings-page
|
42 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
43 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map-settings.js
|
44 |
+
2018-07-18 12:19:27 :- Found wpgmza-map-settings
|
45 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
46 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/map.js
|
47 |
+
2018-07-18 12:19:27 :- Found wpgmza-map
|
48 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-event-dispatcher
|
49 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/maps-engine-dialog.js
|
50 |
+
2018-07-18 12:19:27 :- Found wpgmza-maps-engine-dialog
|
51 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
52 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/marker.js
|
53 |
+
2018-07-18 12:19:27 :- Found wpgmza-marker
|
54 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
55 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator-circle.js
|
56 |
+
2018-07-18 12:19:27 :- Found wpgmza-modern-store-locator-circle
|
57 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
58 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/modern-store-locator.js
|
59 |
+
2018-07-18 12:19:27 :- Found wpgmza-modern-store-locator
|
60 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
61 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/polygon.js
|
62 |
+
2018-07-18 12:19:27 :- Found wpgmza-polygon
|
63 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-map-object
|
64 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/polyline.js
|
65 |
+
2018-07-18 12:19:27 :- Found wpgmza-polyline
|
66 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-map-object
|
67 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/rest-api.js
|
68 |
+
2018-07-18 12:19:27 :- Found wpgmza-wpgmza-rest-api
|
69 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
70 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/v7-custom-script.js
|
71 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/version.js
|
72 |
+
2018-07-18 12:19:27 :- Found wpgmza-version
|
73 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza
|
74 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-circle.js
|
75 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-circle
|
76 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-circle
|
77 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-geocoder.js
|
78 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-geocoder
|
79 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-geocoder
|
80 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-info-window.js
|
81 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-info-window
|
82 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-info-window
|
83 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-map.js
|
84 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-map
|
85 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-map
|
86 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-marker.js
|
87 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-marker
|
88 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-marker
|
89 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator-circle.js
|
90 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-modern-store-locator-circle
|
91 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-modern-store-locator-circle
|
92 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-modern-store-locator.js
|
93 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-modern-store-locator
|
94 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-modern-store-locator
|
95 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polygon.js
|
96 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-polygon
|
97 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-polygon
|
98 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-polyline.js
|
99 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-polyline
|
100 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-polyline
|
101 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/google-maps/google-vertex-context-menu.js
|
102 |
+
2018-07-18 12:19:27 :- Found wpgmza-google-vertex-context-menu
|
103 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza_api_call
|
104 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-circle.js
|
105 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-circle
|
106 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-circle
|
107 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-geocoder.js
|
108 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-geocoder
|
109 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-geocoder
|
110 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-info-window.js
|
111 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-info-window
|
112 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-info-window
|
113 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-map.js
|
114 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-map
|
115 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-map
|
116 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-marker.js
|
117 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-marker
|
118 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-marker
|
119 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator-circle.js
|
120 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-modern-store-locator-circle
|
121 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-modern-store-locator-circle
|
122 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-modern-store-locator.js
|
123 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-modern-store-locator
|
124 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-modern-store-locator
|
125 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polygon.js
|
126 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-polygon
|
127 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-polygon
|
128 |
+
2018-07-18 12:19:27 :- Reading E:\Programming\Code Cabin\htdocs-quick-fix\wp-content\plugins\wp-google-maps/js/v8/open-layers/ol-polyline.js
|
129 |
+
2018-07-18 12:19:27 :- Found wpgmza-ol-polyline
|
130 |
+
2018-07-18 12:19:27 :- Adding dependency wpgmza-polyline
|
includes/class.crud.php
CHANGED
@@ -33,10 +33,8 @@ class Crud implements \IteratorAggregate, \JsonSerializable
|
|
33 |
}
|
34 |
else if(preg_match('/^-?\d+$/', $id_or_fields))
|
35 |
$id = (int)$id_or_fields;
|
36 |
-
else
|
37 |
-
var_dump($id_or_fields);
|
38 |
throw new \Exception('Invalid ID');
|
39 |
-
}
|
40 |
|
41 |
$this->table_name = $table_name;
|
42 |
|
@@ -428,7 +426,7 @@ class Crud implements \IteratorAggregate, \JsonSerializable
|
|
428 |
{
|
429 |
$this->assert_not_trashed();
|
430 |
|
431 |
-
return $this->fields;
|
432 |
}
|
433 |
|
434 |
/**
|
33 |
}
|
34 |
else if(preg_match('/^-?\d+$/', $id_or_fields))
|
35 |
$id = (int)$id_or_fields;
|
36 |
+
else
|
|
|
37 |
throw new \Exception('Invalid ID');
|
|
|
38 |
|
39 |
$this->table_name = $table_name;
|
40 |
|
426 |
{
|
427 |
$this->assert_not_trashed();
|
428 |
|
429 |
+
return array_merge($this->fields, array('id' => $this->id));
|
430 |
}
|
431 |
|
432 |
/**
|
includes/class.gdpr-compliance.php
CHANGED
@@ -35,7 +35,7 @@ class GDPRCompliance
|
|
35 |
Some visual components of WP Google Maps use 3rd party libraries which are loaded over the network. At present the libraries are Google Maps, Open Street Map, jQuery DataTables and FontAwesome. When loading resources over a network, the 3rd party server will receive your IP address and User Agent string amongst other details. Please refer to the Privacy Policy of the respective libraries for details on how they use data and the process to exercise your rights under the GDPR regulations.
|
36 |
</p>
|
37 |
<p>
|
38 |
-
WP Google Maps uses jQuery DataTables to display sortable, searchable tables, such as that seen in the Advanced Marker Listing and on the Map Edit Page. jQuery DataTables in certain circumstances uses a cookie to save and later recall the "state" of a given table - that is, the search term, sort column and order and current page. This data is
|
39 |
</p>
|
40 |
<p>
|
41 |
Please <a href="https://developers.google.com/maps/terms">see here</a> and <a href="https://maps.google.com/help/terms_maps.html">here</a> for Google\'s terms. Please also see <a href="https://policies.google.com/privacy?hl=en-GB&gl=uk">Google\'s Privacy Policy</a>. We do not send the API provider any personally identifying information, or information that could uniquely identify your device.
|
@@ -125,7 +125,7 @@ class GDPRCompliance
|
|
125 |
$html = apply_filters('wpgmza_gdpr_notice_html', $html);
|
126 |
|
127 |
$document = new DOMDocument();
|
128 |
-
@$document->loadHTML($html);
|
129 |
$document->populate($wpgmza_other_settings);
|
130 |
|
131 |
return $document->saveInnerBody();
|
35 |
Some visual components of WP Google Maps use 3rd party libraries which are loaded over the network. At present the libraries are Google Maps, Open Street Map, jQuery DataTables and FontAwesome. When loading resources over a network, the 3rd party server will receive your IP address and User Agent string amongst other details. Please refer to the Privacy Policy of the respective libraries for details on how they use data and the process to exercise your rights under the GDPR regulations.
|
36 |
</p>
|
37 |
<p>
|
38 |
+
WP Google Maps uses jQuery DataTables to display sortable, searchable tables, such as that seen in the Advanced Marker Listing and on the Map Edit Page. jQuery DataTables in certain circumstances uses a cookie to save and later recall the "state" of a given table - that is, the search term, sort column and order and current page. This data is held in local storage and retained until this is cleared manually. No libraries used by WP Google Maps transmit this information.
|
39 |
</p>
|
40 |
<p>
|
41 |
Please <a href="https://developers.google.com/maps/terms">see here</a> and <a href="https://maps.google.com/help/terms_maps.html">here</a> for Google\'s terms. Please also see <a href="https://policies.google.com/privacy?hl=en-GB&gl=uk">Google\'s Privacy Policy</a>. We do not send the API provider any personally identifying information, or information that could uniquely identify your device.
|
125 |
$html = apply_filters('wpgmza_gdpr_notice_html', $html);
|
126 |
|
127 |
$document = new DOMDocument();
|
128 |
+
@$document->loadHTML( utf8_decode($html) );
|
129 |
$document->populate($wpgmza_other_settings);
|
130 |
|
131 |
return $document->saveInnerBody();
|
includes/class.marker.php
CHANGED
@@ -4,7 +4,7 @@ namespace WPGMZA;
|
|
4 |
|
5 |
require_once(plugin_dir_path(__FILE__) . '/class.crud.php');
|
6 |
|
7 |
-
class Marker extends Crud
|
8 |
{
|
9 |
protected $custom_fields;
|
10 |
|
@@ -23,6 +23,17 @@ class Marker extends Crud
|
|
23 |
return apply_filters('wpgmza_create_marker_instance', $id_or_fields);
|
24 |
}
|
25 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
26 |
protected function get_placeholder_by_type($type)
|
27 |
{
|
28 |
global $wpgmza;
|
4 |
|
5 |
require_once(plugin_dir_path(__FILE__) . '/class.crud.php');
|
6 |
|
7 |
+
class Marker extends Crud implements \JsonSerializable
|
8 |
{
|
9 |
protected $custom_fields;
|
10 |
|
23 |
return apply_filters('wpgmza_create_marker_instance', $id_or_fields);
|
24 |
}
|
25 |
|
26 |
+
public function jsonSerialize()
|
27 |
+
{
|
28 |
+
$json = Parent::jsonSerialize();
|
29 |
+
|
30 |
+
unset($json['latlng']);
|
31 |
+
|
32 |
+
$json['custom_field_data'] = $this->custom_fields;
|
33 |
+
|
34 |
+
return $json;
|
35 |
+
}
|
36 |
+
|
37 |
protected function get_placeholder_by_type($type)
|
38 |
{
|
39 |
global $wpgmza;
|
includes/class.plugin.php
CHANGED
@@ -2,22 +2,6 @@
|
|
2 |
|
3 |
namespace WPGMZA;
|
4 |
|
5 |
-
/*class MyCustomGlobalSettings extends GlobalSettings
|
6 |
-
{
|
7 |
-
public function __construct()
|
8 |
-
{
|
9 |
-
GlobalSettings::__construct();
|
10 |
-
|
11 |
-
var_dump("It works!");
|
12 |
-
exit;
|
13 |
-
}
|
14 |
-
|
15 |
-
protected static function createInstanceDelegate()
|
16 |
-
{
|
17 |
-
return new MyCustomGlobalSettings();
|
18 |
-
}
|
19 |
-
}*/
|
20 |
-
|
21 |
class Plugin
|
22 |
{
|
23 |
const PAGE_MAP_LIST = "map-list";
|
@@ -34,6 +18,7 @@ class Plugin
|
|
34 |
public $settings;
|
35 |
|
36 |
protected $scriptLoader;
|
|
|
37 |
|
38 |
private $mysqlVersion = null;
|
39 |
private $cachedVersion = null;
|
@@ -77,9 +62,15 @@ class Plugin
|
|
77 |
}
|
78 |
|
79 |
$this->settings = (object)array_merge($this->legacySettings, $settings);
|
|
|
|
|
|
|
80 |
if(!empty($this->settings->wpgmza_maps_engine))
|
81 |
$this->settings->engine = $this->settings->wpgmza_maps_engine;
|
82 |
|
|
|
|
|
|
|
83 |
add_action('wp_enqueue_scripts', function() {
|
84 |
Plugin::$enqueueScriptsFired = true;
|
85 |
});
|
2 |
|
3 |
namespace WPGMZA;
|
4 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
5 |
class Plugin
|
6 |
{
|
7 |
const PAGE_MAP_LIST = "map-list";
|
18 |
public $settings;
|
19 |
|
20 |
protected $scriptLoader;
|
21 |
+
protected $restAPI;
|
22 |
|
23 |
private $mysqlVersion = null;
|
24 |
private $cachedVersion = null;
|
62 |
}
|
63 |
|
64 |
$this->settings = (object)array_merge($this->legacySettings, $settings);
|
65 |
+
|
66 |
+
$this->restAPI = new RestAPI();
|
67 |
+
|
68 |
if(!empty($this->settings->wpgmza_maps_engine))
|
69 |
$this->settings->engine = $this->settings->wpgmza_maps_engine;
|
70 |
|
71 |
+
if(!empty($_COOKIE['wpgmza-developer-mode']))
|
72 |
+
$this->settings->developer_mode = true;
|
73 |
+
|
74 |
add_action('wp_enqueue_scripts', function() {
|
75 |
Plugin::$enqueueScriptsFired = true;
|
76 |
});
|
includes/class.rest-api.php
ADDED
@@ -0,0 +1,52 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
|
3 |
+
namespace WPGMZA;
|
4 |
+
|
5 |
+
class RestAPI
|
6 |
+
{
|
7 |
+
const NS = 'wpgmza/v1';
|
8 |
+
|
9 |
+
public function __construct()
|
10 |
+
{
|
11 |
+
add_action('wp_enqueue_scripts', array($this, 'onEnqueueScripts'));
|
12 |
+
add_action('admin_enqueue_scripts', array($this, 'onEnqueueScripts'));
|
13 |
+
|
14 |
+
add_action('rest_api_init', array($this, 'onRestAPIInit'));
|
15 |
+
}
|
16 |
+
|
17 |
+
public function onEnqueueScripts()
|
18 |
+
{
|
19 |
+
wp_enqueue_script('wp-api');
|
20 |
+
}
|
21 |
+
|
22 |
+
public function onRestAPIInit()
|
23 |
+
{
|
24 |
+
register_rest_route(RestAPI::NS, '/markers(\/\d+)?/', array(
|
25 |
+
'methods' => 'GET',
|
26 |
+
'callback' => array($this, 'markers')
|
27 |
+
));
|
28 |
+
}
|
29 |
+
|
30 |
+
public function markers($request)
|
31 |
+
{
|
32 |
+
global $wpdb;
|
33 |
+
global $wpgmza_tblname;
|
34 |
+
|
35 |
+
$route = $request->get_route();
|
36 |
+
|
37 |
+
if(preg_match('#/wpgmza/v1/markers/(\d+)#', $route, $m))
|
38 |
+
{
|
39 |
+
$marker = new Marker($m[1]);
|
40 |
+
return $marker;
|
41 |
+
}
|
42 |
+
|
43 |
+
$results = $wpdb->get_results("SELECT * FROM $wpgmza_tblname");
|
44 |
+
|
45 |
+
// TODO: Select all custom field data too, in one query, and add that to the marker data in the following loop
|
46 |
+
|
47 |
+
foreach($results as $obj)
|
48 |
+
unset($obj->latlng);
|
49 |
+
|
50 |
+
return $results;
|
51 |
+
}
|
52 |
+
}
|
includes/class.script-loader.php
CHANGED
@@ -371,14 +371,17 @@ class ScriptLoader
|
|
371 |
|
372 |
switch($version)
|
373 |
{
|
|
|
|
|
|
|
374 |
case '5.*':
|
375 |
wp_enqueue_style('fontawesome', 'https://use.fontawesome.com/releases/v5.0.9/css/all.css');
|
376 |
-
break;
|
377 |
|
378 |
-
|
379 |
-
|
380 |
|
381 |
default:
|
|
|
382 |
break;
|
383 |
}
|
384 |
|
371 |
|
372 |
switch($version)
|
373 |
{
|
374 |
+
case 'none':
|
375 |
+
break;
|
376 |
+
|
377 |
case '5.*':
|
378 |
wp_enqueue_style('fontawesome', 'https://use.fontawesome.com/releases/v5.0.9/css/all.css');
|
|
|
379 |
|
380 |
+
if(!is_admin())
|
381 |
+
break;
|
382 |
|
383 |
default:
|
384 |
+
wp_enqueue_style('fontawesome', plugin_dir_url(__DIR__) . 'css/font-awesome.min.css');
|
385 |
break;
|
386 |
}
|
387 |
|
includes/class.strings.php
CHANGED
@@ -6,9 +6,9 @@ class Strings
|
|
6 |
{
|
7 |
public function getLocalizedStrings()
|
8 |
{
|
9 |
-
return 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 |
}
|
13 |
|
14 |
/**
|
@@ -18,6 +18,12 @@ class Strings
|
|
18 |
*/
|
19 |
public function buildDynamicStringDummyFile()
|
20 |
{
|
21 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
22 |
}
|
23 |
}
|
6 |
{
|
7 |
public function getLocalizedStrings()
|
8 |
{
|
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 |
}
|
13 |
|
14 |
/**
|
18 |
*/
|
19 |
public function buildDynamicStringDummyFile()
|
20 |
{
|
21 |
+
// For each wp_wpgmza table
|
22 |
+
// For each column
|
23 |
+
// If column is not text / varchar, continue
|
24 |
+
// If column is JSON / serialized, deserialize it
|
25 |
+
// Or, if it's plain text, put that in an object
|
26 |
+
// Iterate recursively over the object, build PHP file from values
|
27 |
+
// Write dummy file
|
28 |
}
|
29 |
}
|
js/v8/core.js
CHANGED
@@ -10,6 +10,36 @@
|
|
10 |
|
11 |
loadingHTML: '<div class="wpgmza-preloader"><div class="wpgmza-loader">...</div></div>',
|
12 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
13 |
/**
|
14 |
* @function guid
|
15 |
* @summary Utility function returns a GUID
|
@@ -368,6 +398,17 @@
|
|
368 |
|
369 |
if(elements.length > 1)
|
370 |
console.warn("Multiple jQuery versions detected: ", elements);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
371 |
});
|
372 |
|
373 |
$(window).on("load", function(event) {
|
@@ -383,4 +424,7 @@
|
|
383 |
}
|
384 |
|
385 |
});
|
|
|
|
|
|
|
386 |
})(jQuery);
|
10 |
|
11 |
loadingHTML: '<div class="wpgmza-preloader"><div class="wpgmza-loader">...</div></div>',
|
12 |
|
13 |
+
/**
|
14 |
+
* Override this method to add a scroll offset when using animated scroll
|
15 |
+
* @return number
|
16 |
+
*/
|
17 |
+
getScrollAnimationOffset: function() {
|
18 |
+
return (WPGMZA.settings.scroll_animation_offset || 0);
|
19 |
+
},
|
20 |
+
|
21 |
+
/**
|
22 |
+
* Animated scroll, accounts for animation settings and fixed header height
|
23 |
+
* @return void
|
24 |
+
*/
|
25 |
+
animateScroll: function(element, milliseconds) {
|
26 |
+
|
27 |
+
var offset = WPGMZA.getScrollAnimationOffset();
|
28 |
+
|
29 |
+
if(!milliseconds)
|
30 |
+
{
|
31 |
+
if(WPGMZA.settings.scroll_animation_milliseconds)
|
32 |
+
milliseconds = WPGMZA.settings.scroll_animation_milliseconds;
|
33 |
+
else
|
34 |
+
milliseconds = 500;
|
35 |
+
}
|
36 |
+
|
37 |
+
$("html, body").animate({
|
38 |
+
scrollTop: $(element).offset().top - offset
|
39 |
+
}, milliseconds);
|
40 |
+
|
41 |
+
},
|
42 |
+
|
43 |
/**
|
44 |
* @function guid
|
45 |
* @summary Utility function returns a GUID
|
398 |
|
399 |
if(elements.length > 1)
|
400 |
console.warn("Multiple jQuery versions detected: ", elements);
|
401 |
+
|
402 |
+
// Rest API
|
403 |
+
WPGMZA.restAPI = WPGMZA.RestAPI.createInstance();
|
404 |
+
|
405 |
+
// TODO: Move to map edit page JS
|
406 |
+
$(document).on("click", ".wpgmza_edit_btn", function() {
|
407 |
+
|
408 |
+
WPGMZA.animateScroll("#wpgmaps_tabs_markers");
|
409 |
+
|
410 |
+
});
|
411 |
+
|
412 |
});
|
413 |
|
414 |
$(window).on("load", function(event) {
|
424 |
}
|
425 |
|
426 |
});
|
427 |
+
|
428 |
+
|
429 |
+
|
430 |
})(jQuery);
|
js/v8/css-escape.js
ADDED
@@ -0,0 +1,113 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
/**
|
2 |
+
* @module WPGMZA.CSS
|
3 |
+
* @namespace WPGMZA
|
4 |
+
* @requires WPGMZA
|
5 |
+
* @summary Polyfill for CSS.escape, with thanks to @mathias
|
6 |
+
*/
|
7 |
+
|
8 |
+
/*! https://mths.be/cssescape v1.5.1 by @mathias | MIT license */
|
9 |
+
;(function(root, factory) {
|
10 |
+
// https://github.com/umdjs/umd/blob/master/returnExports.js
|
11 |
+
if (typeof exports == 'object') {
|
12 |
+
// For Node.js.
|
13 |
+
module.exports = factory(root);
|
14 |
+
} else if (typeof define == 'function' && define.amd) {
|
15 |
+
// For AMD. Register as an anonymous module.
|
16 |
+
define([], factory.bind(root, root));
|
17 |
+
} else {
|
18 |
+
// For browser globals (not exposing the function separately).
|
19 |
+
factory(root);
|
20 |
+
}
|
21 |
+
}(typeof global != 'undefined' ? global : this, function(root) {
|
22 |
+
|
23 |
+
if (root.CSS && root.CSS.escape) {
|
24 |
+
return root.CSS.escape;
|
25 |
+
}
|
26 |
+
|
27 |
+
// https://drafts.csswg.org/cssom/#serialize-an-identifier
|
28 |
+
var cssEscape = function(value) {
|
29 |
+
if (arguments.length == 0) {
|
30 |
+
throw new TypeError('`CSS.escape` requires an argument.');
|
31 |
+
}
|
32 |
+
var string = String(value);
|
33 |
+
var length = string.length;
|
34 |
+
var index = -1;
|
35 |
+
var codeUnit;
|
36 |
+
var result = '';
|
37 |
+
var firstCodeUnit = string.charCodeAt(0);
|
38 |
+
while (++index < length) {
|
39 |
+
codeUnit = string.charCodeAt(index);
|
40 |
+
// Note: there’s no need to special-case astral symbols, surrogate
|
41 |
+
// pairs, or lone surrogates.
|
42 |
+
|
43 |
+
// If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
|
44 |
+
// (U+FFFD).
|
45 |
+
if (codeUnit == 0x0000) {
|
46 |
+
result += '\uFFFD';
|
47 |
+
continue;
|
48 |
+
}
|
49 |
+
|
50 |
+
if (
|
51 |
+
// If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
|
52 |
+
// U+007F, […]
|
53 |
+
(codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F ||
|
54 |
+
// If the character is the first character and is in the range [0-9]
|
55 |
+
// (U+0030 to U+0039), […]
|
56 |
+
(index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
|
57 |
+
// If the character is the second character and is in the range [0-9]
|
58 |
+
// (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
|
59 |
+
(
|
60 |
+
index == 1 &&
|
61 |
+
codeUnit >= 0x0030 && codeUnit <= 0x0039 &&
|
62 |
+
firstCodeUnit == 0x002D
|
63 |
+
)
|
64 |
+
) {
|
65 |
+
// https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
|
66 |
+
result += '\\' + codeUnit.toString(16) + ' ';
|
67 |
+
continue;
|
68 |
+
}
|
69 |
+
|
70 |
+
if (
|
71 |
+
// If the character is the first character and is a `-` (U+002D), and
|
72 |
+
// there is no second character, […]
|
73 |
+
index == 0 &&
|
74 |
+
length == 1 &&
|
75 |
+
codeUnit == 0x002D
|
76 |
+
) {
|
77 |
+
result += '\\' + string.charAt(index);
|
78 |
+
continue;
|
79 |
+
}
|
80 |
+
|
81 |
+
// If the character is not handled by one of the above rules and is
|
82 |
+
// greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
|
83 |
+
// is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
|
84 |
+
// U+005A), or [a-z] (U+0061 to U+007A), […]
|
85 |
+
if (
|
86 |
+
codeUnit >= 0x0080 ||
|
87 |
+
codeUnit == 0x002D ||
|
88 |
+
codeUnit == 0x005F ||
|
89 |
+
codeUnit >= 0x0030 && codeUnit <= 0x0039 ||
|
90 |
+
codeUnit >= 0x0041 && codeUnit <= 0x005A ||
|
91 |
+
codeUnit >= 0x0061 && codeUnit <= 0x007A
|
92 |
+
) {
|
93 |
+
// the character itself
|
94 |
+
result += string.charAt(index);
|
95 |
+
continue;
|
96 |
+
}
|
97 |
+
|
98 |
+
// Otherwise, the escaped character.
|
99 |
+
// https://drafts.csswg.org/cssom/#escape-a-character
|
100 |
+
result += '\\' + string.charAt(index);
|
101 |
+
|
102 |
+
}
|
103 |
+
return result;
|
104 |
+
};
|
105 |
+
|
106 |
+
if (!root.CSS) {
|
107 |
+
root.CSS = {};
|
108 |
+
}
|
109 |
+
|
110 |
+
root.CSS.escape = cssEscape;
|
111 |
+
return cssEscape;
|
112 |
+
|
113 |
+
}));
|
js/v8/rest-api.js
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
/**
|
2 |
+
* @module WPGMZA.RestAPI
|
3 |
+
* @namespace WPGMZA
|
4 |
+
* @requires WPGMZA
|
5 |
+
* @summary Wrapped for the rest API
|
6 |
+
*/
|
7 |
+
(function($) {
|
8 |
+
|
9 |
+
WPGMZA.RestAPI = function()
|
10 |
+
{
|
11 |
+
|
12 |
+
}
|
13 |
+
|
14 |
+
WPGMZA.RestAPI.URL = "/wp-json/wpgmza/v1";
|
15 |
+
|
16 |
+
WPGMZA.RestAPI.createInstance = function()
|
17 |
+
{
|
18 |
+
return new WPGMZA.RestAPI();
|
19 |
+
}
|
20 |
+
|
21 |
+
WPGMZA.RestAPI.prototype.call = function(route, params)
|
22 |
+
{
|
23 |
+
if(typeof route != "string" || !route.match(/^\//))
|
24 |
+
throw new Error("Invalid route");
|
25 |
+
|
26 |
+
$.ajax(WPGMZA.RestAPI.URL + route, params);
|
27 |
+
}
|
28 |
+
|
29 |
+
})(jQuery);
|
js/v8/scripts.json
CHANGED
@@ -18,6 +18,13 @@
|
|
18 |
"pro": false,
|
19 |
"dependencies": []
|
20 |
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
21 |
"wpgmza-distance": {
|
22 |
"src": "js\/v8\/distance.js",
|
23 |
"pro": false,
|
@@ -144,6 +151,13 @@
|
|
144 |
"wpgmza-map-object"
|
145 |
]
|
146 |
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
147 |
"wpgmza-version": {
|
148 |
"src": "js\/v8\/version.js",
|
149 |
"pro": false,
|
18 |
"pro": false,
|
19 |
"dependencies": []
|
20 |
},
|
21 |
+
"wpgmza-wpgmza-css": {
|
22 |
+
"src": "js\/v8\/css-escape.js",
|
23 |
+
"pro": false,
|
24 |
+
"dependencies": [
|
25 |
+
"wpgmza"
|
26 |
+
]
|
27 |
+
},
|
28 |
"wpgmza-distance": {
|
29 |
"src": "js\/v8\/distance.js",
|
30 |
"pro": false,
|
151 |
"wpgmza-map-object"
|
152 |
]
|
153 |
},
|
154 |
+
"wpgmza-wpgmza-rest-api": {
|
155 |
+
"src": "js\/v8\/rest-api.js",
|
156 |
+
"pro": false,
|
157 |
+
"dependencies": [
|
158 |
+
"wpgmza"
|
159 |
+
]
|
160 |
+
},
|
161 |
"wpgmza-version": {
|
162 |
"src": "js\/v8\/version.js",
|
163 |
"pro": false,
|
js/wpgmaps-admin-core.js
CHANGED
@@ -49,6 +49,26 @@
|
|
49 |
$("#wpgmza_addmarker").data("original-text", $("#wpgmza_addmarker").val());
|
50 |
$("#wpgmza_addmarker_loading").hide();
|
51 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
52 |
function setMarkerAdded(added)
|
53 |
{
|
54 |
var button = $("#wpgmza_addmarker");
|
@@ -594,6 +614,7 @@
|
|
594 |
|
595 |
} else {
|
596 |
alert("Geocode was not successful for the following reason: " + status);
|
|
|
597 |
}
|
598 |
});
|
599 |
} else {
|
49 |
$("#wpgmza_addmarker").data("original-text", $("#wpgmza_addmarker").val());
|
50 |
$("#wpgmza_addmarker_loading").hide();
|
51 |
|
52 |
+
function enableEditMarkerButton(enable)
|
53 |
+
{
|
54 |
+
var button = $("#wpgmza_editmarker");
|
55 |
+
button.prop("disabled", (enable ? false : "disabled"));
|
56 |
+
button.val(enable ? button.data("original-text") : "Saving...");
|
57 |
+
|
58 |
+
if(enable)
|
59 |
+
{
|
60 |
+
button.parent().show();
|
61 |
+
$("#wpgmza_editmarker_loading").hide();
|
62 |
+
}
|
63 |
+
else
|
64 |
+
{
|
65 |
+
button.parent().hide();
|
66 |
+
$("#wpgmza_editmarker_loading").show();
|
67 |
+
}
|
68 |
+
}
|
69 |
+
$("#wpgmza_editmarker").data("original-text", $("#wpgmza_editmarker").val());
|
70 |
+
$("#wpgmza_editmarker_loading").hide();
|
71 |
+
|
72 |
function setMarkerAdded(added)
|
73 |
{
|
74 |
var button = $("#wpgmza_addmarker");
|
614 |
|
615 |
} else {
|
616 |
alert("Geocode was not successful for the following reason: " + status);
|
617 |
+
enableEditMarkerButton(true);
|
618 |
}
|
619 |
});
|
620 |
} else {
|
readme.txt
CHANGED
@@ -215,6 +215,13 @@ Please upgrade your version of WP Google Maps to version 6.0.27 as it includes m
|
|
215 |
|
216 |
== Changelog ==
|
217 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
218 |
= 7.10.21 :- 2018-07-09 :- Medium priority =
|
219 |
* Added MySQL version check and dropped ST_ function prefixes for versions < 8.0
|
220 |
* Fixed markers not appearing front end and back end marker table empty for servers running old MySQL versions
|
215 |
|
216 |
== Changelog ==
|
217 |
|
218 |
+
= 7.10.22 :- 2018-07-18 :- Medium priority =
|
219 |
+
* Added filter wpgmza_localized_strings
|
220 |
+
* Added beginnings for REST API
|
221 |
+
* Added scroll animation when edit marker is clicked
|
222 |
+
* Fixed UTF-8 characters not being decoded into PHPs native charset before passing them to loadHTML in GDPR compliance module
|
223 |
+
* Fixed edit marker button not re-enabled following unsuccessful geocode
|
224 |
+
|
225 |
= 7.10.21 :- 2018-07-09 :- Medium priority =
|
226 |
* Added MySQL version check and dropped ST_ function prefixes for versions < 8.0
|
227 |
* Fixed markers not appearing front end and back end marker table empty for servers running old MySQL versions
|
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.
|
7 |
Author: WP Google Maps
|
8 |
Author URI: https://www.wpgmaps.com
|
9 |
Text Domain: wp-google-maps
|
@@ -11,6 +11,13 @@ Domain Path: /languages
|
|
11 |
*/
|
12 |
|
13 |
/*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
14 |
* 7.10.21 :- 2018-07-09 :- Medium priority
|
15 |
* Added MySQL version check and dropped ST_ function prefixes for versions < 8.0
|
16 |
* Fixed markers not appearing front end and back end marker table empty for servers running old MySQL versions
|
@@ -2811,6 +2818,10 @@ function wpgmaps_tag_basic( $atts ) {
|
|
2811 |
if(!empty($wpgmza_settings['wpgmza_settings_remove_api']))
|
2812 |
$core_dependencies[] = 'wpgmza_api_call';
|
2813 |
|
|
|
|
|
|
|
|
|
2814 |
if($wpgmza->settings->engine == 'google-maps')
|
2815 |
{
|
2816 |
wp_enqueue_script('wpgmza_canvas_layer_options', plugin_dir_url(__FILE__) . 'lib/CanvasLayerOptions.js', array('wpgmza_api_call'));
|
@@ -4860,6 +4871,7 @@ function wpgmaps_settings_page_basic() {
|
|
4860 |
}
|
4861 |
|
4862 |
function wpgmaps_menu_advanced_layout() {
|
|
|
4863 |
if (function_exists('wpgmza_register_pro_version')) {
|
4864 |
wpgmza_pro_advanced_menu();
|
4865 |
}
|
@@ -6564,7 +6576,7 @@ function wpgmza_return_marker_list($map_id,$admin = true,$width = "100%",$mashup
|
|
6564 |
$wpgmza_tmp_body .= "<td>$pic<input type=\"hidden\" id=\"wpgmza_hid_marker_pic_".$result->id."\" value=\"".$result->pic."\" /></td>";
|
6565 |
$wpgmza_tmp_body .= "<td>$linktd<input type=\"hidden\" id=\"wpgmza_hid_marker_link_".$result->id."\" value=\"".$result->link."\" /></td>";
|
6566 |
$wpgmza_tmp_body .= "<td width='170' align='center'>";
|
6567 |
-
$wpgmza_tmp_body .= " <a
|
6568 |
$wpgmza_tmp_body .= " <a href=\"?page=wp-google-maps-menu&action=edit_marker&id=".$result->id."\" title=\"".__("Edit this marker location","wp-google-maps")."\" class=\"wpgmza_edit_btn button\" id=\"".$result->id."\"><i class=\"fa fa-map-marker\"> </i></a> ";
|
6569 |
if ($show_approval_button) {
|
6570 |
$wpgmza_tmp_body .= " <a href=\"javascript:void(0);\" title=\"".__("Approve this marker","wp-google-maps")."\" class=\"wpgmza_approve_btn button\" id=\"".$result->id."\"><i class=\"fa fa-check\"> </i> </a> ";
|
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.22
|
7 |
Author: WP Google Maps
|
8 |
Author URI: https://www.wpgmaps.com
|
9 |
Text Domain: wp-google-maps
|
11 |
*/
|
12 |
|
13 |
/*
|
14 |
+
* 7.10.22 :- 2018-07-18 :- Medium priority
|
15 |
+
* Added filter wpgmza_localized_strings
|
16 |
+
* Added beginnings for REST API
|
17 |
+
* Added scroll animation when edit marker is clicked
|
18 |
+
* Fixed UTF-8 characters not being decoded into PHPs native charset before passing them to loadHTML in GDPR compliance module
|
19 |
+
* Fixed edit marker button not re-enabled following unsuccessful geocode
|
20 |
+
*
|
21 |
* 7.10.21 :- 2018-07-09 :- Medium priority
|
22 |
* Added MySQL version check and dropped ST_ function prefixes for versions < 8.0
|
23 |
* Fixed markers not appearing front end and back end marker table empty for servers running old MySQL versions
|
2818 |
if(!empty($wpgmza_settings['wpgmza_settings_remove_api']))
|
2819 |
$core_dependencies[] = 'wpgmza_api_call';
|
2820 |
|
2821 |
+
//$googleMapsAPILoader = new WPGMZA\GoogleMapsAPILoader();
|
2822 |
+
//if(!$googleMapsAPILoader->isIncludeAllowed())
|
2823 |
+
//wp_deregister_script('wpgmza_api_call');
|
2824 |
+
|
2825 |
if($wpgmza->settings->engine == 'google-maps')
|
2826 |
{
|
2827 |
wp_enqueue_script('wpgmza_canvas_layer_options', plugin_dir_url(__FILE__) . 'lib/CanvasLayerOptions.js', array('wpgmza_api_call'));
|
4871 |
}
|
4872 |
|
4873 |
function wpgmaps_menu_advanced_layout() {
|
4874 |
+
|
4875 |
if (function_exists('wpgmza_register_pro_version')) {
|
4876 |
wpgmza_pro_advanced_menu();
|
4877 |
}
|
6576 |
$wpgmza_tmp_body .= "<td>$pic<input type=\"hidden\" id=\"wpgmza_hid_marker_pic_".$result->id."\" value=\"".$result->pic."\" /></td>";
|
6577 |
$wpgmza_tmp_body .= "<td>$linktd<input type=\"hidden\" id=\"wpgmza_hid_marker_link_".$result->id."\" value=\"".$result->link."\" /></td>";
|
6578 |
$wpgmza_tmp_body .= "<td width='170' align='center'>";
|
6579 |
+
$wpgmza_tmp_body .= " <a title=\"".__("Edit this marker","wp-google-maps")."\" class=\"wpgmza_edit_btn button\" id=\"".$result->id."\"><i class=\"fa fa-edit\"> </i> </a> ";
|
6580 |
$wpgmza_tmp_body .= " <a href=\"?page=wp-google-maps-menu&action=edit_marker&id=".$result->id."\" title=\"".__("Edit this marker location","wp-google-maps")."\" class=\"wpgmza_edit_btn button\" id=\"".$result->id."\"><i class=\"fa fa-map-marker\"> </i></a> ";
|
6581 |
if ($show_approval_button) {
|
6582 |
$wpgmza_tmp_body .= " <a href=\"javascript:void(0);\" title=\"".__("Approve this marker","wp-google-maps")."\" class=\"wpgmza_approve_btn button\" id=\"".$result->id."\"><i class=\"fa fa-check\"> </i> </a> ";
|