Version bump

asafdav · Oct 10, 2015 · 6ad5e86 · 6ad5e86
1 parent 0ef8feb
commit 6ad5e86
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-csv",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "main": "build/ng-csv.min.js",
   "dependencies": {
     "angular": "~1",

diff --git a/build/ng-csv.js b/build/ng-csv.js
@@ -130,6 +130,18 @@ angular.module('ngCsv.services').
           arrData = responseData();
         }
 
+        // Check if using keys as labels
+        if (angular.isDefined(options.label) && options.label && typeof options.label === 'boolean') {
+            var labelArray, labelString;
+
+            labelArray = [];
+            angular.forEach(arrData[0], function(value, label) {
+                this.push(that.stringifyField(label, options));
+            }, labelArray);
+            labelString = labelArray.join(options.fieldSep ? options.fieldSep : ",");
+            csvContent += labelString + EOL;
+        }
+
         angular.forEach(arrData, function (oldRow, index) {
           var row = angular.copy(arrData[index]);
           var dataString, infoArray;
@@ -208,7 +220,8 @@ angular.module('ngCsv.directives').
         lazyLoad: '@lazyLoad',
         addByteOrderMarker: "@addBom",
         ngClick: '&',
-        charset: '@charset'
+        charset: '@charset',
+        label: '&csvLabel'
       },
       controller: [
         '$scope',
@@ -239,6 +252,7 @@ angular.module('ngCsv.directives').
             };
             if (angular.isDefined($attrs.csvHeader)) options.header = $scope.$eval($scope.header);
             if (angular.isDefined($attrs.csvColumnOrder)) options.columnOrder = $scope.$eval($scope.columnOrder);
+            if (angular.isDefined($attrs.csvLabel)) options.label = $scope.$eval($scope.label);
 
             options.fieldSep = $scope.fieldSep ? $scope.fieldSep : ",";
 
@@ -279,12 +293,13 @@ angular.module('ngCsv.directives').
             navigator.msSaveBlob(blob, scope.getFilename());
           } else {
 
-            var downloadLink = angular.element('<a></a>');
+            var downloadContainer = angular.element('<div data-tap-disabled="true"><a></a></div>');
+            var downloadLink = angular.element(downloadContainer.children()[0]);
             downloadLink.attr('href', window.URL.createObjectURL(blob));
             downloadLink.attr('download', scope.getFilename());
             downloadLink.attr('target', '_blank');
 
-            $document.find('body').append(downloadLink);
+            $document.find('body').append(downloadContainer);
             $timeout(function () {
               downloadLink[0].click();
               downloadLink.remove();

diff --git a/build/ng-csv.min.js b/build/ng-csv.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-csv",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "main": "build/ng-csv.min.js",
   "description": "Simple directive that turns arrays and objects into downloadable CSV files",
   "repository": {

diff --git a/src/ng-csv/services/csv-service.js b/src/ng-csv/services/csv-service.js
@@ -98,13 +98,13 @@ angular.module('ngCsv.services').
 
         // Check if using keys as labels
         if (angular.isDefined(options.label) && options.label && typeof options.label === 'boolean') {
-            var encodingArray, labelString;
-            
-            encodingArray = [];
+            var labelArray, labelString;
+
+            labelArray = [];
             angular.forEach(arrData[0], function(value, label) {
                 this.push(that.stringifyField(label, options));
-            }, encodingArray);
-            labelString = encodingArray.join(options.fieldSep ? options.fieldSep : ",");
+            }, labelArray);
+            labelString = labelArray.join(options.fieldSep ? options.fieldSep : ",");
             csvContent += labelString + EOL;
         }