replug dynamic.json

Geoportail-Luxembourg · Mar 16, 2021 · 194b8ad · 194b8ad
1 parent 32f2a26
commit 194b8ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/CONST_create_template/geoportal/webpack.commons.js b/CONST_create_template/geoportal/webpack.commons.js
diff --git a/geoportal/geoportailv3_geoportal/static-ngeo/js/apps/MainController.js b/geoportal/geoportailv3_geoportal/static-ngeo/js/apps/MainController.js
@@ -42,6 +42,8 @@ import {toRadians} from 'ol/math.js';
 import {listen} from 'ol/events.js';
 import {isValidSerial} from '../utils.js';
 
+import bootstrapApp from './bootstrap.js';
+
 import '../../less/geoportailv3.less';
 
  /* eslint-disable no-unused-vars */
@@ -1824,5 +1826,6 @@ MainController.prototype.isDisconnectedOrOffline = function() {
 
 appModule.controller('MainController', MainController);
 
+bootstrapApp(appModule);
 
 export default MainController;
diff --git a/geoportal/geoportailv3_geoportal/static-ngeo/js/apps/main.html.ejs b/geoportal/geoportailv3_geoportal/static-ngeo/js/apps/main.html.ejs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang={{mainCtrl.lang}} ng-app="Appmain" ng-controller="MainController as mainCtrl" manifest="/geoportailv3.appcache">
+<html lang={{mainCtrl.lang}} ng-controller="MainController as mainCtrl" manifest="/geoportailv3.appcache">
   <head>
     <title ng-bind-template="{{ mainCtrl.getCurrentTheme()|translate }}{{ ' - Geoportal Luxembourg'|translate}}"></title>
     <meta charset="utf-8">
@@ -9,6 +9,8 @@
     <meta name="apple-mobile-web-app-title" content="geoportail.lu">
     <meta name="application-name" content="geoportail.lu">
     <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="dynamicUrl" content="<%= htmlWebpackPlugin.options.vars.entry_point %>dynamic.json">
+    <meta name="interface" content="main">
     <link rel="shortcut icon" href="<%=require("../../images/favicon.ico")%>" />
 
     <% for (var css in htmlWebpackPlugin.files.css) { %>
@@ -457,7 +459,6 @@
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
         <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
         <% } %>
-        <script src="/dynamic.js?interface=main"></script>
 
         <!-- Piwik -->
           <script type="text/javascript">