diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-03-01 07:34:34 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-03-01 07:34:34 +0100 |
| commit | a7f2d50cfab60df449d9e6176df81d6a1aece431 (patch) | |
| tree | f5c9771d87526a6b0eb86e9d6d04a4e18dd6d6ad /js/bin/HttpServer.js | |
| parent | Fixed default slice dir for Python and Ruby (ICE-7417) (diff) | |
| download | ice-a7f2d50cfab60df449d9e6176df81d6a1aece431.tar.bz2 ice-a7f2d50cfab60df449d9e6176df81d6a1aece431.tar.xz ice-a7f2d50cfab60df449d9e6176df81d6a1aece431.zip | |
Fixed ICE-7615 - JS browsers tests failing with testicedist.py
Diffstat (limited to 'js/bin/HttpServer.js')
| -rw-r--r-- | js/bin/HttpServer.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js index df9c41c48d1..53c42327368 100644 --- a/js/bin/HttpServer.js +++ b/js/bin/HttpServer.js @@ -239,7 +239,9 @@ function Init() // If OPTIMIZE is set resolve Ice libraries to the corresponding minified // versions. // - if(process.env.OPTIMIZE == "yes") + // NOTE: only used minified versions with ES5 for now, they aren't supported with ES6 yet. + // + if(process.env.OPTIMIZE == "yes" && filePath.indexOf("es5/") !== -1) { if(iceLib && filePath.substr(-7) !== ".min.js") { |