Skip to content

Commit

Permalink
feature 2885: forgotten jQuery(document).ready
Browse files Browse the repository at this point in the history
git-svn-id: http://piwigo.org/svn/trunk@23497 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
plegall committed Jun 24, 2013
1 parent 46dd825 commit e41f9bd
Showing 1 changed file with 40 additions and 38 deletions.
78 changes: 40 additions & 38 deletions admin/themes/default/template/history.tpl
Expand Up @@ -138,43 +138,45 @@
{combine_script id='jquery.geoip' load='async' path='admin/themes/default/js/jquery.geoip.js'}

{footer_script}{literal}
jQuery(".IP").one( "mouseenter", function(){
var that = $(this);
that
.data("isOver", true)
.one("mouseleave", function() {
that.removeData("isOver");
});
GeoIp.get( that.text(), function(data) {
if (!data.fullName) return;
var content = data.fullName;
if (data.latitude && data.region_name) {
content += '<br><a class="ipGeoOpen" data-lat="'+data.latitude+'" data-lon="'+data.longitude+'"';
content += ' href="#">show on a Google Map</a>';
}

that.tipTip( {
content: content,
keepAlive: true,
defaultPosition: "right",
maxWidth: 320,
} );
if (that.data("isOver"))
that.trigger("mouseenter");
});
} );

jQuery(document).on('click', '.ipGeoOpen', function() {
var lat = jQuery(this).data("lat");
var lon = jQuery(this).data("lon");
var parent = jQuery(this).parent();
jQuery(this).remove();
var append = '<br><img width=300 height=220 src="http://maps.googleapis.com/maps/api/staticmap';
append += '?sensor=false&size=300x220&zoom=6&markers=size:tiny%7C' + lat + ',' + lon + '">';
jQuery(parent).append(append);
return false;
jQuery(document).ready( function() {
jQuery(".IP").one( "mouseenter", function(){
var that = $(this);
that
.data("isOver", true)
.one("mouseleave", function() {
that.removeData("isOver");
});
GeoIp.get( that.text(), function(data) {
if (!data.fullName) return;
var content = data.fullName;
if (data.latitude && data.region_name) {
content += '<br><a class="ipGeoOpen" data-lat="'+data.latitude+'" data-lon="'+data.longitude+'"';
content += ' href="#">show on a Google Map</a>';
}

that.tipTip( {
content: content,
keepAlive: true,
defaultPosition: "right",
maxWidth: 320,
} );
if (that.data("isOver"))
that.trigger("mouseenter");
});
} );

jQuery(document).on('click', '.ipGeoOpen', function() {
var lat = jQuery(this).data("lat");
var lon = jQuery(this).data("lon");
var parent = jQuery(this).parent();
jQuery(this).remove();
var append = '<br><img width=300 height=220 src="http://maps.googleapis.com/maps/api/staticmap';
append += '?sensor=false&size=300x220&zoom=6&markers=size:tiny%7C' + lat + ',' + lon + '">';
jQuery(parent).append(append);
return false;
});
});
{/literal}{/footer_script}

0 comments on commit e41f9bd

Please sign in to comment.