remove event cancellation (unnecessary); allow delimiter through attr…

…ibute; fix "$digest already in progress" error with some outside angular controls like angular-ui dropdown directive
iyeldinov · Aug 10, 2014 · 78c91a3 · 78c91a3
1 parent 6fbbcc3
commit 78c91a3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/ng-table-export.js b/ng-table-export.js
diff --git a/ng-table-export.map b/ng-table-export.map
diff --git a/ng-table-export.src.js b/ng-table-export.src.js
@@ -19,6 +19,9 @@ angular.module('ngTableExport', [])
 
           var data = '';
 
+          // allow pass in of delimiter via directive attrs
+          if (attrs.delimiter) { delimiter = attrs.delimiter; }
+
           function stringify(str) {
             return '"' +
               str.replace(/^\s\s*/, '').replace(/\s*\s$/, '') // trim spaces
@@ -67,20 +70,22 @@ angular.module('ngTableExport', [])
             link.href = dataUri;
             link.download = filename;
             link.target = '_blank';
-            // must append to body for firefox; chrome & safari don't mind
-            document.body.appendChild(link);
-            link.click();
-            // destroy
-            document.body.removeChild(link);
+            // needs to get wrapped to play nicely with angular $digest
+            // else may cause '$digest already in progress' errors with other angular controls (e.g. angular-ui dropdown)
+            $timeout(function () {
+              // must append to body for firefox; chrome & safari don't mind
+              document.body.appendChild(link);
+              link.click();
+              // destroy
+              document.body.removeChild(link);
+            }, 0, false);
           }
 
           var csv = {
             /**
              *  Generate data URI from table data
              */
             generate: function(event, filename) {
-              event.stopPropagation();
-              event.preventDefault();
 
               var table = scope.$parent.tableParams,
                 settings = table.settings(),
@@ -113,7 +118,6 @@ angular.module('ngTableExport', [])
                 parseTable();
                 download(header + encodeURIComponent(data), filename);
               }
-              return false;
             }
           };
 

diff --git a/src/scripts/00-directive.js b/src/scripts/00-directive.js
@@ -19,6 +19,9 @@ angular.module('ngTableExport', [])
 
           var data = '';
 
+          // allow pass in of delimiter via directive attrs
+          if (attrs.delimiter) { delimiter = attrs.delimiter; }
+
           function stringify(str) {
             return '"' +
               str.replace(/^\s\s*/, '').replace(/\s*\s$/, '') // trim spaces
@@ -67,20 +70,22 @@ angular.module('ngTableExport', [])
             link.href = dataUri;
             link.download = filename;
             link.target = '_blank';
-            // must append to body for firefox; chrome & safari don't mind
-            document.body.appendChild(link);
-            link.click();
-            // destroy
-            document.body.removeChild(link);
+            // needs to get wrapped to play nicely with angular $digest
+            // else may cause '$digest already in progress' errors with other angular controls (e.g. angular-ui dropdown)
+            $timeout(function () {
+              // must append to body for firefox; chrome & safari don't mind
+              document.body.appendChild(link);
+              link.click();
+              // destroy
+              document.body.removeChild(link);
+            }, 0, false);
           }
 
           var csv = {
             /**
              *  Generate data URI from table data
              */
             generate: function(event, filename) {
-              event.stopPropagation();
-              event.preventDefault();
 
               var table = scope.$parent.tableParams,
                 settings = table.settings(),
@@ -113,7 +118,6 @@ angular.module('ngTableExport', [])
                 parseTable();
                 download(header + encodeURIComponent(data), filename);
               }
-              return false;
             }
           };