diff --git a/.classpath b/.classpath
index adad1e8..5c0febd 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 15d3abb..822ca16 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
-
+
diff --git a/changelog.xml b/changelog.xml
index 2da21e7..e30161e 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,4 +1,8 @@
+
+ Updated export csv support with Firefox and Safari [ticket #18034]
+
Updated to support accounting data visualization at the
diff --git a/pom.xml b/pom.xml
index 2a8b3f8..88b5730 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
accounting-dashboard
- 1.1.0
+ 1.2.0
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 5d5209b..410dc2f 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
@@ -181,16 +181,19 @@ public class Chart extends HTMLPanel {
heading += "," + recordData.getX();
datasetRow += "," + recordData.getY();
}
- csvContent += heading + "\r\n";
- csvContent += datasetRow + "\r\n";
-
+
+ var csvData=heading+"\n"+datasetRow + "\n";
+ var csvDataEncoded=encodeURIComponent(csvData);
+ csvContent += csvDataEncoded;
} else {
var datasetRow = seriesData.getLabel();
for (var j = 0; j < dataRowLen; j++) {
var recordData = dataRow[j];
datasetRow += "," + recordData.getY();
}
- csvContent += datasetRow + "\r\n";
+ var csvData=datasetRow + "\n";
+ var csvDataEncoded=encodeURIComponent(csvData);
+ csvContent += csvDataEncoded;
}
}
this.href = csvContent;