Avoid errors when rendering serverside (#3909)

diff --git a/src/chart.js b/src/chart.js
index 0ee96bd57d43279e135ec124d2f3d83ae2210a20..591572110e89bedd1187adbfe574908ff0e69c0c 100644 (file)
--- a/src/chart.js
+++ b/src/chart.js
@@ -56,4 +56,7 @@ plugins.push(require('./plugins/plugin.filler.js')(Chart));
 
 Chart.plugins.register(plugins);
 
-window.Chart = module.exports = Chart;
+module.exports = Chart;
+if (typeof window !== 'undefined') {
+       window.Chart = Chart;
+}

diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 2d96ac14b47a8e1c692d0c256f8fb991ee248d30..5ed5c28edd4b1f89888969f9ceeccde7f122ec7e 100644 (file)
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -669,6 +669,11 @@ module.exports = function(Chart) {
        };
        // Request animation polyfill - http://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
        helpers.requestAnimFrame = (function() {
+               if (typeof window === 'undefined') {
+                       return function(callback) {
+                               callback();
+                       };
+               }
                return window.requestAnimationFrame ||
                        window.webkitRequestAnimationFrame ||
                        window.mozRequestAnimationFrame ||