Refactored the directive and updated the docs accordingly

Author: asafdav

README.md

@@ -17,11 +17,16 @@ An AngularJS simple directive that turns arrays and objects into downloadable CS
   <button type="button" ng-csv="getArray()" filename="test.csv">Export</button>
   ```
 
-##### New! - Now accepts a header row as parameter
-Just provide csv-header attribute. 
-  ```html
+ngCsv attributes
+----------------
+* ng-csv: The data array
+* filename: The filename that will be stored on the user's computer
+* csv-header: If provided, would use this attribute to create a header line
+    ```html
   <button type="button" ng-csv="getArray()" csv-header="['Field A', 'Field B', 'Field C']" filename="test.csv">Export</button>
   ```
+* field-separator: Defines the field separator character (default is)
+* text-delimiter: If provided, will use this characters to "escape" string values
 
 
 ## Example

build/ng-csv.js

@@ -48,19 +48,13 @@ angular.module('ngCsv.directives', []).
           $scope, $element, $attrs, $transclude
       ) {
         $scope.csv = '';
-        $scope.$watch($scope.data, function (newValue) {
-          $scope.buildCsv(newValue);
-        }, true);
 
-        $scope.$watch('fieldSep', function() {
-          $scope.buildCsv($scope.data());
-        });
-
-        $scope.$watch('txtDelim', function() {
-          $scope.buildCsv($scope.data());
-        });
+				$scope.$watch(function (newValue) {
+					$scope.buildCsv();
+				}, true);
 
-        $scope.buildCsv = function (data) {
+        $scope.buildCsv = function () {
+					var data = $scope.data();
           var csvContent = 'data:text/csv;charset=utf-8,';
 
           // Check if there's a provided header array
@@ -89,6 +83,7 @@ angular.module('ngCsv.directives', []).
           });
 
           $scope.csv = encodeURI(csvContent);
+					return $scope.csv;
         };
 
         $scope.getFilename = function () {

build/ng-csv.min.js

@@ -22,8 +22,19 @@ <h1>ngCsv <small>example</small></h1>
         <input type="text" id="filename" class="form-control" ng-model="filename">
       </div>
 
-      <button class="btn btn-default" ng-csv="getArray" filename="{{ filename }}.csv">Export to CSV</button>
-      <button class="btn btn-default" ng-csv="getArray" csv-header="getHeader()" filename="{{ filename }}">Export to CSV with header</button>
+      <div class="form-group">
+        <label for="separator">Field separator</label>
+        <input type="text" id="separator" class="form-control" ng-model="separator" ng-init="separator=','">
+      </div>
+
+      <button class="btn btn-default"
+              ng-csv="getArray" filename="{{ filename }}.csv" field-separator="{{separator}}"
+              on-demand="{{onDemand}}">Export to CSV</button>
+      <button class="btn btn-default"
+              ng-csv="getArray" csv-header="getHeader()" filename="{{ filename }}" field-separator="{{separator}}"
+              on-demand="{{onDemand}}">Export to CSV with header</button>
+
+      <button class="btn btn-default" ng-click="addRandomRow()">Add row</button>
     </div>
 </div>
 
@@ -33,6 +44,10 @@ <h1>ngCsv <small>example</small></h1>
     myapp.controller('myctrl', function ($scope) {
 	    $scope.filename = "test";
 	    $scope.getArray = [{a: 1, b:2}, {a:3, b:4}];
+
+      $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"]};
     });
 </script>

example/index.html

@@ -21,19 +21,13 @@ angular.module('ngCsv.directives', []).
           $scope, $element, $attrs, $transclude
       ) {
         $scope.csv = '';
-        $scope.$watch($scope.data, function (newValue) {
-          $scope.buildCsv(newValue);
-        }, true);
 
-        $scope.$watch('fieldSep', function() {
-          $scope.buildCsv($scope.data());
-        });
-
-        $scope.$watch('txtDelim', function() {
-          $scope.buildCsv($scope.data());
-        });
+				$scope.$watch(function (newValue) {
+					$scope.buildCsv();
+				}, true);
 
-        $scope.buildCsv = function (data) {
+        $scope.buildCsv = function () {
+					var data = $scope.data();
           var csvContent = 'data:text/csv;charset=utf-8,';
 
           // Check if there's a provided header array
@@ -62,6 +56,7 @@ angular.module('ngCsv.directives', []).
           });
 
           $scope.csv = encodeURI(csvContent);
+					return $scope.csv;
         };
 
         $scope.getFilename = function () {