Skip to content

Commit 3c2249c

Browse files
AmeenAhmedAmeenAhmed
committed
Change all the attribute names from fcAttribute to attribute
1 parent 2195bbe commit 3c2249c

File tree

1 file changed

+80
-80
lines changed

1 file changed

+80
-80
lines changed

‎src/angular-fusioncharts.js

+80-80
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@
2424
var fc = angular.module('ng-fusioncharts', []);
2525

2626

27-
fc.directive('fcChart', ['$http', function ($http) {
27+
fc.directive('fusioncharts', ['$http', function ($http) {
2828
return {
2929
scope: {
30-
fcWidth: '@',
31-
fcHeight: '@',
32-
fcData: '@',
33-
fcDataset: '@',
34-
fcCategories: '@',
35-
fcChartAttrs: '@',
36-
fcLinkeddata: '@',
37-
fcTrendlines: '@',
38-
fcVtrendlines: '@',
39-
fcAnnotatations: '@',
40-
fcColorrange: '@',
41-
fcLineset: '@',
42-
fcAxis: '@',
43-
fcConnectors: '@',
44-
fcPointers: '@',
45-
fcValue: '@',
46-
fcProcesses: '@',
47-
fcTasks: '@',
48-
fcRows: '@',
49-
fcColumns: '@',
50-
fcMap: '@',
51-
fcMarkers: '@'
30+
width: '@',
31+
height: '@',
32+
data: '@',
33+
dataset: '@',
34+
categories: '@',
35+
chart: '@',
36+
linkdedata: '@',
37+
trendlines: '@',
38+
vtrendlines: '@',
39+
annotations: '@',
40+
colorrange: '@',
41+
lineset: '@',
42+
axis: '@',
43+
connectors: '@',
44+
pointers: '@',
45+
value: '@',
46+
processes: '@',
47+
tasks: '@',
48+
rows: '@',
49+
columns: '@',
50+
map: '@',
51+
markers: '@'
5252
},
5353
link: function (scope, element, attrs) {
5454
var eventsObj = {},
@@ -61,9 +61,9 @@
6161
}
6262
}
6363
};
64-
if(attrs.fcEvents) {
65-
if(scope.$parent[attrs.fcEvents]) {
66-
var _eobj = scope.$parent[attrs.fcEvents];
64+
if(attrs.events) {
65+
if(scope.$parent[attrs.events]) {
66+
var _eobj = scope.$parent[attrs.events];
6767
for(var key in _eobj) {
6868
if(_eobj.hasOwnProperty(key)) {
6969
eventsObj[key.toLowerCase()] = _eobj[key];
@@ -78,29 +78,29 @@
7878
eventsObj[key] = scope.$parent[attrs[attr]];
7979
}
8080
}
81-
if(attrs.fcConfig) {
82-
chart = new FusionCharts(scope[attrs.fcConfig]);
83-
scope[attrs.fcChartObject] = chart;
81+
if(attrs.config) {
82+
chart = new FusionCharts(scope[attrs.config]);
83+
scope[attrs.chartobject] = chart;
8484
chart.render ();
8585
} else {
8686
var chartConfigObject = {
87-
type: attrs.fcType,
88-
width: attrs.fcWidth,
89-
height: attrs.fcHeight,
87+
type: attrs.type,
88+
width: attrs.width,
89+
height: attrs.height,
9090
renderAt: element[0],
91-
dataFormat: attrs.fcDataFormat || 'json',
91+
dataFormat: attrs.dataformat || 'json',
9292
dataSource: {},
9393
events: events
9494
};
95-
attrs.$observe('fcWidth', function (newVal) {
96-
chart.resizeTo (scope.fcWidth, scope.fcHeight);
95+
attrs.$observe('width', function (newVal) {
96+
chart.resizeTo (scope.width, scope.height);
9797
});
98-
attrs.$observe('fcHeight', function (newVal) {
99-
chart.resizeTo (scope.fcWidth, scope.fcHeight);
98+
attrs.$observe('height', function (newVal) {
99+
chart.resizeTo (scope.width, scope.height);
100100
});
101-
if(attrs.fcDatasource) {
102-
chartConfigObject.dataSource = scope[attrs.fcDatasource];
103-
attrs.$observe('fcDatasource', function (newVal) {
101+
if(attrs.datasource) {
102+
chartConfigObject.dataSource = scope[attrs.datasource];
103+
attrs.$observe('datasource', function (newVal) {
104104
if(chartConfigObject.dataFormat === 'json') {
105105
chart.setChartData (JSON.parse(newVal));
106106
} else if(chartConfigObject.dataFormat === 'xml') {
@@ -112,158 +112,158 @@
112112
}
113113
}, true);
114114
} else {
115-
attrs.$observe('fcChartAttrs', function (newVal) {
115+
attrs.$observe('chart', function (newVal) {
116116
setTimeout(function () {
117117
chartConfigObject.dataSource.chart = JSON.parse(newVal);
118118
chart.setJSONData (chartConfigObject.dataSource);
119119
}, 0);
120120
}, true)
121-
if(attrs.fcData) {
122-
attrs.$observe('fcData', function (newVal) {
121+
if(attrs.data) {
122+
attrs.$observe('data', function (newVal) {
123123
setTimeout(function () {
124124
chartConfigObject.dataSource.data = JSON.parse(newVal);
125125
chart.setJSONData (chartConfigObject.dataSource);
126126
}, 0);
127127
}, true);
128128
}
129-
if(attrs.fcCategories) {
130-
attrs.$observe('fcCategories', function (newVal) {
129+
if(attrs.categories) {
130+
attrs.$observe('categories', function (newVal) {
131131
setTimeout(function () {
132132
chartConfigObject.dataSource.categories = JSON.parse(newVal);
133133
chart.setJSONData (chartConfigObject.dataSource);
134134
}, 0);
135135
}, true);
136136
}
137-
if(attrs.fcDataset) {
138-
attrs.$observe('fcDataset', function (newVal) {
137+
if(attrs.dataset) {
138+
attrs.$observe('dataset', function (newVal) {
139139
setTimeout(function () {
140140
chartConfigObject.dataSource.dataset = JSON.parse(newVal);
141141
chart.setJSONData (chartConfigObject.dataSource);
142142
});
143143
}, true);
144144
}
145-
if(attrs.fcLinkeddata) {
146-
attrs.$observe('fcLinkeddata', function (newVal) {
145+
if(attrs.linkeddata) {
146+
attrs.$observe('linkeddata', function (newVal) {
147147
setTimeout(function () {
148148
chartConfigObject.dataSource.linkeddata = JSON.parse(newVal);
149149
chart.setJSONData (chartConfigObject.dataSource);
150150
});
151151
}, true);
152152
}
153-
if(attrs.fcTrendlines) {
154-
attrs.$observe('fcTrendlines', function (newVal) {
153+
if(attrs.trendlines) {
154+
attrs.$observe('trendlines', function (newVal) {
155155
setTimeout(function () {
156156
chartConfigObject.dataSource.trendlines = JSON.parse(newVal);
157157
chart.setJSONData (chartConfigObject.dataSource);
158158
});
159159
}, true);
160160
}
161-
if(attrs.fcVtrendlines) {
162-
attrs.$observe('fcVtrendlines', function (newVal) {
161+
if(attrs.vtrendlines) {
162+
attrs.$observe('vtrendlines', function (newVal) {
163163
setTimeout(function () {
164164
chartConfigObject.dataSource.vtrendlines = JSON.parse(newVal);
165165
chart.setJSONData (chartConfigObject.dataSource);
166166
});
167167
}, true);
168168
}
169-
if(attrs.fcAnnotations) {
170-
attrs.$observe('fcAnnotations', function (newVal) {
169+
if(attrs.annotations) {
170+
attrs.$observe('annotations', function (newVal) {
171171
setTimeout(function () {
172172
chartConfigObject.dataSource.annotations = JSON.parse(newVal);
173173
chart.setJSONData (chartConfigObject.dataSource);
174174
});
175175
}, true);
176176
}
177-
if(attrs.fcColorrange) {
178-
attrs.$observe('fcColorrange', function (newVal) {
177+
if(attrs.colorrange) {
178+
attrs.$observe('colorrange', function (newVal) {
179179
setTimeout(function () {
180180
chartConfigObject.dataSource.colorrange = JSON.parse(newVal);
181181
chart.setJSONData (chartConfigObject.dataSource);
182182
});
183183
}, true);
184184
}
185-
if(attrs.fcLineset) {
186-
attrs.$observe('fcLineset', function (newVal) {
185+
if(attrs.lineset) {
186+
attrs.$observe('lineset', function (newVal) {
187187
setTimeout(function () {
188188
chartConfigObject.dataSource.lineset = JSON.parse(newVal);
189189
chart.setJSONData (chartConfigObject.dataSource);
190190
});
191191
}, true);
192192
}
193-
if(attrs.fcAxis) {
194-
attrs.$observe('fcAxis', function (newVal) {
193+
if(attrs.axis) {
194+
attrs.$observe('axis', function (newVal) {
195195
setTimeout(function () {
196196
chartConfigObject.dataSource.axis = JSON.parse(newVal);
197197
chart.setJSONData (chartConfigObject.dataSource);
198198
});
199199
}, true);
200200
}
201-
if(attrs.fcConnectors) {
202-
attrs.$observe('fcConnectors', function (newVal) {
201+
if(attrs.connectors) {
202+
attrs.$observe('connectors', function (newVal) {
203203
setTimeout(function () {
204204
chartConfigObject.dataSource.connectors = JSON.parse(newVal);
205205
chart.setJSONData (chartConfigObject.dataSource);
206206
});
207207
}, true);
208208
}
209-
if(attrs.fcPointers) {
210-
attrs.$observe('fcPointers', function (newVal) {
209+
if(attrs.pointers) {
210+
attrs.$observe('pointers', function (newVal) {
211211
setTimeout(function () {
212212
chartConfigObject.dataSource.pointers = JSON.parse(newVal);
213213
chart.setJSONData (chartConfigObject.dataSource);
214214
});
215215
}, true);
216216
}
217-
if(attrs.fcValue) {
218-
attrs.$observe('fcValue', function (newVal) {
217+
if(attrs.value) {
218+
attrs.$observe('value', function (newVal) {
219219
setTimeout(function () {
220220
chartConfigObject.dataSource.value = JSON.parse(newVal);
221221
chart.setJSONData (chartConfigObject.dataSource);
222222
});
223223
}, true);
224224
}
225-
if(attrs.fcProcesses) {
226-
attrs.$observe('fcProcesses', function (newVal) {
225+
if(attrs.processes) {
226+
attrs.$observe('processes', function (newVal) {
227227
setTimeout(function () {
228228
chartConfigObject.dataSource.processes = JSON.parse(newVal);
229229
chart.setJSONData (chartConfigObject.dataSource);
230230
});
231231
}, true);
232232
}
233-
if(attrs.fcTasks) {
234-
attrs.$observe('fcTasks', function (newVal) {
233+
if(attrs.tasks) {
234+
attrs.$observe('tasks', function (newVal) {
235235
setTimeout(function () {
236236
chartConfigObject.dataSource.tasks = JSON.parse(newVal);
237237
chart.setJSONData (chartConfigObject.dataSource);
238238
});
239239
}, true);
240240
}
241-
if(attrs.fcRows) {
242-
attrs.$observe('fcRows', function (newVal) {
241+
if(attrs.rows) {
242+
attrs.$observe('rows', function (newVal) {
243243
setTimeout(function () {
244244
chartConfigObject.dataSource.rows = JSON.parse(newVal);
245245
chart.setJSONData (chartConfigObject.dataSource);
246246
});
247247
}, true);
248248
}
249-
if(attrs.fcColumns) {
250-
attrs.$observe('fcColumns', function (newVal) {
249+
if(attrs.columns) {
250+
attrs.$observe('columns', function (newVal) {
251251
setTimeout(function () {
252252
chartConfigObject.dataSource.columns = JSON.parse(newVal);
253253
chart.setJSONData (chartConfigObject.dataSource);
254254
});
255255
}, true);
256256
}
257-
if(attrs.fcMap) {
258-
attrs.$observe('fcMap', function (newVal) {
257+
if(attrs.map) {
258+
attrs.$observe('map', function (newVal) {
259259
setTimeout(function () {
260260
chartConfigObject.dataSource.map = JSON.parse(newVal);
261261
chart.setJSONData (chartConfigObject.dataSource);
262262
});
263263
}, true);
264264
}
265-
if(attrs.fcMarkers) {
266-
attrs.$observe('fcMarkers', function (newVal) {
265+
if(attrs.markers) {
266+
attrs.$observe('markers', function (newVal) {
267267
setTimeout(function () {
268268
chartConfigObject.dataSource.markers = JSON.parse(newVal);
269269
chart.setJSONData (chartConfigObject.dataSource);
@@ -273,7 +273,7 @@
273273
}
274274

275275
var chart = new FusionCharts(chartConfigObject);
276-
scope[attrs.fcChartObject] = chart;
276+
scope[attrs.chartobject] = chart;
277277
chart.render ();
278278
}
279279
}

0 commit comments

Comments
 (0)