Support promises #19

asafdav · Apr 27, 2014 · 241d675 · 241d675
1 parent 12c6db4
commit 241d675
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/build/ng-csv.js b/build/ng-csv.js
@@ -82,10 +82,7 @@ angular.module('ngCsv.directives', []).
           {
             var csvContent = "data:text/csv;charset=utf-8,";
 
-            var deferred = $q.defer();
-            var promise = deferred.promise;
-
-            promise.then(function () 
+            $q.when(data).then(function ()
             {
               // Check if there's a provided header array
               if (angular.isDefined($attrs.csvHeader)) 
@@ -141,12 +138,10 @@ angular.module('ngCsv.directives', []).
 
               $scope.csv = encodeURI(csvContent);
 
-              }).then(function () 
-              {
+              }).then(function() {
                 callback();
               });
 
-              deferred.resolve();
             };
 
             $scope.getFilename = function () 

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,10 +55,7 @@ angular.module('ngCsv.directives', []).
           {
             var csvContent = "data:text/csv;charset=utf-8,";
 
-            var deferred = $q.defer();
-            var promise = deferred.promise;
-
-            promise.then(function () 
+            $q.when(data).then(function ()
             {
               // Check if there's a provided header array
               if (angular.isDefined($attrs.csvHeader)) 
@@ -114,12 +111,10 @@ angular.module('ngCsv.directives', []).
 
               $scope.csv = encodeURI(csvContent);
 
-              }).then(function () 
-              {
+              }).then(function() {
                 callback();
               });
 
-              deferred.resolve();
             };
 
             $scope.getFilename = function ()