WD Google Maps – Google Maps builder Plugin - Version 1.0.42

Version Description

  • Fixed: JS error on shortcode editor pop-up
Download this release

Release Info

Developer webdorado
Plugin Icon 128x128 WD Google Maps – Google Maps builder Plugin
Version 1.0.42
Comparing to
See all releases

Code changes from version 1.0.41 to 1.0.42

Files changed (4) hide show
  1. admin/views/GMWDViewShortcode_gmwd.php +10 -8
  2. gmwd_admin_class.php +1 -1
  3. readme.txt +4 -1
  4. wd-google-maps.php +1 -1
admin/views/GMWDViewShortcode_gmwd.php CHANGED
@@ -26,7 +26,7 @@ class GMWDViewShortcode_gmwd extends GMWDView{
26
  $maps = $this->model->get_maps();
27
  $whitelist = array( '127.0.0.1', '::1' );
28
  $is_localhost = in_array( $_SERVER['REMOTE_ADDR'], $whitelist) ? 1 : 0;
29
- $map_api_url = "https://maps.googleapis.com/maps/api/js?libraries=places&sensor=false&v=3.exp";
30
 
31
  if(gmwd_get_option("map_language")){
32
  $map_api_url .= "&language=" . gmwd_get_option("map_language");
@@ -41,9 +41,9 @@ class GMWDViewShortcode_gmwd extends GMWDView{
41
  }
42
  ?>
43
 
44
- <script language="javascript" type="text/javascript" src="<?php echo site_url(); ?> /wp-includes/js/tinymce/tiny_mce_popup.js"></script>
45
  <script language="javascript" type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/utils/mctabs.js"></script>
46
- <script language="javascript" type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>
47
  <script src="<?php echo GMWD_URL . '/js/admin_main.js'; ?>" type="text/javascript"></script>
48
  <script src="<?php echo GMWD_URL . '/js/simple-slider.js'; ?>" type="text/javascript"></script>
49
  <script src="<?php echo $map_api_url; ?>" type="text/javascript"></script>
@@ -66,7 +66,7 @@ class GMWDViewShortcode_gmwd extends GMWDView{
66
 
67
  <?php
68
  if (isset($_POST['tag_text'])) {
69
- echo '<script>tinyMCEPopup.close();</script>';
70
  die();
71
  }
72
  ?>
@@ -93,7 +93,7 @@ class GMWDViewShortcode_gmwd extends GMWDView{
93
  <tr>
94
  <td colspan="2">
95
  <input type="button" id="wd_insert" name="" value="Insert" class="wd-btn wd-btn-primary" onClick="gmwdInsertShortcode();" />
96
- <input type="button" id="" name="" value="Cancel" class="wd-btn wd-btn-secondary" onClick="tinyMCEPopup.close();" />
97
  </td>
98
  </tr>
99
  </table>
@@ -223,7 +223,8 @@ class GMWDViewShortcode_gmwd extends GMWDView{
223
  function gmwdShortcodeParams(){
224
  var params = {};
225
 
226
- var editorText = tinyMCE.activeEditor.selection.getContent();
 
227
  var start = editorText.indexOf("[Google_Maps_WD");
228
  var end = editorText.indexOf("]", start);
229
  var shortcodes = [];
@@ -277,8 +278,9 @@ class GMWDViewShortcode_gmwd extends GMWDView{
277
  jQuery("#tag_text").val(tagText);
278
  jQuery("#adminForm").submit();
279
 
280
- window.tinyMCE.execCommand('mceInsertContent', false, short_code);
281
- tinyMCEPopup.editor.execCommand('mceRepaint');
 
282
  }
283
 
284
 
26
  $maps = $this->model->get_maps();
27
  $whitelist = array( '127.0.0.1', '::1' );
28
  $is_localhost = in_array( $_SERVER['REMOTE_ADDR'], $whitelist) ? 1 : 0;
29
+ $map_api_url = "https://maps.googleapis.com/maps/api/js?libraries=places,geometry&v=3.exp";
30
 
31
  if(gmwd_get_option("map_language")){
32
  $map_api_url .= "&language=" . gmwd_get_option("map_language");
41
  }
42
  ?>
43
 
44
+ <!--<script language="javascript" type="text/javascript" src="<?php echo site_url(); ?> /wp-includes/js/tinymce/tiny_mce_popup.js"></script>
45
  <script language="javascript" type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/utils/mctabs.js"></script>
46
+ <script language="javascript" type="text/javascript" src="<?php echo site_url(); ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>-->
47
  <script src="<?php echo GMWD_URL . '/js/admin_main.js'; ?>" type="text/javascript"></script>
48
  <script src="<?php echo GMWD_URL . '/js/simple-slider.js'; ?>" type="text/javascript"></script>
49
  <script src="<?php echo $map_api_url; ?>" type="text/javascript"></script>
66
 
67
  <?php
68
  if (isset($_POST['tag_text'])) {
69
+ echo '<script>top.tinyMCE.activeEditor.windowManager.close(window);</script>';
70
  die();
71
  }
72
  ?>
93
  <tr>
94
  <td colspan="2">
95
  <input type="button" id="wd_insert" name="" value="Insert" class="wd-btn wd-btn-primary" onClick="gmwdInsertShortcode();" />
96
+ <input type="button" id="" name="" value="Cancel" class="wd-btn wd-btn-secondary" onClick="top.tinyMCE.activeEditor.windowManager.close(window);" />
97
  </td>
98
  </tr>
99
  </table>
223
  function gmwdShortcodeParams(){
224
  var params = {};
225
 
226
+ //var editorText = tinyMCE.activeEditor.selection.getContent();
227
+ var editorText = top.tinyMCE.activeEditor.selection.getContent();
228
  var start = editorText.indexOf("[Google_Maps_WD");
229
  var end = editorText.indexOf("]", start);
230
  var shortcodes = [];
278
  jQuery("#tag_text").val(tagText);
279
  jQuery("#adminForm").submit();
280
 
281
+ //window.tinyMCE.execCommand('mceInsertContent', false, short_code);
282
+ top.tinyMCE.execCommand('mceInsertContent', false, short_code);
283
+ //top.tinyMCEPopup.editor.execCommand('mceRepaint');
284
  }
285
 
286
 
gmwd_admin_class.php CHANGED
@@ -11,7 +11,7 @@ class GMWDAdmin{
11
  // Variables //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  protected static $instance = null;
14
- private static $version = '1.0.41';
15
  ////////////////////////////////////////////////////////////////////////////////////////
16
  // Constructor & Destructor //
17
  ////////////////////////////////////////////////////////////////////////////////////////
11
  // Variables //
12
  ////////////////////////////////////////////////////////////////////////////////////////
13
  protected static $instance = null;
14
+ private static $version = '1.0.42';
15
  ////////////////////////////////////////////////////////////////////////////////////////
16
  // Constructor & Destructor //
17
  ////////////////////////////////////////////////////////////////////////////////////////
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://web-dorado.com/products/wordpress-google-maps-plugin.html
4
  Tags: google map, google maps, map, map markers, maps, directions, google map plugin, google maps plugin, map plugin, map widget, wp google map, wp google maps, google map widget, google map shortcode, wp map, google maps directions, google maps builder, google places, google places api, google maps api, google places reviews, contact page map, custom google map, loaction by address, location, map direction, map styles, polygons, simple google map, gmap, google map embed, best google maps, custom google maps
5
  Requires at least: 3.4
6
  Tested up to: 4.8
7
- Stable tag: 1.0.41
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -117,6 +117,9 @@ After downloading the ZIP file of the Google Maps WD plugin,
117
 
118
  == Changelog ==
119
 
 
 
 
120
  = 1.0.41 =
121
  * Fixed: Center Map in fullscreen mode
122
 
4
  Tags: google map, google maps, map, map markers, maps, directions, google map plugin, google maps plugin, map plugin, map widget, wp google map, wp google maps, google map widget, google map shortcode, wp map, google maps directions, google maps builder, google places, google places api, google maps api, google places reviews, contact page map, custom google map, loaction by address, location, map direction, map styles, polygons, simple google map, gmap, google map embed, best google maps, custom google maps
5
  Requires at least: 3.4
6
  Tested up to: 4.8
7
+ Stable tag: 1.0.42
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
117
 
118
  == Changelog ==
119
 
120
+ = 1.0.42 =
121
+ * Fixed: JS error on shortcode editor pop-up
122
+
123
  = 1.0.41 =
124
  * Fixed: Center Map in fullscreen mode
125
 
wd-google-maps.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Google Maps WD
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-maps-plugin.html
6
  * Description: Google Maps WD is an intuitive tool for creating Google maps with advanced markers, custom layers and overlays for your website.
7
- * Version: 1.0.41
8
  * Author: WebDorado
9
  * Author URI: http://web-dorado.com/
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
4
  * Plugin Name: Google Maps WD
5
  * Plugin URI: https://web-dorado.com/products/wordpress-google-maps-plugin.html
6
  * Description: Google Maps WD is an intuitive tool for creating Google maps with advanced markers, custom layers and overlays for your website.
7
+ * Version: 1.0.42
8
  * Author: WebDorado
9
  * Author URI: http://web-dorado.com/
10
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html