From 660d7dde9957b137d2f6fe0a83def5e697981fe2 Mon Sep 17 00:00:00 2001 From: YOHANN CINTRE Date: Wed, 16 Mar 2016 13:18:13 +0100 Subject: [PATCH 1/2] fix escaping if quote is present in field --- src/ng-csv/services/csv-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ng-csv/services/csv-service.js b/src/ng-csv/services/csv-service.js index 3adade6..02f3f1d 100644 --- a/src/ng-csv/services/csv-service.js +++ b/src/ng-csv/services/csv-service.js @@ -33,7 +33,7 @@ angular.module('ngCsv.services'). if (typeof data === 'string') { data = data.replace(/"/g, '""'); // Escape double qoutes - if (options.quoteStrings || data.indexOf(',') > -1 || data.indexOf('\n') > -1 || data.indexOf('\r') > -1) { + if (options.quoteStrings || data.indexOf(',') > -1 || data.indexOf('\n') > -1 || data.indexOf('\r') > -1 || data.indexOf('"') > -1) { data = options.txtDelim + data + options.txtDelim; } From b54cbb9b775df6f2680b8d3e5af6c80a45bd5713 Mon Sep 17 00:00:00 2001 From: YOHANN CINTRE Date: Wed, 16 Mar 2016 14:16:09 +0100 Subject: [PATCH 2/2] fix escaping when a custom field delimiter is specified --- src/ng-csv/services/csv-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ng-csv/services/csv-service.js b/src/ng-csv/services/csv-service.js index 02f3f1d..65379ce 100644 --- a/src/ng-csv/services/csv-service.js +++ b/src/ng-csv/services/csv-service.js @@ -33,7 +33,7 @@ angular.module('ngCsv.services'). if (typeof data === 'string') { data = data.replace(/"/g, '""'); // Escape double qoutes - if (options.quoteStrings || data.indexOf(',') > -1 || data.indexOf('\n') > -1 || data.indexOf('\r') > -1 || data.indexOf('"') > -1) { + if (options.quoteStrings || data.indexOf(options.fieldSep) > -1 || data.indexOf('\n') > -1 || data.indexOf('\r') > -1 || data.indexOf('"') > -1) { data = options.txtDelim + data + options.txtDelim; }