Merge branch 'langman66-master'

asafdav · May 6, 2014 · 22b8973 · 22b8973
2 parents f567e82 + 7214a68
commit 22b8973
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-csv",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "build/ng-csv.min.js",
   "dependencies": {
     "angular": "~1",

diff --git a/build/ng-csv.js b/build/ng-csv.js
@@ -82,7 +82,7 @@ angular.module('ngCsv.directives', []).
           {
             var csvContent = "data:text/csv;charset=utf-8,";
 
-            $q.when(data).then(function ()
+            $q.when(data).then(function (responseData)
             {
               // Check if there's a provided header array
               if (angular.isDefined($attrs.csvHeader)) 
@@ -109,10 +109,12 @@ angular.module('ngCsv.directives', []).
 
               var arrData;
 
-              if (angular.isArray(data))
-                arrData = data;
-              else
-                arrData = data();
+              if (angular.isArray(responseData)) {
+                arrData = responseData;
+              }
+              else {
+                arrData = responseData();
+              }
 
               angular.forEach(arrData, function(row, index)
               {

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
@@ -55,7 +55,7 @@ angular.module('ngCsv.directives', []).
           {
             var csvContent = "data:text/csv;charset=utf-8,";
 
-            $q.when(data).then(function ()
+            $q.when(data).then(function (responseData)
             {
               // Check if there's a provided header array
               if (angular.isDefined($attrs.csvHeader)) 
@@ -82,10 +82,12 @@ angular.module('ngCsv.directives', []).
 
               var arrData;
 
-              if (angular.isArray(data))
-                arrData = data;
-              else
-                arrData = data();
+              if (angular.isArray(responseData)) {
+                arrData = responseData;
+              }
+              else {
+                arrData = responseData();
+              }
 
               angular.forEach(arrData, function(row, index)
               {