diff --git a/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js b/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js index 4c31592eb..7aa4bc376 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js +++ b/ganttzk/src/main/resources/web/js/ganttz/GanttPanel.js @@ -26,6 +26,11 @@ ganttz.GanttPanel = zk.$extends(zk.Widget,{ this.domUnListen_(this.$n(), 'onMousemove', '_calcXY'); this.$supers('unbind_', arguments); }, + timeplotContainerRescroll : function(){ + this._timeplotcontainer.each(jq.proxy(function(index, element){ + jq(element).css("left", "-" + this._rightpannellayout.scrollLeft() + "px") + }, this)); + }, _calcXY : function(event){ var arrPos = YAHOO.util.Event.getXY(event); this.setXMouse(arrPos[0]); @@ -35,13 +40,11 @@ ganttz.GanttPanel = zk.$extends(zk.Widget,{ this._timetrackergap.css("left","-" + this._rightpannellayout.scrollLeft() + "px"); this._taskdetails.css("top", "-" + this._rightpannellayout.scrollTop() + "px"); this._plannergraph.scrollLeft( this._rightpannellayout.scrollLeft() ); - this._timeplotcontainer.each(jq.proxy(function(index, element){ - jq(element).css("left", "-" + this._rightpannellayout.scrollLeft() + "px") - }, this)); + this.timeplotContainerRescroll(); }, _initializeProperties : function(){ /*The canvas is inserted in the DOM after this component so - * it's not avaliable right now. We set up a handler to do + * it's not available right now. We set up a handler to do * job*/ jq(document).ready(jq.proxy( function(){ this._timeplotcontainer = jq('canvas.timeplot-canvas'); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index 0f8091663..97826cfc9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -32,10 +32,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Map.Entry; import org.joda.time.LocalDate; import org.navalplanner.business.calendars.entities.BaseCalendar; @@ -71,8 +71,8 @@ import org.navalplanner.web.planner.ITaskElementAdapter; import org.navalplanner.web.planner.chart.Chart; import org.navalplanner.web.planner.chart.ChartFiller; import org.navalplanner.web.planner.chart.EarnedValueChartFiller; -import org.navalplanner.web.planner.chart.IChartFiller; import org.navalplanner.web.planner.chart.EarnedValueChartFiller.EarnedValueType; +import org.navalplanner.web.planner.chart.IChartFiller; import org.navalplanner.web.planner.order.BankHolidaysMarker; import org.navalplanner.web.planner.order.OrderPlanningModel; import org.navalplanner.web.planner.tabs.MultipleTabsPlannerController; @@ -792,7 +792,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { chart.getChildren().clear(); chart.invalidate(); - String javascript = "zkTasklist.timeplotcontainer_rescroll();"; + String javascript = "ganttz.GanttPanel.getInstance().timeplotContainerRescroll()"; Clients.evalJavaScript(javascript); resetMinimumAndMaximumValueForChart(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 051c11477..f55485ccc 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -1155,7 +1155,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { chart.getChildren().clear(); chart.invalidate(); - String javascript = "zkTasklist.timeplotcontainer_rescroll();"; + String javascript = "ganttz.GanttPanel.getInstance().timeplotContainerRescroll()"; Clients.evalJavaScript(javascript); resetMinimumAndMaximumValueForChart();