From 3fc7a28d7ff3ecf30a324b4f69b52345d39d4947 Mon Sep 17 00:00:00 2001
From: martynasma <martynasma@gmail.com>
Date: Tue, 26 May 2015 08:08:52 +0300
Subject: [PATCH] Added chart object to event handler callbacks

---
 dataloader.js              | 20 +++++++++----------
 dataloader.min.js          |  2 +-
 examples/serial2_json.html |  6 +++---
 readme.md                  | 40 ++++++++++++++++++++++++++++++++++++--
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/dataloader.js b/dataloader.js
index 43c097d..4757ee1 100644
--- a/dataloader.js
+++ b/dataloader.js
@@ -2,7 +2,7 @@
 Plugin Name: amCharts Data Loader
 Description: This plugin adds external data loading capabilities to all amCharts libraries.
 Author: Martynas Majeris, amCharts
-Version: 1.0.4
+Version: 1.0.5
 Author URI: http://www.amcharts.com/
 
 Copyright 2015 amCharts
@@ -172,7 +172,7 @@ AmCharts.addInitHandler( function( chart ) {
 
       // error?
       if ( false === response ) {
-        callFunction( options.error, url, options );
+        callFunction( options.error, options, chart );
         raiseError( AmCharts.__( 'Error loading the file', chart.language ) + ': ' + url, false, options );
       } else {
 
@@ -193,13 +193,13 @@ AmCharts.addInitHandler( function( chart ) {
             holder[ providerKey ] = AmCharts.parseJSON( response );
 
             if ( false === holder[ providerKey ] ) {
-              callFunction( options.error, options );
+              callFunction( options.error, options, chart );
               raiseError( AmCharts.__( 'Error parsing JSON file', chart.language ) + ': ' + l.url, false, options );
               holder[ providerKey ] = [];
               return;
             } else {
               holder[ providerKey ] = postprocess( holder[ providerKey ], options );
-              callFunction( options.load, options );
+              callFunction( options.load, options, chart );
             }
 
             break;
@@ -209,19 +209,19 @@ AmCharts.addInitHandler( function( chart ) {
             holder[ providerKey ] = AmCharts.parseCSV( response, options );
 
             if ( false === holder[ providerKey ] ) {
-              callFunction( options.error, options );
+              callFunction( options.error, options, chart );
               raiseError( AmCharts.__( 'Error parsing CSV file', chart.language ) + ': ' + l.url, false, options );
               holder[ providerKey ] = [];
               return;
             } else {
               holder[ providerKey ] = postprocess( holder[ providerKey ], options );
-              callFunction( options.load, options );
+              callFunction( options.load, options, chart );
             }
 
             break;
 
           default:
-            callFunction( options.error, options );
+            callFunction( options.error, options, chart );
             raiseError( AmCharts.__( 'Unsupported data format', chart.language ) + ': ' + options.format, false, options.noStyles );
             return;
         }
@@ -233,7 +233,7 @@ AmCharts.addInitHandler( function( chart ) {
         if ( 0 === l.remaining ) {
 
           // callback
-          callFunction( options.complete );
+          callFunction( options.complete, chart );
 
           // take in the new data
           if ( options.async ) {
@@ -400,9 +400,9 @@ AmCharts.addInitHandler( function( chart ) {
   /**
    * Execute callback function
    */
-  function callFunction( func, param1, param2 ) {
+  function callFunction( func, param1, param2, param3 ) {
     if ( 'function' === typeof func )
-      func.call( l, param1, param2 );
+      func.call( l, param1, param2, param3 );
   }
 
 }, [ 'pie', 'serial', 'xy', 'funnel', 'radar', 'gauge', 'gantt', 'stock', 'map' ] );
diff --git a/dataloader.min.js b/dataloader.min.js
index 596bd06..817d89f 100644
--- a/dataloader.min.js
+++ b/dataloader.min.js
@@ -1 +1 @@
-AmCharts.translations.dataLoader={},AmCharts.addInitHandler(function(a){function e(b,d,g,h){void 0===h&&(h="dataProvider"),g.showCurtain&&l(void 0,g.noStyles),c.remaining++,AmCharts.loadFile(b,g,function(i){if(!1===i)n(g.error,b,g),k(AmCharts.__("Error loading the file",a.language)+": "+b,!1,g);else{switch(void 0===g.format&&(g.format="json"),g.format=g.format.toLowerCase(),g.format){case"json":if(d[h]=AmCharts.parseJSON(i),!1===d[h])return n(g.error,g),k(AmCharts.__("Error parsing JSON file",a.language)+": "+c.url,!1,g),d[h]=[],void 0;d[h]=f(d[h],g),n(g.load,g);break;case"csv":if(d[h]=AmCharts.parseCSV(i,g),!1===d[h])return n(g.error,g),k(AmCharts.__("Error parsing CSV file",a.language)+": "+c.url,!1,g),d[h]=[],void 0;d[h]=f(d[h],g),n(g.load,g);break;default:return n(g.error,g),k(AmCharts.__("Unsupported data format",a.language)+": "+g.format,!1,g.noStyles),void 0}if(c.remaining--,0===c.remaining){if(n(g.complete),g.async)if("map"===a.type)a.validateNow(!0);else if(a.validateData(),c.startDuration)if("stock"===a.type){a.panelsSettings.startDuration=c.startDuration;for(var j=0;j<a.panels.length;j++)a.panels[j].startDuration=c.startDuration,a.panels[j].animateAgain()}else a.startDuration=c.startDuration,a.animateAgain();"stock"!==a.type||g.reloading||void 0===a.periodSelector||a.periodSelector.setDefaultPeriod(),m()}g.reload&&(g.timeout&&clearTimeout(g.timeout),g.timeout=setTimeout(e,1e3*g.reload,b,d,g),g.reloading=!0)}})}function f(b,c){if(void 0===c.postProcess||!h(c.postProcess))return b;try{return c.postProcess.call(this,b,c)}catch(d){return k(AmCharts.__("Error loading file",a.language)+": "+c.url,!1,c),b}}function g(a){return"object"==typeof a}function h(a){return"function"==typeof a}function i(a){for(var b in d)d.hasOwnProperty(b)&&j(a,b,d[b])}function j(a,b,c){void 0===a[b]&&(a[b]=c)}function k(a,b,c){c.showErrors?l(a,c.noStyles):(m(),console.log(a))}function l(b,d){m(),void 0===b&&(b=AmCharts.__("Loading data...",a.language));var e=document.createElement("div");e.setAttribute("id",a.div.id+"-curtain"),e.className="amcharts-dataloader-curtain",!0!==d?(e.style.position="absolute",e.style.top=0,e.style.left=0,e.style.width=(void 0!==a.realWidth?a.realWidth:a.divRealWidth)+"px",e.style.height=(void 0!==a.realHeight?a.realHeight:a.divRealHeight)+"px",e.style.textAlign="center",e.style.display="table",e.style.fontSize="20px",e.style.background="rgba(255, 255, 255, 0.3)",e.innerHTML='<div style="display: table-cell; vertical-align: middle;">'+b+"</div>"):e.innerHTML=b,a.containerDiv.appendChild(e),c.curtain=e}function m(){try{void 0!==c.curtain&&a.containerDiv.removeChild(c.curtain)}catch(b){}c.curtain=void 0}function n(a,b,d){"function"==typeof a&&a.call(c,b,d)}void 0!==a.dataLoader&&g(a.dataLoader)||(a.dataLoader={});var b=a.version.split(".");if(!(Number(b[0])<3||3===Number(b[0])&&Number(b[1])<13)){var c=a.dataLoader;c.remaining=0;var d={async:!0,format:"json",showErrors:!0,showCurtain:!0,noStyles:!1,reload:0,timestamp:!1,delimiter:",",skip:0,useColumnNames:!1,reverse:!1,reloading:!1,complete:!1,error:!1};c.loadData=function(){if("stock"===a.type)setTimeout(function(){0>a.panelsSettings.startDuration&&(c.startDuration=a.panelsSettings.startDuration,a.panelsSettings.startDuration=0);for(var b=0;b<a.dataSets.length;b++){var d=a.dataSets[b];void 0!==d.dataLoader&&void 0!==d.dataLoader.url&&(d.dataProvider=[],i(d.dataLoader),e(d.dataLoader.url,d,d.dataLoader,"dataProvider")),void 0!==d.eventDataLoader&&void 0!==d.eventDataLoader.url&&(d.events=[],i(d.eventDataLoader),e(d.eventDataLoader.url,d,d.eventDataLoader,"stockEvents"))}},100);else{if(i(c),void 0===c.url)return;void 0!==a.startDuration&&0<a.startDuration&&(c.startDuration=a.startDuration,a.startDuration=0),a.dataProvider=[],e(c.url,a,c,"dataProvider")}},c.loadData()}},["pie","serial","xy","funnel","radar","gauge","gantt","stock","map"]),void 0===AmCharts.__&&(AmCharts.__=function(a,b){return void 0!==b&&void 0!==AmCharts.translations.dataLoader[b]&&void 0!==AmCharts.translations.dataLoader[b][a]?AmCharts.translations.dataLoader[b][a]:a}),AmCharts.loadFile=function(a,b,c){var d;d=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP"),d.onreadystatechange=function(){4===d.readyState&&404===d.status?c.call(this,!1):4===d.readyState&&200===d.status&&c.call(this,d.responseText)};try{d.open("GET",b.timestamp?AmCharts.timestampUrl(a):a,b.async),d.send()}catch(e){c.call(this,!1)}},AmCharts.parseJSON=function(response){try{return void 0!==JSON?JSON.parse(response):eval(response)}catch(e){return!1}},AmCharts.parseCSV=function(a,b){var f,g,c=AmCharts.CSVToArray(a,b.delimiter),d=[],e=[];if(b.useColumnNames){e=c.shift();for(var h=0;h<e.length;h++)f=e[h].replace(/^\s+|\s+$/gm,""),""===f&&(f="col"+h),e[h]=f;0<b.skip&&b.skip--}for(g=0;g<b.skip;g++)c.shift();for(var i;i=b.reverse?c.pop():c.shift();){var j={};for(g=0;g<i.length;g++)f=void 0===e[g]?"col"+g:e[g],j[f]=i[g];d.push(j)}return d},AmCharts.CSVToArray=function(a,b){b=b||",";for(var c=new RegExp("(\\"+b+"|\\r?\\n|\\r|^)"+'(?:"([^"]*(?:""[^"]*)*)"|'+'([^"\\'+b+"\\r\\n]*))","gi"),d=[[]],e=null;e=c.exec(a);){var f=e[1];f.length&&f!==b&&d.push([]);var g;g=e[2]?e[2].replace(new RegExp('""',"g"),'"'):e[3],d[d.length-1].push(g)}return d},AmCharts.timestampUrl=function(a){var b=a.split("?");return 1===b.length?b[1]=(new Date).getTime():b[1]+="&"+(new Date).getTime(),b.join("?")};
\ No newline at end of file
+AmCharts.translations.dataLoader={},AmCharts.addInitHandler(function(a){function e(b,d,g,h){void 0===h&&(h="dataProvider"),g.showCurtain&&l(void 0,g.noStyles),c.remaining++,AmCharts.loadFile(b,g,function(i){if(!1===i)n(g.error,g,a),k(AmCharts.__("Error loading the file",a.language)+": "+b,!1,g);else{switch(void 0===g.format&&(g.format="json"),g.format=g.format.toLowerCase(),g.format){case"json":if(d[h]=AmCharts.parseJSON(i),!1===d[h])return n(g.error,g,a),k(AmCharts.__("Error parsing JSON file",a.language)+": "+c.url,!1,g),d[h]=[],void 0;d[h]=f(d[h],g),n(g.load,g,a);break;case"csv":if(d[h]=AmCharts.parseCSV(i,g),!1===d[h])return n(g.error,g,a),k(AmCharts.__("Error parsing CSV file",a.language)+": "+c.url,!1,g),d[h]=[],void 0;d[h]=f(d[h],g),n(g.load,g,a);break;default:return n(g.error,g,a),k(AmCharts.__("Unsupported data format",a.language)+": "+g.format,!1,g.noStyles),void 0}if(c.remaining--,0===c.remaining){if(n(g.complete,a),g.async)if("map"===a.type)a.validateNow(!0);else if(a.validateData(),c.startDuration)if("stock"===a.type){a.panelsSettings.startDuration=c.startDuration;for(var j=0;j<a.panels.length;j++)a.panels[j].startDuration=c.startDuration,a.panels[j].animateAgain()}else a.startDuration=c.startDuration,a.animateAgain();"stock"!==a.type||g.reloading||void 0===a.periodSelector||a.periodSelector.setDefaultPeriod(),m()}g.reload&&(g.timeout&&clearTimeout(g.timeout),g.timeout=setTimeout(e,1e3*g.reload,b,d,g),g.reloading=!0)}})}function f(b,c){if(void 0===c.postProcess||!h(c.postProcess))return b;try{return c.postProcess.call(this,b,c)}catch(d){return k(AmCharts.__("Error loading file",a.language)+": "+c.url,!1,c),b}}function g(a){return"object"==typeof a}function h(a){return"function"==typeof a}function i(a){for(var b in d)d.hasOwnProperty(b)&&j(a,b,d[b])}function j(a,b,c){void 0===a[b]&&(a[b]=c)}function k(a,b,c){c.showErrors?l(a,c.noStyles):(m(),console.log(a))}function l(b,d){m(),void 0===b&&(b=AmCharts.__("Loading data...",a.language));var e=document.createElement("div");e.setAttribute("id",a.div.id+"-curtain"),e.className="amcharts-dataloader-curtain",!0!==d?(e.style.position="absolute",e.style.top=0,e.style.left=0,e.style.width=(void 0!==a.realWidth?a.realWidth:a.divRealWidth)+"px",e.style.height=(void 0!==a.realHeight?a.realHeight:a.divRealHeight)+"px",e.style.textAlign="center",e.style.display="table",e.style.fontSize="20px",e.style.background="rgba(255, 255, 255, 0.3)",e.innerHTML='<div style="display: table-cell; vertical-align: middle;">'+b+"</div>"):e.innerHTML=b,a.containerDiv.appendChild(e),c.curtain=e}function m(){try{void 0!==c.curtain&&a.containerDiv.removeChild(c.curtain)}catch(b){}c.curtain=void 0}function n(a,b,d,e){"function"==typeof a&&a.call(c,b,d,e)}void 0!==a.dataLoader&&g(a.dataLoader)||(a.dataLoader={});var b=a.version.split(".");if(!(Number(b[0])<3||3===Number(b[0])&&Number(b[1])<13)){var c=a.dataLoader;c.remaining=0;var d={async:!0,format:"json",showErrors:!0,showCurtain:!0,noStyles:!1,reload:0,timestamp:!1,delimiter:",",skip:0,useColumnNames:!1,reverse:!1,reloading:!1,complete:!1,error:!1};c.loadData=function(){if("stock"===a.type)setTimeout(function(){0>a.panelsSettings.startDuration&&(c.startDuration=a.panelsSettings.startDuration,a.panelsSettings.startDuration=0);for(var b=0;b<a.dataSets.length;b++){var d=a.dataSets[b];void 0!==d.dataLoader&&void 0!==d.dataLoader.url&&(d.dataProvider=[],i(d.dataLoader),e(d.dataLoader.url,d,d.dataLoader,"dataProvider")),void 0!==d.eventDataLoader&&void 0!==d.eventDataLoader.url&&(d.events=[],i(d.eventDataLoader),e(d.eventDataLoader.url,d,d.eventDataLoader,"stockEvents"))}},100);else{if(i(c),void 0===c.url)return;void 0!==a.startDuration&&0<a.startDuration&&(c.startDuration=a.startDuration,a.startDuration=0),a.dataProvider=[],e(c.url,a,c,"dataProvider")}},c.loadData()}},["pie","serial","xy","funnel","radar","gauge","gantt","stock","map"]),void 0===AmCharts.__&&(AmCharts.__=function(a,b){return void 0!==b&&void 0!==AmCharts.translations.dataLoader[b]&&void 0!==AmCharts.translations.dataLoader[b][a]?AmCharts.translations.dataLoader[b][a]:a}),AmCharts.loadFile=function(a,b,c){var d;d=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP"),d.onreadystatechange=function(){4===d.readyState&&404===d.status?c.call(this,!1):4===d.readyState&&200===d.status&&c.call(this,d.responseText)};try{d.open("GET",b.timestamp?AmCharts.timestampUrl(a):a,b.async),d.send()}catch(e){c.call(this,!1)}},AmCharts.parseJSON=function(response){try{return void 0!==JSON?JSON.parse(response):eval(response)}catch(e){return!1}},AmCharts.parseCSV=function(a,b){var f,g,c=AmCharts.CSVToArray(a,b.delimiter),d=[],e=[];if(b.useColumnNames){e=c.shift();for(var h=0;h<e.length;h++)f=e[h].replace(/^\s+|\s+$/gm,""),""===f&&(f="col"+h),e[h]=f;0<b.skip&&b.skip--}for(g=0;g<b.skip;g++)c.shift();for(var i;i=b.reverse?c.pop():c.shift();){var j={};for(g=0;g<i.length;g++)f=void 0===e[g]?"col"+g:e[g],j[f]=i[g];d.push(j)}return d},AmCharts.CSVToArray=function(a,b){b=b||",";for(var c=new RegExp("(\\"+b+"|\\r?\\n|\\r|^)"+'(?:"([^"]*(?:""[^"]*)*)"|'+'([^"\\'+b+"\\r\\n]*))","gi"),d=[[]],e=null;e=c.exec(a);){var f=e[1];f.length&&f!==b&&d.push([]);var g;g=e[2]?e[2].replace(new RegExp('""',"g"),'"'):e[3],d[d.length-1].push(g)}return d},AmCharts.timestampUrl=function(a){var b=a.split("?");return 1===b.length?b[1]=(new Date).getTime():b[1]+="&"+(new Date).getTime(),b.join("?")};
\ No newline at end of file
diff --git a/examples/serial2_json.html b/examples/serial2_json.html
index 7dddde3..9967325 100644
--- a/examples/serial2_json.html
+++ b/examples/serial2_json.html
@@ -27,13 +27,13 @@
         "dataLoader": {
           "url": "data/serial2.json",
           "showErrors": true,
-          "complete": function () {
+          "complete": function ( chart ) {
             console.log( "Loading complete" );
           },
-          "load": function ( options ) {
+          "load": function ( options, chart ) {
             console.log( "File loaded: ", options.url );
           },
-          "error": function ( options ) {
+          "error": function ( options, chart ) {
             console.log( "Error occured loading file: ", options.url );
           }
         },
diff --git a/readme.md b/readme.md
index 7d6d4bc..48d0573 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
 # amCharts Data Loader
 
-Version: 1.0.4
+Version: 1.0.5
 
 
 ## Description
@@ -65,7 +65,7 @@ AmCharts.makeChart( "chartdiv", {
   "dataSets": [{
     ...,
     "dataLoader": {
-      "url": "data.csv"
+      "url": "data.csv",
       "format": "csv",
       "delimiter": ",",       // column separator
       "useColumnNames": true, // use first row for column names
@@ -162,6 +162,38 @@ Once chart is initialized, you can trigger the reload of all data manually by
 calling `chart.dataLoader.loadData()` function. (replace "chart" with the actual
 variable that holds reference to your chart object)
 
+## Using callback functions
+
+Data Loader can call your own function when certain event happens, like data
+loading is complete, error occurs, etc.
+
+To set custom event handlers, use these config options:
+
+* "complete"
+
+Example:
+
+```
+AmCharts.makeChart( "chartdiv", {
+  ...,
+  "dataSets": [{
+    ...,
+    "dataLoader": {
+      "url": "data.json",
+      "load": function ( options, chart ) {
+        console.log( 'Loaded file: ' + options.url );
+      },
+      "complete": function ( chart ) {
+        console.log( 'Woohoo! Finished loading' );
+      },
+      "error": function ( options, chart ) {
+        console.log( 'Ummm something went wrong loading this file: ' + options.url );
+      }
+    }
+  }]
+} );
+```
+
 
 ## Translating into other languages
 
@@ -238,6 +270,10 @@ http://www.apache.org/licenses/LICENSE-2.0
 
 ## Changelog
 
+### 1.0.5
+* Fixed JS error if periodSelector was not defined in chart config
+* Now all callback functions (complete, error, load) receive additional parameter: chart
+
 ### 1.0.4
 * Added chart.dataLoader.loadData() function which can be used to manually trigger all data reload