Merge pull request #560 from chandruxp/master

Fix for Almond AMD
This commit is contained in:
Nick Downie 2014-08-20 22:47:21 +01:00
commit 0a59a3c4df
2 changed files with 3 additions and 3 deletions

4
Chart.js vendored
View File

@ -280,7 +280,7 @@
//Method for warning of errors
if (window.console && typeof window.console.warn == "function") console.warn(str);
},
amd = helpers.amd = (typeof root.define == 'function' && root.define.amd),
amd = helpers.amd = (typeof define == 'function' && define.amd),
//-- Math methods
isNumber = helpers.isNumber = function(n){
return !isNaN(parseFloat(n)) && isFinite(n);
@ -3376,4 +3376,4 @@
}).call(this);
}).call(this);

View File

@ -280,7 +280,7 @@
//Method for warning of errors
if (window.console && typeof window.console.warn == "function") console.warn(str);
},
amd = helpers.amd = (typeof root.define == 'function' && root.define.amd),
amd = helpers.amd = (typeof define == 'function' && define.amd),
//-- Math methods
isNumber = helpers.isNumber = function(n){
return !isNaN(parseFloat(n)) && isFinite(n);