ref 19161: Disable Zoom for charts

https://support.d4science.org/issues/18964

Disabled Zoom for charts
This commit is contained in:
Giancarlo Panichi 2020-06-18 16:23:48 +02:00
parent 602458627b
commit 9801dea0d9
6 changed files with 11 additions and 10 deletions

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/java"> <classpathentry including="**/*.java" kind="src" output="target/accounting-dashboard-1.2.1/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.0/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/accounting-dashboard-1.2.1/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -50,5 +50,5 @@
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/> <classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/> <classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.8.2/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="output" path="target/accounting-dashboard-1.2.0/WEB-INF/classes"/> <classpathentry kind="output" path="target/accounting-dashboard-1.2.1/WEB-INF/classes"/>
</classpath> </classpath>

View File

@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="accounting-dashboard-1.2.0"> <wb-module deploy-name="accounting-dashboard-1.2.1">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="detachedres-library-1.1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/detachedres-library/detachedres-library">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/cmems-importer/target/cmems-importer-1.0.0-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/cmems-importer/target/cmems-importer-1.0.0-SNAPSHOT/WEB-INF/classes"/>
<property name="context-root" value="accounting-dashboard"/> <property name="context-root" value="accounting-dashboard"/>
</wb-module> </wb-module>

View File

@ -8,6 +8,9 @@
- Updated to support new detachedres-library [#19440] - Updated to support new detachedres-library [#19440]
### Fixes
- Disabled Zoom for charts [#19161]
## [v1.2.0] - 2020-04-08 ## [v1.2.0] - 2020-04-08

View File

@ -2,6 +2,7 @@
<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-1" <Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-1"
date="2020-06-18"> date="2020-06-18">
<Change>Updated to support new detachedres-library [#19440]</Change> <Change>Updated to support new detachedres-library [#19440]</Change>
<Change>Disabled Zoom for charts [#19161]</Change>
</Changeset> </Changeset>
<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-0" <Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-0"
date="2020-04-08"> date="2020-04-08">

View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>accounting-dashboard</artifactId> <artifactId>accounting-dashboard</artifactId>
<version>1.2.1</version> <version>1.2.1-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>accounting-dashboard</name> <name>accounting-dashboard</name>

View File

@ -372,7 +372,7 @@ public class Chart extends HTMLPanel {
}, },
zoom : { zoom : {
enabled : true, enabled : false,
mode : 'xy', mode : 'xy',
limits : { limits : {
max : 20, max : 20,
@ -381,7 +381,7 @@ public class Chart extends HTMLPanel {
} }
} }
}); });
chart.update(); chart.update();
console.log('Canvas offset: left=' + canvas.offsetLeft + ', top=' console.log('Canvas offset: left=' + canvas.offsetLeft + ', top='
+ canvas.offsetTop); + canvas.offsetTop);