diff --git a/bower.json b/bower.json index 3e63531..3fb8d86 100644 --- 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 index 8a23e09..65b212a 100644 --- 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 index b76bb07..581aaf0 100644 --- a/build/ng-csv.min.js +++ b/build/ng-csv.min.js @@ -1,2 +1,2 @@ -/*! ngcsv 16-07-2014 */ -!function(a){angular.module("ngCsv.config",[]).value("ngCsv.config",{debug:!0}).config(["$compileProvider",function(a){angular.isDefined(a.urlSanitizationWhitelist)?a.urlSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|data):/):a.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|data):/)}]),angular.module("ngCsv.directives",["ngCsv.services"]),angular.module("ngCsv.services",[]),angular.module("ngCsv",["ngCsv.config","ngCsv.services","ngCsv.directives","ngSanitize"]),angular.module("ngCsv.services").service("CSV",["$q",function(b){var c=encodeURIComponent("\r\n"),d="data:text/csv;charset=utf-8,";this.stringifyField=function(a,b,c){return"string"==typeof a?(a=a.replace(/"/g,'""'),(c||a.indexOf(",")>-1||a.indexOf("\n")>-1||a.indexOf("\r")>-1)&&(a=b+a+b),encodeURIComponent(a)):"boolean"==typeof a?a?"TRUE":"FALSE":a},this.stringify=function(e,f){var g,h=b.defer(),i=this,j="",k=b.when(e).then(function(b){if(b=angular.copy(b),angular.isDefined(f.header)&&f.header){var e,k;e=[],angular.forEach(f.header,function(a){this.push(i.stringifyField(a,f.txtDelim,f.quoteStrings))},e),k=e.join(f.fieldSep?f.fieldSep:","),j+=k+c}var l;l=angular.isArray(b)?b:b(),angular.forEach(l,function(a,b){var d,e;e=[],angular.forEach(a,function(a){this.push(i.stringifyField(a,f.txtDelim,f.quoteStrings))},e),d=e.join(f.fieldSep?f.fieldSep:","),j+=b");d.attr("href",b.csv),d.attr("download",b.getFilename()),e.find("body").append(d),f(function(){d[0].click(),d.remove()},null)}}c.bind("click",function(){b.buildCSV().then(function(){d()}),b.$apply()})}}}])}(window,document); \ No newline at end of file +/*! ngcsv 31-07-2014 */ +!function(a){angular.module("ngCsv.config",[]).value("ngCsv.config",{debug:!0}).config(["$compileProvider",function(a){angular.isDefined(a.urlSanitizationWhitelist)?a.urlSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|data):/):a.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|data):/)}]),angular.module("ngCsv.directives",["ngCsv.services"]),angular.module("ngCsv.services",[]),angular.module("ngCsv",["ngCsv.config","ngCsv.services","ngCsv.directives","ngSanitize"]),angular.module("ngCsv.services").service("CSV",["$q",function(b){var c=encodeURIComponent("\r\n"),d="data:text/csv;charset=utf-8,";this.stringifyField=function(a,b,c){return"string"==typeof a?(a=a.replace(/"/g,'""'),(c||a.indexOf(",")>-1||a.indexOf("\n")>-1||a.indexOf("\r")>-1)&&(a=b+a+b),encodeURIComponent(a)):"boolean"==typeof a?a?"TRUE":"FALSE":a},this.stringify=function(e,f){var g,h=b.defer(),i=this,j="",k=b.when(e).then(function(b){if(b=angular.copy(b),angular.isDefined(f.header)&&f.header){var e,k;e=[],angular.forEach(f.header,function(a){this.push(i.stringifyField(a,f.txtDelim,f.quoteStrings))},e),k=e.join(f.fieldSep?f.fieldSep:","),j+=k+c}var l;l=angular.isArray(b)?b:b(),angular.forEach(l,function(a,b){var d,e;e=[],angular.forEach(a,function(a){this.push(i.stringifyField(a,f.txtDelim,f.quoteStrings))},e),d=e.join(f.fieldSep?f.fieldSep:","),j+=b");d.attr("href",b.csv),d.attr("download",b.getFilename()),e.find("body").append(d),f(function(){d[0].click(),d.remove()},null)}}c.bind("click",function(){b.buildCSV().then(function(){d()}),b.$apply()})}}}])}(window,document); \ No newline at end of file diff --git a/src/ng-csv/services/csv-service.js b/src/ng-csv/services/csv-service.js index 7718d6f..fb2ba57 100644 --- 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; }; - }]); \ No newline at end of file + }]);