Skip to content

Commit 5072945

Browse files
committed
Merge branch 'develop'
2 parents 909e634 + b4db9e6 commit 5072945

File tree

2 files changed

+47
-27
lines changed

2 files changed

+47
-27
lines changed

dist/angular-fusioncharts.js

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,45 @@
2020
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
// SOFTWARE.
2222
(function() {
23-
var fc = angular.module('ng-fusioncharts', []);
23+
var fc = angular.module('ng-fusioncharts', []),
24+
scope = {
25+
width: '@',
26+
height: '@',
27+
data: '@',
28+
dataset: '@',
29+
categories: '@',
30+
chart: '@',
31+
linkeddata: '@',
32+
trendlines: '@',
33+
vtrendlines: '@',
34+
annotations: '@',
35+
colorrange: '@',
36+
lineset: '@',
37+
axis: '@',
38+
connectors: '@',
39+
pointers: '@',
40+
value: '@',
41+
processes: '@',
42+
tasks: '@',
43+
rows: '@',
44+
columns: '@',
45+
map: '@',
46+
markers: '@',
47+
initialized:'&'
48+
},
49+
fcEvents = ['beforelinkeditemopen','linkeditemopened','beforelinkeditemclose','linkeditemclosed','printreadystatechange','dataloadrequestcompleted','dataloaderror','dataloadcancelled','dataloadrequestcancelled','dataupdated','dataupdatecancelled','dataloadrequested','beforedataupdate','realtimeupdatecomplete','chartcleared','slicingend','slicingstart','entityrollout','entityrollover','entityclick','connectorrollover','connectorrollout','connectorclick','markerrollover','markerrollout','markerclick','pagenavigated','rotationend','rotationstart','centerlabelrollover','centerlabelrollout','centerlabelclick','centerlabelchanged','chartclick','chartmousemove','chartrollover','chartrollout','backgroundloaded','backgroundloaderror','legenditemclicked','legenditemrollover','legenditemrollout','logorollover','logorollout','logoclick','logoloaded','logoloaderror','beforeexport','exported','exportcancelled','beforeprint','printcomplete','printcancelled','datalabelclick','datalabelrollover','datalabelrollout','scrollstart','scrollend','onscroll','zoomreset','zoomedout','zoomedin','zoomed','zoommodechanged','pinned','datarestored','beforedatasubmit','datasubmiterror','datasubmitted','datasubmitcancelled','chartupdated','nodeadded','nodeupdated','nodedeleted','connectoradded','connectorupdated','connectordeleted','labeladded','labeldeleted','selectionremoved','selectionstart','selectionend','labelclick','labelrollover','labelrollout','labeldragstart','labeldragend','dataplotdragstart','dataplotdragend','processclick','processrollover','processrollout','categoryclick','categoryrollover','categoryrollout','milestoneclick','milestonerollover','milestonerollout','charttypechanged','overlaybuttonclick','loaded','rendered','drawcomplete','rendercomplete','datainvalid','dataxmlinvalid','dataloaded','nodatatodisplay','legendpointerdragstart','legendpointerdragstop','legendrangeupdated','alertcomplete','realtimeupdateerror','dataplotrollover','dataplotrollout','dataplotclick','linkclicked','beforerender','rendercancelled','beforeresize','resized','resizecancelled','beforedispose','disposed','disposecancelled','linkedchartinvoked','beforedrilldown','drilldown','beforedrillup','drillup','drilldowncancelled','drillupcancelled'],
50+
currIndex,
51+
eventName,
52+
eventsLen = fcEvents.length;
53+
for (currIndex = 0; currIndex < eventsLen; currIndex++){
54+
eventName = 'fcevent' + fcEvents[currIndex][0].toUpperCase() + fcEvents[currIndex].slice(1);
55+
scope[eventName] = '&';
56+
}
2457

2558

2659
fc.directive('fusioncharts', ['$http', function($http) {
2760
return {
28-
scope: {
29-
width: '@',
30-
height: '@',
31-
data: '@',
32-
dataset: '@',
33-
categories: '@',
34-
chart: '@',
35-
linkeddata: '@',
36-
trendlines: '@',
37-
vtrendlines: '@',
38-
annotations: '@',
39-
colorrange: '@',
40-
lineset: '@',
41-
axis: '@',
42-
connectors: '@',
43-
pointers: '@',
44-
value: '@',
45-
processes: '@',
46-
tasks: '@',
47-
rows: '@',
48-
columns: '@',
49-
map: '@',
50-
markers: '@'
51-
},
61+
scope: scope,
5262
link: function(scope, element, attrs) {
5363
var observeConf = {
5464
// non-data componenet observers
@@ -361,6 +371,16 @@
361371
chart.dispose();
362372
}
363373
chart = new FusionCharts(chartConfigObject);
374+
scope.initialized && scope.initialized({ chart: chart });
375+
for(currIndex = 0; currIndex < eventsLen ; currIndex++){
376+
eventName = 'fcevent' + fcEvents[currIndex][0].toUpperCase() + fcEvents[currIndex].slice(1);
377+
// assign all events on chart instance
378+
(function(eventName){
379+
chart.addEventListener(fcEvents[currIndex], function(event, args){
380+
scope[eventName] && scope[eventName]({ event:event, args: args });
381+
});
382+
})(eventName);
383+
}
364384
/* @todo validate the ready function whether it can be replaced in a better way */
365385
angular.element(document).ready(function(){
366386
element.ready(function(){

dist/angular-fusioncharts.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)