Fixes #66

asafdav · Nov 25, 2014 · 6053a5e · 6053a5e
1 parent 05903c5
commit 6053a5e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 18 deletions.
diff --git a/build/ng-csv.js b/build/ng-csv.js
@@ -116,15 +116,18 @@ angular.module('ngCsv.services').
           csvContent += index < arrData.length ? dataString + EOL : dataString;
         });
 
-        if(window.navigator.msSaveOrOpenBlob) {
-          csv = csvContent;
-        }else{
+        // IE uses the BLOB way so no need for DATA_URI_PREFIX
+        if(!window.navigator.msSaveOrOpenBlob) {
           csv = DATA_URI_PREFIX;
-          if (options.addByteOrderMarker){
-              csv += BOM;
-          }
-          csv += csvContent;
         }
+
+        // Add BOM if needed
+        if (options.addByteOrderMarker){
+            csv += BOM;
+        }
+
+        // Append the content and resolve.
+        csv += csvContent;
         def.resolve(csv);
       });
 

diff --git a/build/ng-csv.min.js b/build/ng-csv.min.js
diff --git a/example/index.html b/example/index.html
@@ -2,8 +2,8 @@
 <html>
 <head>
     <link href="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular.min.js"></script>   
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-sanitize.min.js"></script>   
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-sanitize.min.js"></script>
     <script src="../build/ng-csv.js"></script>
 </head>
 <body>
@@ -28,6 +28,7 @@ <h1>ngCsv <small>example</small></h1>
       <button class="btn btn-default"
               ng-csv="getArray" filename="{{ filename }}.csv" field-separator="{{separator}}"
               >Export to CSV</button>
+
       <button class="btn btn-default"
               ng-csv="getArray" csv-header="getHeader()" filename="{{ filename }}" field-separator="{{separator}}"
               >Export to CSV with header</button>
@@ -36,6 +37,10 @@ <h1>ngCsv <small>example</small></h1>
               ng-csv="getArray" csv-header="getHeader()" filename="{{ filename }}" field-separator="{{separator}}"
               ng-click="clickFn()">Export with ng-click</button>
 
+      <button class="btn btn-default"
+              ng-csv="getArray" filename="{{ filename }}.csv" field-separator="{{separator}}" add-bom="true"
+        >With BOM</button>
+
       <button class="btn btn-default" ng-click="addRandomRow()">Add row</button>
     </div>
 </div>
@@ -50,7 +55,7 @@ <h1>ngCsv <small>example</small></h1>
       $scope.addRandomRow = function() {
         $scope.getArray.push({a: Math.floor((Math.random()*10)+1), b: Math.floor((Math.random()*10)+1)});
       };
-      
+
       $scope.getHeader = function () {return ["A", "B"]};
 
       $scope.clickFn = function() {

diff --git a/src/ng-csv/services/csv-service.js b/src/ng-csv/services/csv-service.js
@@ -87,15 +87,18 @@ angular.module('ngCsv.services').
           csvContent += index < arrData.length ? dataString + EOL : dataString;
         });
 
-        if(window.navigator.msSaveOrOpenBlob) {
-          csv = csvContent;
-        }else{
+        // IE uses the BLOB way so no need for DATA_URI_PREFIX
+        if(!window.navigator.msSaveOrOpenBlob) {
           csv = DATA_URI_PREFIX;
-          if (options.addByteOrderMarker){
-              csv += BOM;
-          }
-          csv += csvContent;
         }
+
+        // Add BOM if needed
+        if (options.addByteOrderMarker){
+            csv += BOM;
+        }
+
+        // Append the content and resolve.
+        csv += csvContent;
         def.resolve(csv);
       });