From bc05cc49772c0962476145243aae94221ca52224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 21 Jan 2016 12:56:47 +0100
Subject: [PATCH] fix(phantomjs): another fix for phantomjs rendering, #3804

---
 public/views/index.html | 1 +
 tasks/options/concat.js | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/views/index.html b/public/views/index.html
index 1d612e53385..728cd084c88 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -59,6 +59,7 @@
 	<script src="[[.AppSubUrl]]/public/vendor/npm/es5-shim/es5-shim.js"></script>
 	<script src="[[.AppSubUrl]]/public/vendor/npm/es6-shim/es6-shim.js"></script>
 	<script src="[[.AppSubUrl]]/public/vendor/npm/es6-promise/dist/es6-promise.js"></script>
+	<script src="[[.AppSubUrl]]/public/vendor/npm/systemjs/dist/system-polyfills.js"></script>
 	<script src="[[.AppSubUrl]]/public/vendor/npm/systemjs/dist/system.src.js"></script>
 	<script src="[[.AppSubUrl]]/public/app/system.conf.js"></script>
 	<script src="[[.AppSubUrl]]/public/app/boot.js"></script>
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
index 7c2e9ed17c2..0c76ce98d23 100644
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
@@ -28,9 +28,10 @@ module.exports = function(config) {
 
     js: {
       src: [
-        '<%= genDir %>/vendor/npm/es6-shim/es5-shim.js',
+        '<%= genDir %>/vendor/npm/es5-shim/es5-shim.js',
         '<%= genDir %>/vendor/npm/es6-shim/es6-shim.js',
-        '<%= genDir %>/vendor/npm/es6-promise/es6-promise.js',
+        '<%= genDir %>/vendor/npm/es6-promise/dist/es6-promise.js',
+        '<%= genDir %>/vendor/npm/systemjs/dist/system-polyfills.js',
         '<%= genDir %>/vendor/npm/systemjs/dist/system.js',
         '<%= genDir %>/app/system.conf.js',
         '<%= genDir %>/app/boot.js',