Escape double quotes #12

asafdav · Mar 5, 2014 · fbd9d58 · fbd9d58
1 parent 28656c8
commit fbd9d58
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/build/ng-csv.js b/build/ng-csv.js
@@ -51,6 +51,20 @@ angular.module('ngCsv.directives', []).
         '$attrs',
         '$transclude',
         function ($scope, $element, $attrs, $transclude) {
+          var stringifyCell = function(data) {
+            if (typeof data === 'string') {
+              data = data.replace(/"/g, '""'); // Escape double qoutes
+              if ($scope.txtDelim) data = $scope.txtDelim + data + $scope.txtDelim;
+              return data;
+            }
+
+            if (typeof data === 'boolean') {
+              return data ? 'TRUE' : 'FALSE';
+            }
+
+            return data;
+          };
+
           $scope.csv = '';
 
           $scope.$watch(function (newValue) {
@@ -77,10 +91,7 @@ angular.module('ngCsv.directives', []).
             angular.forEach(data, function (row, index) {
               var infoArray = [];
               angular.forEach(row, function (field) {
-                if (typeof field === 'string' && $scope.txtDelim) {
-                  field = $scope.txtDelim + field + $scope.txtDelim;
-                }
-                this.push(field);
+                this.push(stringifyCell(field));
               }, infoArray);
               dataString = infoArray.join($scope.fieldSep || ',');
               csvContent += index < data.length ? dataString + '\r\n' : dataString;

diff --git a/build/ng-csv.min.js b/build/ng-csv.min.js
diff --git a/src/ng-csv/directives/ng-csv.js b/src/ng-csv/directives/ng-csv.js
@@ -24,6 +24,20 @@ angular.module('ngCsv.directives', []).
         '$attrs',
         '$transclude',
         function ($scope, $element, $attrs, $transclude) {
+          var stringifyCell = function(data) {
+            if (typeof data === 'string') {
+              data = data.replace(/"/g, '""'); // Escape double qoutes
+              if ($scope.txtDelim) data = $scope.txtDelim + data + $scope.txtDelim;
+              return data;
+            }
+
+            if (typeof data === 'boolean') {
+              return data ? 'TRUE' : 'FALSE';
+            }
+
+            return data;
+          };
+
           $scope.csv = '';
 
           $scope.$watch(function (newValue) {
@@ -50,10 +64,7 @@ angular.module('ngCsv.directives', []).
             angular.forEach(data, function (row, index) {
               var infoArray = [];
               angular.forEach(row, function (field) {
-                if (typeof field === 'string' && $scope.txtDelim) {
-                  field = $scope.txtDelim + field + $scope.txtDelim;
-                }
-                this.push(field);
+                this.push(stringifyCell(field));
               }, infoArray);
               dataString = infoArray.join($scope.fieldSep || ',');
               csvContent += index < data.length ? dataString + '\r\n' : dataString;