Fixes #15, No special template is needed

asafdav · Jun 2, 2014 · 3191652 · 3191652
1 parent 74bc075
commit 3191652
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 48 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-csv",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "build/ng-csv.min.js",
   "dependencies": {
     "angular": "~1",
@@ -9,8 +9,5 @@
   "devDependencies": {
     "angular-mocks": "~1",
     "angular-scenario": "~1"
-  },
-  "resolutions": {
-    "angular": "~1"
   }
 }
diff --git a/build/ng-csv.js b/build/ng-csv.js
@@ -66,8 +66,14 @@ angular.module('ngCsv.services').
       var def = $q.defer();
 
       var that = this;
-      var csvContent = "data:text/csv;charset=utf-8,";
       var csv;
+      var csvContent;
+
+      if(window.navigator.msSaveOrOpenBlob) {
+        csvContent = "";
+      }else{
+        csvContent = "data:text/csv;charset=utf-8,";
+      }
 
       var dataPromise = $q.when(data).then(function (responseData)
       {
@@ -111,7 +117,11 @@ angular.module('ngCsv.services').
           csvContent += index < arrData.length ? dataString + "\n" : dataString;
         });
 
-        csv = encodeURI(csvContent);
+        if(window.navigator.msSaveOrOpenBlob) {
+          csv = csvContent;
+        }else{
+          csv = encodeURI(csvContent);
+        }
         def.resolve(csv);
       });
 
@@ -133,8 +143,6 @@ angular.module('ngCsv.directives').
   directive('ngCsv', ['$parse', '$q', 'CSV', function ($parse, $q, CSV) {
     return {
       restrict: 'AC',
-      replace: true,
-      transclude: true,
       scope: {
         data:'&ngCsv',
         filename:'@filename',
@@ -196,31 +204,31 @@ angular.module('ngCsv.directives').
           };
         }
       ],
-      template: '<div class="csv-wrap">' +
-        '<div class="element" ng-transclude></div>' +
-        '<a class="hidden-link" ng-hide="true" ng-href="{{ csv }}" download="{{ getFilename() }}"></a>' +
-        '</div>',
       link: function (scope, element, attrs) {
-        var subject = angular.element(element.children()[0]),
-            link = angular.element(element.children()[1]);
-
         function doClick() {
-          link[0].href = "";
-          link[0].click();
-          link[0].href = scope.csv;
-          link[0].click();
+          if(window.navigator.msSaveOrOpenBlob) {
+            var blob = new Blob([scope.csv],{
+                    type: "text/csv;charset=utf-8;"
+                });
+            navigator.msSaveBlob(blob, scope.getFilename());
+          } else {
+            var downloadLink = document.createElement("a");
+            downloadLink.href = scope.csv;
+            downloadLink.download = scope.getFilename();
+
+            document.body.appendChild(downloadLink);
+            downloadLink.click();
+            document.body.removeChild(downloadLink);
+          }
+
         }
 
-        subject.bind('click', function (e) 
+        element.bind('click', function (e)
         {
           scope.buildCSV().then(function(csv) {
             doClick();
           });
           scope.$apply();
-
-          if (!!scope.ngClick) {
-            scope.ngClick();
-          }
         });
       }
     };

diff --git a/build/ng-csv.min.js b/build/ng-csv.min.js
diff --git a/example/lazy_load.html b/example/lazy_load.html
@@ -45,10 +45,6 @@ <h1>ngCsv <small>example with lazy load</small></h1>
       };
 
       $scope.getHeader = function () {return ["A", "B"]};
-
-      $scope.clickFn = function() {
-        console.log("click click click");
-      };
     });
 </script>
 

diff --git a/src/ng-csv/directives/ng-csv.js b/src/ng-csv/directives/ng-csv.js
@@ -8,8 +8,6 @@ angular.module('ngCsv.directives').
   directive('ngCsv', ['$parse', '$q', 'CSV', function ($parse, $q, CSV) {
     return {
       restrict: 'AC',
-      replace: true,
-      transclude: true,
       scope: {
         data:'&ngCsv',
         filename:'@filename',
@@ -71,38 +69,31 @@ angular.module('ngCsv.directives').
           };
         }
       ],
-      template: '<div class="csv-wrap">' +
-        '<div class="element" ng-transclude></div>' +
-        '<a class="hidden-link" ng-hide="true" ng-href="{{ csv }}" download="{{ getFilename() }}"></a>' +
-        '</div>',
       link: function (scope, element, attrs) {
-        var subject = angular.element(element.children()[0]),
-            link = angular.element(element.children()[1]);
-
         function doClick() {
-          link[0].href = "";
-          link[0].click();
           if(window.navigator.msSaveOrOpenBlob) {
             var blob = new Blob([scope.csv],{
                     type: "text/csv;charset=utf-8;"
                 });
             navigator.msSaveBlob(blob, scope.getFilename());
           } else {
-             link[0].href = scope.csv;
-             link[0].click();
+            var downloadLink = document.createElement("a");
+            downloadLink.href = scope.csv;
+            downloadLink.download = scope.getFilename();
+
+            document.body.appendChild(downloadLink);
+            downloadLink.click();
+            document.body.removeChild(downloadLink);
           }
+
         }
 
-        subject.bind('click', function (e) 
+        element.bind('click', function (e)
         {
           scope.buildCSV().then(function(csv) {
             doClick();
           });
           scope.$apply();
-
-          if (!!scope.ngClick) {
-            scope.ngClick();
-          }
         });
       }
     };