Merge pull request #495 from TerriaJS/enable-post-message

Enable processing message from parent window
TerriaJS · Nov 5, 2020 · f2a5304 · f2a5304
2 parents 6c19aac + 3074a0c
commit f2a5304
Show file tree

Hide file tree

Showing 3 changed files with 1,228 additions and 41 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Change Log
 * Re-enabled measure tool
 * Development builds sped up by 3~20x - ts-loader is now optional & TypeScript being transpiled by babel-loader, keeping type check safety on a separate thread
 * Added default help content & `languageOverrides.json` for i18n
+* Add back updateApplicationOnMessageFromParentWindow
 
 ### Next Release
 

diff --git a/index.js b/index.js
@@ -18,7 +18,7 @@ import raiseErrorToUser from 'terriajs/lib/Models/raiseErrorToUser';
 import registerCustomComponentTypes from 'terriajs/lib/ReactViews/Custom/registerCustomComponentTypes';
 import Terria from 'terriajs/lib/Models/Terria';
 import updateApplicationOnHashChange from 'terriajs/lib/ViewModels/updateApplicationOnHashChange';
-// import updateApplicationOnMessageFromParentWindow from 'terriajs/lib/ViewModels/updateApplicationOnMessageFromParentWindow';
+import updateApplicationOnMessageFromParentWindow from 'terriajs/lib/ViewModels/updateApplicationOnMessageFromParentWindow';
 import ViewState from 'terriajs/lib/ReactViewModels/ViewState';
 import BingMapsSearchProviderViewModel from 'terriajs/lib/Models/BingMapsSearchProvider';
 // import GazetteerSearchProviderViewModel from 'terriajs/lib/ViewModels/GazetteerSearchProviderViewModel.js';
@@ -92,7 +92,7 @@ module.exports = terria.start({
 
         // Automatically update Terria (load new catalogs, etc.) when the hash part of the URL changes.
         updateApplicationOnHashChange(terria, window);
-        // updateApplicationOnMessageFromParentWindow(terria, window);
+        updateApplicationOnMessageFromParentWindow(terria, window);
 
         // Create the various base map options.
         // var createAustraliaBaseMapOptions = require('terriajs/lib/ViewModels/createAustraliaBaseMapOptions');