[Jifty-commit] r3645 - in jifty/trunk: share/web/static/js

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Tue Jul 10 08:59:25 2007
New Revision: 3645

Modified:
   jifty/trunk/lib/Jifty/Plugin/GoogleMap/Widget.pm
   jifty/trunk/share/web/static/js/google_map.js

Log:
move most js from googlemap::widget into google_map.js

Modified: jifty/trunk/lib/Jifty/Plugin/GoogleMap/Widget.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/GoogleMap/Widget.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/GoogleMap/Widget.pm	Tue Jul 10 08:59:25 2007
@@ -36,32 +36,10 @@
     my $use_default = defined $x ? 0 : 1;
     ($x, $y) = (-71.2, 42.4) if $use_default;
     my $zoom_level = $use_default ? 1 : 13;
-
-    Jifty->web->out(qq{<div @{[$self->_widget_class]} id="@{[$self->element_id]}" style="left: 200px; width: 250px; height: 250px"></div>});
+    my $element_id = $self->element_id;
+    Jifty->web->out(qq{<div @{[$self->_widget_class]} id="$element_id" style="left: 200px; width: 250px; height: 250px"></div>});
     Jifty->web->out(qq{<script type="text/javascript">
-(function() {
-if (GBrowserIsCompatible()) {
-         var map = new GMap2(document.getElementById("@{[$self->element_id]}"));
-         map.enableScrollWheelZoom();
-         map.addControl(new GSmallZoomControl());
-         map.addControl(new EditLocationControl());
-         map.setCenter(new GLatLng($y, $x), $zoom_level);
-         map._jifty_form_x = "$xid";
-         map._jifty_form_y = "$yid";
-         if (!$use_default) {// XXX should be compile time
-           map._jifty_location = new GMarker(new GLatLng($y, $x));
-           map.addOverlay(map._jifty_location);
-         }
-GEvent.addListener(map, "click", function(marker, point) {
-  if (!marker && map._jifty_edit_control.editing) {
-    map.removeOverlay(map._jifty_location);
-    map._jifty_location = new GMarker(point)
-    map.addOverlay(map._jifty_location);
-  }
-
-});
-      }
-})()
+Jifty.GMap.location_editor( \$("$element_id"), $x, $y, "$xid", "$yid", $zoom_level, $use_default);
 </script>
 });
 

Modified: jifty/trunk/share/web/static/js/google_map.js
==============================================================================
--- jifty/trunk/share/web/static/js/google_map.js	(original)
+++ jifty/trunk/share/web/static/js/google_map.js	Tue Jul 10 08:59:25 2007
@@ -3,10 +3,33 @@
 if (GMap2) {
     //document.body.onunload = "GUnload()";
 
-function EditLocationControl() {
+if(!Jifty) Jifty = {};
+Jifty.GMap = function() {};
+Jifty.GMap.location_editor = function(element, x, y, xid, yid, zoom_level, no_marker) {
+    if (!GBrowserIsCompatible())
+	return;
+
+    var map = new GMap2(element);
+    map.enableScrollWheelZoom();
+    map.addControl(new GSmallZoomControl());
+    map.addControl(new EditLocationControl());
+    map.setCenter(new GLatLng(y, x), zoom_level);
+    map._jifty_form_x = xid;
+    map._jifty_form_y = yid;
+    if (!no_maker) {
+	map._jifty_location = new GMarker(new GLatLng(y, x));
+	map.addOverlay(map._jifty_location);
+    }
+    GEvent.addListener(map, "click", function(marker, point) {
+	if (!marker && map._jifty_edit_control.editing) {
+	    map.removeOverlay(map._jifty_location);
+	    map._jifty_location = new GMarker(point)
+	    map.addOverlay(map._jifty_location);
+	}});
 }
-EditLocationControl.prototype = new GControl();
 
+function EditLocationControl() {}
+EditLocationControl.prototype = new GControl();
 
 EditLocationControl.prototype.initialize = function(map) {
   var container = document.createElement("div");