kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Because the "options" parameter is used nowhere I've removed it to be used for something else.

Browse Source
This commit is contained in:
James Cole
2016-01-29 13:25:04 +01:00
parent 5f9cb61160
commit 3d82afd4e6
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/js/charts.js
View File

@@ -136,8 +136,6 @@ var defaultStackedColumnOptions = {
*/
function lineChart(URL, container, options) {
"use strict";
options = options || defaultLineOptions;
$.getJSON(URL).success(function (data) {
var ctx = document.getElementById(container).getContext("2d");
var newData = {};
@@ -154,7 +152,7 @@ function lineChart(URL, container, options) {
dataset.pointHighlightStroke = strokePointHighColors[i];
newData.datasets.push(dataset);
}
new Chart(ctx).Line(newData, options);
new Chart(ctx).Line(newData, defaultLineOptions);
}).fail(function () {
$('#' + container).addClass('general-chart-error');
@@ -171,7 +169,6 @@ function lineChart(URL, container, options) {
*/
function areaChart(URL, container, options) {
"use strict";
options = options || defaultAreaOptions;
$.getJSON(URL).success(function (data) {
var ctx = document.getElementById(container).getContext("2d");
@@ -189,7 +186,7 @@ function areaChart(URL, container, options) {
dataset.pointHighlightStroke = strokePointHighColors[i];
newData.datasets.push(dataset);
}
new Chart(ctx).Line(newData, options);
new Chart(ctx).Line(newData, defaultAreaOptions);
}).fail(function () {
$('#' + container).addClass('general-chart-error');
@@ -206,7 +203,6 @@ function areaChart(URL, container, options) {
*/
function columnChart(URL, container, options) {
"use strict";
options = options || defaultColumnOptions;
$.getJSON(URL).success(function (data) {
@@ -225,7 +221,7 @@ function columnChart(URL, container, options) {
dataset.pointHighlightStroke = strokePointHighColors[i];
newData.datasets.push(dataset);
}
new Chart(ctx).Bar(newData, options);
new Chart(ctx).Bar(newData, defaultColumnOptions);
}).fail(function () {
$('#' + container).addClass('general-chart-error');
@@ -241,7 +237,6 @@ function columnChart(URL, container, options) {
*/
function stackedColumnChart(URL, container, options) {
"use strict";
options = options || defaultStackedColumnOptions;
$.getJSON(URL).success(function (data) {
@@ -260,7 +255,7 @@ function stackedColumnChart(URL, container, options) {
dataset.pointHighlightStroke = strokePointHighColors[i];
newData.datasets.push(dataset);
}
new Chart(ctx).StackedBar(newData, options);
new Chart(ctx).StackedBar(newData, defaultStackedColumnOptions);
}).fail(function () {
$('#' + container).addClass('general-chart-error');
@@ -268,18 +263,6 @@ function stackedColumnChart(URL, container, options) {
console.log('URL for stacked column chart : ' + URL);
}
/**
*
* @param URL
* @param container
* @param options
*/
function comboChart(URL, container, options) {
"use strict";
columnChart(URL, container, options);
}
/**
*
* @param URL
@@ -289,11 +272,10 @@ function comboChart(URL, container, options) {
function pieChart(URL, container, options) {
"use strict";
options = options || defaultPieOptions;
$.getJSON(URL).success(function (data) {
var ctx = document.getElementById(container).getContext("2d");
new Chart(ctx).Pie(data, options);
new Chart(ctx).Pie(data, defaultPieOptions);
}).fail(function () {
$('#' + container).addClass('general-chart-error');