Changeset 38682

Timestamp:

11/19/10 00:17:07 (2 years ago)

Author:

NeoCat

Message:

Move toggleGeoTag to twicli.js / fix marker link issue

Location:

websites/twicli

Files:

• plugins/geomap.js (modified) (2 diffs)
• twicli.js (modified) (1 diff)

websites/twicli/plugins/geomap.js

@@ -41 +41 @@
         var marker = new google.maps.Marker({position: latlng, map: map});
 
-        if(mapAccCircleOption.radius = coordinates.pop()) {
+        if (coordinates[2]) {
+                mapAccCircleOption.radius = coordinates.pop();
                 var accCircle = new google.maps.Circle(mapAccCircleOption);
                 accCircle.setCenter(latlng);
@@ -60 +61 @@
 };
 
-function toggleGeoTag() {
-        if (!geowatch) {
-                geowatch = navigator.geolocation.watchPosition(function(g){
-                        geo = g;
-                        var maplink = typeof(display_map) == 'function';
-                        $("geotag-info").innerHTML = " : " + (maplink ? '<a href="javascript:display_map([geo.coords.latitude, geo.coords.longitude, geo.coords.accuracy], $(\'geotag-info\'))">' : '') + g.coords.latitude + ", " + g.coords.longitude + " (" + g.coords.accuracy + "m)" + (maplink ? '</a>' : '');
-                        setFstHeight(null, true);
-                });
-                $("geotag-img").src = "images/earth.png";
-                $("geotag-st").innerHTML = "ON";
-                $("geotag-info").innerHTML = " : -";
-        } else {
-                navigator.geolocation.clearWatch(geowatch);
-                geo = geowatch = null;
-                $("geotag-img").src = "images/earth_off.png";
-                $("geotag-st").innerHTML = "OFF";
-                $("geotag-info").innerHTML = "";
-                setFstHeight(null, true);
-        }
-}
-
 document.write('<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>');

websites/twicli/twicli.js

@@ -418 +418 @@
                         geo = g;
                         var maplink = typeof(display_map) == 'function';
-                        $("geotag-info").innerHTML = " : " + (maplink ? '<a href="javascript:display_map([geo.coords.latitude, geo.coords.longitude], $(\'geotag-info\'))">' : '') + g.coords.latitude + ", " + g.coords.longitude + " (" + g.coords.accuracy + "m)" + (maplink ? '</a>' : '');
+                        $("geotag-info").innerHTML = " : " + (maplink ? '<a href="javascript:display_map([geo.coords.latitude, geo.coords.longitude, geo.coords.accuracy], $(\'geotag-info\'))">' : '') + g.coords.latitude + ", " + g.coords.longitude + " (" + g.coords.accuracy + "m)" + (maplink ? '</a>' : '');
                         setFstHeight(null, true);
                 });