Skip to content

Commit

Permalink
Merge pull request #48 from cvbuelow/master
Browse files Browse the repository at this point in the history
'catch' is a reserved word in IE 8 / 9
  • Loading branch information
asafdav committed Sep 18, 2014
2 parents b7aff75 + 43c03bb commit dacd3ab
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-csv",
"version": "0.2.3",
"version": "0.2.4",
"main": "build/ng-csv.min.js",
"dependencies": {
"angular": "~1",
Expand Down
7 changes: 4 additions & 3 deletions build/ng-csv.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
4 changes: 2 additions & 2 deletions build/ng-csv.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/ng-csv/services/csv-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}]);
}]);

0 comments on commit dacd3ab

Please sign in to comment.