Changeset 22683

Timestamp:

May 16, 2013, 6:31:48 AM (12 years ago)

Author:

rvelices

Message:

feature 2885: Add geoip info in the stats / history page

• use jsonp (cross origin)
• use localStorage cache
• use tiptip instead of ui tooltip

Location:

trunk/admin/themes/default

Files:

• js/jquery.geoip.js (modified) (3 diffs)
• template/history.tpl (modified) (1 diff)

trunk/admin/themes/default/js/jquery.geoip.js

@@ -5 +5 @@
         
         get: function(ip, callback){
+                if (!GeoIp.storageInit && window.localStorage) {
+                        GeoIp.storageInit = true;
+                        var cache = localStorage.getItem("freegeoip");
+                        if (cache) {
+                                cache = JSON.parse(cache);
+                                for (var ip in cache) {
+                                        var data = cache[ip];
+                                        if ( (new Date()).getTime() - data.reqTime > 36 * 3600000)
+                                                delete cache[ip];
+                                }
+                                GeoIp.cache = cache;
+                        }
+                        jQuery(window).on("unload", function() {
+                                localStorage.setItem("freegeoip", JSON.stringify(GeoIp.cache) );
+                        } );
+                }
+
                 if (GeoIp.cache.hasOwnProperty(ip))
                         callback(GeoIp.cache[ip]);
@@ -13 +30 @@
                         jQuery.ajax( {
                                 url: "http://freegeoip.net/json/" + ip,
-                                dataType: "json",
+                                dataType: "jsonp",
+                                cache: true,
                                 success: function(data) {
+                                        data.reqTime = (new Date()).getTime();
                                         var res=[];
                                         if (data.city) res.push(data.city);
@@ -29 +48 @@
 
                                 error: function() {
-                                        var data = {ip:ip, fullName:""};
+                                        var data = {ip:ip, fullName:"", reqTime: (new Date()).getTime()};
 
                                         GeoIp.cache[ip] = data;

trunk/admin/themes/default/template/history.tpl

@@ -137 +137 @@
 
 {combine_script id='jquery.geoip' load='async' path='admin/themes/default/js/jquery.geoip.js'}
-{combine_script id='jquery.ui.tooltip' load='footer'}
 
 {footer_script}{literal}
-jQuery(".IP").tooltip( {
-        items: "*",
-        /*show: {delay:0, effect:"show"},
-        hide: {delay:50, effect:"hide"},*/
-        content: function(response) {
-                var that = $(this);
-                GeoIp.get( that.text(), function(data) {
-                        response( data.fullName );
+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;
+                that.tipTip( {
+                        content: data.fullName
+                        }       );
+                if (that.data("isOver"))
+                        that.trigger("mouseenter");
+        });
+} );
 {/literal}{/footer_script}