Merge pull request #48 from cvbuelow/master

'catch' is a reserved word in IE 8 / 9
asafdav · Sep 18, 2014 · dacd3ab · dacd3ab
2 parents b7aff75 + 43c03bb
commit dacd3ab
Show file tree

Hide file tree

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

diff --git a/build/ng-csv.js b/build/ng-csv.js
@@ -122,15 +122,16 @@ angular.module('ngCsv.services').
         def.resolve(csv);
       });
 
-      if (typeof dataPromise.catch === 'function') {
-        dataPromise.catch(function(err) {
+      if (typeof dataPromise['catch'] === 'function') {
+        dataPromise['catch'](function(err) {
           def.reject(err);
         });
       }
 
       return def.promise;
     };
-  }]);/**
+  }]);
+/**
  * ng-csv module
  * Export Javascript's arrays to csv files from the browser
  *

diff --git a/build/ng-csv.min.js b/build/ng-csv.min.js
diff --git a/src/ng-csv/services/csv-service.js b/src/ng-csv/services/csv-service.js
@@ -93,12 +93,12 @@ angular.module('ngCsv.services').
         def.resolve(csv);
       });
 
-      if (typeof dataPromise.catch === 'function') {
-        dataPromise.catch(function(err) {
+      if (typeof dataPromise['catch'] === 'function') {
+        dataPromise['catch'](function(err) {
           def.reject(err);
         });
       }
 
       return def.promise;
     };
-  }]);
+  }]);