From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 16 Jul 2010 00:55:25 +0000 (-0400)
Subject: Zoom level must be set before the form is serialized.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=02a40f1480e58ce7829e127075ec958ab26ee5d6;p=horde.git

Zoom level must be set before the form is serialized.

Not sure why this was moved until after the form is serialized, but
it breaks saving the event map's zoom level.
---

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index aa7971aea..1656fa24c 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -4893,6 +4893,10 @@ KronolithCore = {
             eventid = $F('kronolithEventId'),
             params;
 
+        if (this.mapInitialized) {
+            $('kronolithEventMapZoom').value = this.map.getZoom();
+        }
+
         params = $H($('kronolithEventForm').serialize({ hash: true }))
             .merge(this.saveEventParams());
         params.set('as_new', asnew ? 1 : 0);
@@ -4900,9 +4904,6 @@ KronolithCore = {
         this.eventTagAc.shutdown();
         $('kronolithEventSave').disable();
         $('kronolithEventSaveAsNew').disable();
-        if (this.mapInitialized) {
-            $('kronolithEventMapZoom').value = this.map.getZoom();
-        }
         this.startLoading(target, params.get('sig'));
         this.doAction('saveEvent',
                       params,
@@ -5116,7 +5117,7 @@ KronolithCore = {
         if (ev.gl) {
             $('kronolithEventLocationLat').value = ev.gl.lat;
             $('kronolithEventLocationLon').value = ev.gl.lon;
-            $('kronolithEventMapZoom').value = ev.gl.zoom;
+            $('kronolithEventMapZoom').value = Math.max(1, ev.gl.zoom);
         }
 
         if (!ev.pe) {