diff --git a/README.md b/README.md index 9a86e4f..9053e17 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The Story Map Cascadeā„  app lets you combine narrative text with maps, images, [Download](http://links.esri.com/storymaps/story_map_cascade_zip) | [Cascade page on Esri Story Maps website](https://storymaps.arcgis.com/en/app-list/cascade/) -**Latest release is version 1.3.2**, if you want to be informed of new releases, we recommend you watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/story-map-cascade/releases) for release notes. +**Latest release is version 1.3.3**, if you want to be informed of new releases, we recommend you watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/story-map-cascade/releases) for release notes. ## Help content diff --git a/bower.json b/bower.json index 4eabe00..5baabec 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "cascade-storytelling-template-js-dev", - "version": "1.3.2", + "version": "1.3.3", "homepage": "", "authors": [ "Gregory L'Azou " diff --git a/package.json b/package.json index fe3bcce..5d3ea70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Storymaps-Cascade", - "version": "1.3.2", + "version": "1.3.3", "description": "The Story Map Cascade app lets you combine narrative text with maps, images, and multimedia content in an engaging, full-screen scrolling experience", "license": "Apache-2.0", "repository": { diff --git a/src/app/main-config.js b/src/app/main-config.js index fab2be6..1a82d26 100644 --- a/src/app/main-config.js +++ b/src/app/main-config.js @@ -61,6 +61,11 @@ function defineDojoConfig() { has: { 'dojo-preload-i18n-Api': false }, + map: { + 'esri4/core/workers/JobProxy': { + 'dojo/dojo.js': '../4.3/dojo/dojo.js' + } + }, packages: [ { name: 'storymaps', diff --git a/src/app/storymaps/tpl/view/media/Common.css b/src/app/storymaps/tpl/view/media/Common.css index 1299e51..973aacc 100644 --- a/src/app/storymaps/tpl/view/media/Common.css +++ b/src/app/storymaps/tpl/view/media/Common.css @@ -75,7 +75,7 @@ body.builder-mode .block-caption:not(:focus):empty:before { * Interaction */ -.interaction-enabled .media-media { +.background.active .interaction-enabled .media-media { pointer-events: all; } diff --git a/src/app/storymaps/tpl/view/media/WebMapBuilder.jsx b/src/app/storymaps/tpl/view/media/WebMapBuilder.jsx index 95dac35..f98979a 100644 --- a/src/app/storymaps/tpl/view/media/WebMapBuilder.jsx +++ b/src/app/storymaps/tpl/view/media/WebMapBuilder.jsx @@ -99,6 +99,7 @@ export default class WebMapBuilder extends WebMap { performAction(params = {}) { if (params.performBuilderInit) { + this._destroyConfigPanel(); this._initConfigPanel(); } @@ -230,11 +231,6 @@ export default class WebMapBuilder extends WebMap { _onConfigChange() { this._applyConfig(); - - if (! this._webmap.layers || this._webmap.layers.length == 0) { - this._configTabWebMap.initLayerList(); - } - super._onConfigChange(); } } diff --git a/src/app/storymaps/tpl/view/media/WebScene.jsx b/src/app/storymaps/tpl/view/media/WebScene.jsx index a1cbfe2..110c7ce 100644 --- a/src/app/storymaps/tpl/view/media/WebScene.jsx +++ b/src/app/storymaps/tpl/view/media/WebScene.jsx @@ -228,6 +228,15 @@ export default class WebScene extends Media { let portalUrl = app.indexCfg.sharingurl.split('/sharing/')[0]; this._esriConfig.portalUrl = portalUrl; + this._esriConfig.workers.loaderConfig = { + packages: [ + { + name: 'esri4', + location: 'https://js.arcgis.com/4.3/esri' + } + ] + }; + // Proxy rules this._esriConfig.request.proxyUrl = location.protocol + app.indexCfg.proxyurl; diff --git a/src/app/storymaps/tpl/view/media/builder/TabWebMap.jsx b/src/app/storymaps/tpl/view/media/builder/TabWebMap.jsx index a9c993d..fba0614 100644 --- a/src/app/storymaps/tpl/view/media/builder/TabWebMap.jsx +++ b/src/app/storymaps/tpl/view/media/builder/TabWebMap.jsx @@ -252,6 +252,8 @@ export default class TabWebMap extends TabArcGIS { layersButton.addClass(disabledClass); this.setMedia('layers', []); + + this.initLayerList(); }); this._updateLocationReset(); diff --git a/src/index.html b/src/index.html index ef1bc94..a45ae5a 100644 --- a/src/index.html +++ b/src/index.html @@ -69,7 +69,7 @@