WordPress.org
Get WordPress

Plugin Directory

Changeset 1778948


Ignore:
Timestamp:
11/30/2017 07:44:14 PM (8 years ago)
Author:
bnisia
Message:

fixed error of loading the icon path correctly when it wasnt set

Location:
ia-map-analytics-basic/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • ia-map-analytics-basic/trunk/ia-mapanalytics.php

    r1776296 r1778948  
    77Description: Easily create a map via a short code using uploaded KML or GeoJSON
    88
    9 Version: 20171127
     9Version: 20171130
    1010
    1111Author: Information Analytics

  • ia-map-analytics-basic/trunk/mapanalytics.js

    r1773535 r1778948  
    4444    var useIcon = "";
    4545    var title = "";
    46     if (jQuery("#useIcon").val()) {
     46    if (jQuery('#useIcon')[0].checked) {
    4747      useIcon = jQuery("#sample_icon_url").prop("src");
    4848      if (useIcon == "") {
    … …  
    9191      top.MapAnalytic = {};
    9292      top.MapAnalytic.lat = 45.5;
    93       top.MapAnalytic.lon = -115.0;
     93      top.MapAnalytic.lon = -115;
    9494      top.MapAnalytic.zoom = 12;
    9595      top.MapAnalytic.type = "HYBRID";
    … …  
    121121    var custom_uploader = wp.media.frames.file_frame = wp.media({title:"Select KML or JSON overlay", library:{type:["application/vnd.google-earth.kml+xml", "application/vnd.geo+json"]}, button:{text:"get kml or json"}, multiple:false});
    122122    custom_uploader.on("select", function() {
    123       attachment = custom_uploader.state().get("selection").first().toJSON();
     123        attachment = custom_uploader.state().get("selection").first().toJSON();
     124        var popup = "";
     125        var useIcon = "";
     126        var title = "";
     127        if (jQuery('#useIcon')[0].checked) {
     128          useIcon = jQuery("#sample_icon_url").prop("src");
     129          if (useIcon == "") {
     130            useIcon = "/wp-content/plugins/ia-mapanalytics-pro/images/markers/icon13.png";
     131          }
     132          popup = 'popup="' + jQuery("#popup").val() + '"';
     133          title = jQuery("#icon_title").val();
     134          if (title != "") {
     135            popup += ' title="' + title + '" ';
     136          }
     137        }
    124138      if (attachment.url.endsWith("json")) {
    125139        top.MapAnalytic.json = attachment.url;
    … …  
    136150  }
    137151  jQuery("#ia_add_kml").on("click", iaUploadKml);
    138   jQuery("#ia_add_map").on("click", iaAddMap);
     152  jQuery("#ia_add_map").on("click", iaAddMap); 
    139153  jQuery("#ia_add_to_map").on("click", iaAddMap);
    140154})();
Note: See TracChangeset for help on using the changeset viewer.