Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 20:29:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove old and stuff. Use the correct color variable instead of window.color

Browse Source
This commit is contained in:
etimberg 2015-12-02 22:15:03 -05:00
parent 40c8289ce8
commit 95a172df06
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/core.helpers.js
View File

@ -246,9 +246,10 @@
})(),
warn = helpers.warn = function(str) {
//Method for warning of errors
if (window.console && typeof window.console.warn === "function") console.warn(str);
if (console && typeof console.warn === "function") {
console.warn(str);
}
},
amd = helpers.amd = (typeof define === 'function' && define.amd),
//-- Math methods
isNumber = helpers.isNumber = function(n) {
return !isNaN(parseFloat(n)) && isFinite(n);
@ -787,11 +788,11 @@
ctx.closePath();
},
color = helpers.color = function(color) {
if (!window.Color) {
if (!root.Color) {
console.log('Color.js not found!');
return color;
}
return window.Color(color);
return root.Color(color);
},
addResizeListener = helpers.addResizeListener = function(node, callback) {
// Hide an iframe before the node

8
src/core/core.js
View File

@ -109,14 +109,6 @@
},
};
if (typeof amd !== 'undefined') {
define(function() {
return Chart;
});
} else if (typeof module === 'object' && module.exports) {
module.exports = Chart;
}
root.Chart = Chart;
Chart.noConflict = function() {