From e166f6fe95fdae4b2e48565e1b1afdbd4bef4aa2 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Wed, 16 Sep 2015 23:50:03 +0200
Subject: [PATCH] fix(browser): make Firefox to work with es6-shim

es6-shim.js must be loaded first
---
 karma-js.conf.js                                             | 5 +++--
 tools/broccoli/html-replace/SCRIPTS.html                     | 2 +-
 tools/broccoli/html-replace/SCRIPTS_benchmarks.html          | 2 +-
 tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html | 2 +-
 tools/broccoli/js-replace/SCRIPTS.js                         | 2 +-
 tools/broccoli/trees/browser_tree.ts                         | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/karma-js.conf.js b/karma-js.conf.js
index 011b93e4035..275c95c8ca6 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -12,12 +12,13 @@ module.exports = function(config) {
       // Loaded through the System loader, in `test-main.js`.
       {pattern: 'dist/js/dev/es5/**', included: false, watched: false},
 
+      'node_modules/es6-shim/es6-shim.js',
+
       // zone-microtask must be included first as it contains a Promise monkey patch
       'node_modules/zone.js/dist/zone-microtask.js',
       'node_modules/zone.js/dist/long-stack-trace-zone.js',
       'node_modules/zone.js/dist/jasmine-patch.js',
-
-      'node_modules/es6-shim/es6-shim.js',
+      
       // Including systemjs because it defines `__eval`, which produces correct stack traces.
       'modules/angular2/src/test_lib/shims_for_IE.js',
       'node_modules/systemjs/dist/system.src.js',
diff --git a/tools/broccoli/html-replace/SCRIPTS.html b/tools/broccoli/html-replace/SCRIPTS.html
index 40ae9eb80ef..1566e0e9c6f 100644
--- a/tools/broccoli/html-replace/SCRIPTS.html
+++ b/tools/broccoli/html-replace/SCRIPTS.html
@@ -1,6 +1,6 @@
+<script src="es6-shim.js" type="text/javascript"></script>
 <script src="zone-microtask.js" type="text/javascript"></script>
 <script src="long-stack-trace-zone.js" type="text/javascript"></script>
-<script src="es6-shim.js" type="text/javascript"></script>
 <script src="system.src.js" type="text/javascript"></script>
 <script src="Reflect.js" type="text/javascript"></script>
 <script type="text/javascript">
diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html
index 41282f9d6d5..a233374486c 100644
--- a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html
+++ b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html
@@ -1,7 +1,7 @@
+<script src="es6-shim.js" type="text/javascript"></script>
 <script src="zone-microtask.js" type="text/javascript"></script>
 <script src="long-stack-trace-zone.js" type="text/javascript"></script>
 <script src="url_params_to_form.js" type="text/javascript"></script>
-<script src="es6-shim.js" type="text/javascript"></script>
 <script src="system.src.js" type="text/javascript"></script>
 <script src="Reflect.js" type="text/javascript"></script>
 <script type="text/javascript">
diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
index 0b7d1a5db1a..8562a130dfd 100644
--- a/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
+++ b/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
@@ -1,8 +1,8 @@
+<script src="es6-shim.js" type="text/javascript"></script>
 <script src="zone-microtask.js" type="text/javascript"></script>
 <script src="long-stack-trace-zone.js" type="text/javascript"></script>
 <script src="angular.js" type="text/javascript"></script>
 <script src="url_params_to_form.js" type="text/javascript"></script>
-<script src="es6-shim.js" type="text/javascript"></script>
 <script src="system.src.js" type="text/javascript"></script>
 <script src="Reflect.js" type="text/javascript"></script>
 <script type="text/javascript">
diff --git a/tools/broccoli/js-replace/SCRIPTS.js b/tools/broccoli/js-replace/SCRIPTS.js
index 3cdaaf6f51d..7ef18d10ad0 100644
--- a/tools/broccoli/js-replace/SCRIPTS.js
+++ b/tools/broccoli/js-replace/SCRIPTS.js
@@ -1,2 +1,2 @@
-importScripts("zone-microtask.js", "long-stack-trace-zone.js", "es6-shim.js", "system.src.js",
+importScripts("es6-shim.js", "zone-microtask.js", "long-stack-trace-zone.js", "system.src.js",
               "Reflect.js");
diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts
index 523ae7e336a..37518a59d6b 100644
--- a/tools/broccoli/trees/browser_tree.ts
+++ b/tools/broccoli/trees/browser_tree.ts
@@ -138,12 +138,12 @@ module.exports = function makeBrowserTree(options, destinationPath) {
 
   var vendorScriptsTree = flatten(new Funnel('.', {
     files: [
+      'node_modules/es6-shim/es6-shim.js',
       'node_modules/zone.js/dist/zone-microtask.js',
       'node_modules/zone.js/dist/long-stack-trace-zone.js',
       'node_modules/systemjs/dist/system.src.js',
       'node_modules/base64-js/lib/b64.js',
-      'node_modules/reflect-metadata/Reflect.js',
-      'node_modules/es6-shim/es6-shim.js'
+      'node_modules/reflect-metadata/Reflect.js'
     ]
   }));