diff --git a/.classpath b/.classpath index 5c0febd..b638363 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -50,5 +50,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 31d6f91..675aa74 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,12 +1,9 @@ - + - - uses - diff --git a/CHANGELOG.md b/CHANGELOG.md index b16e51c..4ace3cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ - Updated to support new detachedres-library [#19440] +### Fixes + +- Disabled Zoom for charts [#19161] ## [v1.2.0] - 2020-04-08 diff --git a/changelog.xml b/changelog.xml index 869a639..073f87d 100644 --- a/changelog.xml +++ b/changelog.xml @@ -2,6 +2,7 @@ Updated to support new detachedres-library [#19440] + Disabled Zoom for charts [#19161] diff --git a/pom.xml b/pom.xml index 67d03c6..379ea60 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user accounting-dashboard - 1.2.1 + 1.2.1-SNAPSHOT war accounting-dashboard diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java index 5b7d011..6bab50c 100644 --- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java +++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/chartjs/Chart.java @@ -372,7 +372,7 @@ public class Chart extends HTMLPanel { }, zoom : { - enabled : true, + enabled : false, mode : 'xy', limits : { max : 20, @@ -381,7 +381,7 @@ public class Chart extends HTMLPanel { } } }); - + chart.update(); console.log('Canvas offset: left=' + canvas.offsetLeft + ', top=' + canvas.offsetTop);