honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(browser): make Firefox to work with es6-shim 

es6-shim.js must be loaded first
This commit is contained in:
Marc Laval 2015-09-16 23:50:03 +02:00
parent 5a3ce87915
commit e166f6fe95
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
karma-js.conf.js
View File

@ -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',

2
tools/broccoli/html-replace/SCRIPTS.html
View File

@ -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">

2
tools/broccoli/html-replace/SCRIPTS_benchmarks.html
View File

@ -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">

2
tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
View File

@ -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">

2
tools/broccoli/js-replace/SCRIPTS.js
View File

@ -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");

4
tools/broccoli/trees/browser_tree.ts
View File

@ -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'
]
}));