Merge pull request #5027 from camptocamp/ie

Fix object editing interface on ie
camptocamp · Jul 18, 2019 · 2d42608 · 2d42608
2 parents be7a65f + f930fc0
commit 2d42608
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/buildtools/webpack.commons.js b/buildtools/webpack.commons.js
@@ -158,6 +158,19 @@ const config = function(hardSourceConfig, babelLoaderCacheDirectory) {
     }
   };
 
+  const jstsRule = {
+    test: /jsts\/.*\.js$/,
+    use: {
+      loader: 'babel-loader',
+      options: {
+        babelrc: false,
+        comments: false,
+        cacheDirectory: babelLoaderCacheDirectory,
+        presets: babelPresets,
+      }
+    }
+  };
+
   return {
     context: path.resolve(__dirname, '../'),
     devtool: 'source-map',
@@ -168,6 +181,7 @@ const config = function(hardSourceConfig, babelLoaderCacheDirectory) {
       rules: [
         olRule,
         olcsRule,
+        jstsRule,
         angularRule,
         typeaheadRule,
         cssRule,

diff --git a/contribs/gmf/src/objectediting/toolsComponent.js b/contribs/gmf/src/objectediting/toolsComponent.js
@@ -362,8 +362,7 @@ exports.Controller_.prototype.handleToolActiveChange_ = function(
 exports.Controller_.prototype.handleDestroy_ = function() {};
 
 
-exports.controller('GmfObjecteditingtoolsController',
-  exports.Controller_);
+exports.controller('GmfObjecteditingtoolsController', exports.Controller_);
 
 
 /**