From 1f4a4f7db825f9655d5bc814f9806820b1a2062f Mon Sep 17 00:00:00 2001 From: Gregory L'Azou Date: Wed, 16 Mar 2016 16:14:37 -0700 Subject: [PATCH] Map Journal V1.7.1 --- README.md | 2 +- package.json | 2 +- src/app/storymaps/tpl/core/WebApplicationData.js | 2 +- src/app/storymaps/tpl/ui/StoryText.js | 4 +++- src/index.html | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 16974263..23e24ec4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Story Map Journal is ideal when you want to combine narrative text with maps [Map Journal page on Esri Story Maps website](http://storymaps.arcgis.com/en/app-list/map-journal/) | [Download](http://links.esri.com/storymaps/map_journal_template_zip) -**Latest release is version 1.7.0**, if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/map-journal-storytelling-template-js/releases) for release notes. +**Latest release is version 1.7.1**, if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/map-journal-storytelling-template-js/releases) for release notes. ## Help content diff --git a/package.json b/package.json index 36b40047..4db26826 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Storymaps-MapJournal", - "version": "1.7.0", + "version": "1.7.1", "devDependencies": { "grunt": "~0.4.1", "grunt-contrib-clean": "~0.4.0", diff --git a/src/app/storymaps/tpl/core/WebApplicationData.js b/src/app/storymaps/tpl/core/WebApplicationData.js index 539d2bbb..7a208d61 100644 --- a/src/app/storymaps/tpl/core/WebApplicationData.js +++ b/src/app/storymaps/tpl/core/WebApplicationData.js @@ -152,7 +152,7 @@ define(["dojo/_base/lang"], if ( this.getStorySections().length > 0 ) this.setTitle($("
" + this.getStorySections()[0].title + "
").text()); - return _data.values.title || ""; + return _data.values.title ? _data.values.title.trim() : ""; }, setTitle: function(title) { diff --git a/src/app/storymaps/tpl/ui/StoryText.js b/src/app/storymaps/tpl/ui/StoryText.js index 372b65b5..8590d63f 100644 --- a/src/app/storymaps/tpl/ui/StoryText.js +++ b/src/app/storymaps/tpl/ui/StoryText.js @@ -191,6 +191,7 @@ define(["dojo/topic", if ( action.type == "media" ) { var actionIsWebmap = action.media.type == "webmap", + actionChangeWebmap = currentWebmapId && actionIsWebmap && currentWebmapId != action.media.webmap.id, actionChangeExtent = !! (actionIsWebmap && action.media.webmap.extent), actionChangeLayers = !! (actionIsWebmap && action.media.webmap.layers), actionChangePopup = !! (actionIsWebmap && action.media.webmap.popup); @@ -269,7 +270,8 @@ define(["dojo/topic", } } - if ( isRealExtentChange || actionChangeLayers ) + if ( actionChangeWebmap || ! actionIsWebmap || ! currentMediaIsWebmap + || isRealExtentChange || actionChangeLayers ) $('.mediaBackContainer') .show() .css("marginLeft", - $(".mediaBackContainer .backButton").outerWidth() / 2) diff --git a/src/index.html b/src/index.html index f7511128..135b7d9a 100644 --- a/src/index.html +++ b/src/index.html @@ -65,7 +65,7 @@