Ignore:
Timestamp:
Apr 21, 2011, 11:16:43 PM (13 years ago)
Author:
grum
Message:

bug:2148 - compatibility with piwigo 2.2
bug:2062 - compatibility with IE7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/GMaps/gmaps_pip.class.inc.php

    r7616 r10551  
    126126      }
    127127
    128       GPCCore::addHeaderJS("jquery", "themes/default/js/jquery.packed.js");
     128      GPCCore::addHeaderJS("jquery", "themes/default/js/jquery.min.js");
    129129      GPCCore::addHeaderJS("maps.google.com/api", "http://maps.google.com/maps/api/js?sensor=false");
    130       GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup.packed.js");
     130      GPCCore::addHeaderJS("gmaps.markup", "plugins/GMaps/js/gmapsMarkup".GPCCore::getMinified().".js", array('jquery'));
    131131
    132132      $desc = preg_replace(
     
    156156            while($row=pwg_db_fetch_assoc($result))
    157157            {
    158               $mapParam['kmlUrl']=dirname($_SERVER['SCRIPT_URI']).self::KML_DIRECTORY.$row['file'];
     158              $mapParam['kmlUrl']=$_SERVER['SCRIPT_URI'].PWG_LOCAL_DIR.self::KML_DIRECTORY.$row['file'];
    159159            }
    160160          }
     
    192192              geolocated:".($nb>0?'true':'false').",
    193193              kmlZoom:".($mapParam['kmlZoom']=='y'?'true':'false').",
    194               allowBubble:".($mapParam['allowBubble']=='y'?'true':'false').",
     194              allowBubble:".($mapParam['allowBubble']=='y'?'true':'false')."
    195195            }
    196196          ";
     
    204204            categoryId:".$page['category']['id'].",
    205205            maps:
    206             [".implode(',', $scripts)."],
     206            [".implode(',', $scripts)."]
    207207          };
    208208        </script>", false);
     
    263263                markers:[],
    264264                fitToBounds:true,
    265                 zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false').",
     265                zoomLevelMaxActivated:".($map['zoomLevelMaxActivated']=='y'?'true':'false')."
    266266              }";
    267267
     
    310310    maps:
    311311    [".implode(',', $scripts)."],
    312     popupAutomaticSize:".$this->config['popupAutomaticSize'].",
     312    popupAutomaticSize:".$this->config['popupAutomaticSize']."
    313313  };
    314314</script>", false);
     
    496496      {
    497497        latitude:'".$this->picture['coords']['lat']."',
    498         longitude:'".$this->picture['coords']['lng']."',
     498        longitude:'".$this->picture['coords']['lng']."'
    499499      },
    500500      maps:
Note: See TracChangeset for help on using the changeset viewer.