From 6e52fa9c57fe948ec4d870a39f462e4e63aab303 Mon Sep 17 00:00:00 2001 From: Farruco Sanjurjo Date: Fri, 22 Oct 2010 13:31:47 +0200 Subject: [PATCH] Sent timetracker's scroll_left value when planner's zoom level changes * It's sent on the same event as the chosen zoom level FEA: ItEr02S03MigracionZK5 --- ganttzk/src/main/java/org/zkoss/ganttz/Planner.java | 2 ++ ganttzk/src/main/resources/web/js/ganttz/Planner.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 9d65f4b43..06f94f552 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -340,9 +340,11 @@ public class Planner extends HtmlMacroComponent { String command = request.getCommand(); String[] requestData; int zoomindex; + int scrollLeft; if (command.equals("onZoomLevelChange")){ zoomindex= (Integer) retrieveData(request, "zoomindex"); + scrollLeft = (Integer) retrieveData(request, "scrollLeft"); setZoomLevel((ZoomLevel)((Listbox)getFellow("listZoomLevels")).getModel().getElementAt(zoomindex)); return true; diff --git a/ganttzk/src/main/resources/web/js/ganttz/Planner.js b/ganttzk/src/main/resources/web/js/ganttz/Planner.js index 7cc34ddf5..697640d57 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/Planner.js +++ b/ganttzk/src/main/resources/web/js/ganttz/Planner.js @@ -57,7 +57,8 @@ ganttz.Planner = zk.$extends(zk.Macro,{ }, _zoomLevelChanged : function(event){ var zoomindex = event.domTarget.selectedIndex; - zAu.send(new zk.Event(this, 'onZoomLevelChange', {zoomindex : zoomindex})); + var scrollLeft = jq('#timetracker').scrollLeft(); + zAu.send(new zk.Event(this, 'onZoomLevelChange', {zoomindex : zoomindex, scrollLeft : scrollLeft})); } },{ FOOTER_HEIGHT : 40, // Design-relative footer height