Changeset 2451062

Timestamp:

01/06/2021 07:49:08 AM (5 years ago)

Author:

intelchip

Message:

Bugfixes & Feature update

• jQuery dependency bugfix
• NEW: Introduced visibility toggle for markers

Location:

osm-map-elementor/trunk

Files:

• README.md (modified) (1 diff)
• assets/marker_visibility_toggle.jpg (added)
• constants.php (modified) (1 diff)
• osm-map-elementor.php (modified) (1 diff)
• osm-map.php (modified) (8 diffs)
• readme.txt (modified) (1 diff)

osm-map-elementor/trunk/README.md

@@ -23 +23 @@
     
       <img src="https://raw.githubusercontent.com/flopperj/osm-map-elementor/master/assets/screenshot-5.jpg" width="500" height="auto" />
+          
+##  Changelog
+[LATEST CHANGES](https://github.com/flopperj/osm-map-elementor/wiki/Changelog)
+
 ## Licence
 [GNU GENERAL PUBLIC LICENSE](https://raw.githubusercontent.com/flopperj/osm-map-elementor/master/LICENSE.txt)

osm-map-elementor/trunk/constants.php

@@ -1 +1 @@
 <?php
 define('OSM_MAP_SLUG', 'osm-map-elementor');
+define('OSM_MAP_VERSION', '1.0.5');

osm-map-elementor/trunk/osm-map-elementor.php

@@ -5 +5 @@
  * Author:          ACT Innovate, James Arama, Alex Hooten
  * Author URI:      https://github.com/flopperj/elementor-osm-map
- * Version:         1.0.4
+ * Version:         1.0.5
  */
 

osm-map-elementor/trunk/osm-map.php

@@ -24 +24 @@
 
     public static $slug = OSM_MAP_SLUG;
+    public static $ver = OSM_MAP_VERSION;
 
     /**
@@ -209 +210 @@
                 'input_type' => 'url',
                 'placeholder' => __('https://your-link.com', self::$slug),
+            ]
+        );
+
+        $repeater->add_control(
+            'marker_visible',
+            [
+                'label' => __('Show Marker', self::$slug),
+                'type' => \Elementor\Controls_Manager::SWITCHER,
+                'label_on' => __('Show', self::$slug),
+                'label_off' => __('Hide', self::$slug),
+                'return_value' => 'yes',
+                'default' => 'yes',
             ]
         );
@@ -1292 +1305 @@
         $coords = [];
         foreach ($markers as $marker) {
+
+            // hide markers that have been toggled off
+            if (isset($marker['marker_visible']) && empty($marker['marker_visible'])) {
+                continue;
+            }
+
             $loc = explode(',', $marker['marker_coords']);
             if (!empty($loc) && sizeof($loc) == 2) {
@@ -1558 +1577 @@
     {
         // grab global settings
-        $widget_settings = get_option('osm_widget');
+        $widget_settings = get_option('osm_widget', []);
 
         $styles = [
@@ -1567 +1586 @@
 
         // load fontawesome
-        if (!array_key_exists('enable_fontawesome', $widget_settings) || !empty($widget_settings['enable_fontawesome'])) {
+        if (!empty($widget_settings) && !array_key_exists('enable_fontawesome', $widget_settings) || !empty($widget_settings['enable_fontawesome'])) {
             $styles['font-awesome-free'] = plugins_url('/osm-map-elementor/assets/fontawesome-free-5.15.1/css/all.min.css');
         }
@@ -1576 +1595 @@
         }
 
+        // queue jquery
+        add_action('wp_enqueue_scripts', function () {
+            wp_enqueue_script('jquery');
+        });
+
         // queue admin js
         if (is_admin()) {
-
 
             // queue google maps key if provided
@@ -1586 +1609 @@
             ];
 
-            $dependencies = [];
+            $dependencies = ['jquery'];
             foreach ($admin_scripts as $handle => $path) {
-                wp_register_script($handle, $path, $dependencies, '1.0', false);
+                wp_register_script($handle, $path, $dependencies, self::$ver, false);
                 wp_enqueue_script($handle);
                 $dependencies[] = $handle;
@@ -1644 +1667 @@
 
     /**
-     * Prints out data for debugging
-     * @param $data
+     * Prints out debug information about given variable.
+     *
+     * @param boolean $var Variable to show debug information for.
+     * @param boolean $showHtml If set to true, the method prints the debug data in a screen-friendly way.
+     * @param boolean $showFrom If set to true, the method prints from where the function was called.
      */
-    private function __debug($data)
+    public function __debug($var = false, $showHtml = false, $showFrom = true)
     {
-        echo "<pre>";
-        print_r($data);
-        echo "</pre>";
+        if ($showFrom) {
+            $calledFrom = debug_backtrace();
+            echo '<strong>' . substr($calledFrom[0]['file'], 1) . '</strong>';
+            echo ' (line <strong>' . $calledFrom[0]['line'] . '</strong>)';
+        }
+        echo "\n<pre class=\"fi-debug\">\n";
+
+        $var = print_r($var, true);
+        if ($showHtml) {
+            $var = str_replace('<', '&lt;', str_replace('>', '&gt;', $var));
+        }
+        echo $var . "\n</pre>\n";
     }
 }

osm-map-elementor/trunk/readme.txt

@@ -1 +1 @@
 === OSM Map Widget for Elementor ===
 Plugin Name: OSM Map Widget for Elementor
-Version: 1.0.4
+Version: 1.0.5
 Author: ACT Innovate, James Arama, Alex Hooten
 Author URI: https://github.com/flopperj/osm-map-elementor
 Tags: elementor, elementor widget, map widget, open street map, addons
 Requires at least: 5.0
-Tested up to: 5.5.1
+Tested up to: 5.6
 Requires PHP: 5.6
 Stable tag: 1.0.4