Skip to content

Commit

Permalink
#100 prepare new release
Browse files Browse the repository at this point in the history
  • Loading branch information
p-a-s-c-a-l committed Aug 10, 2020
1 parent 5ee7334 commit 11c80b4
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 4 deletions.
5 changes: 2 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ pipeline {
failure {
emailext attachLog: true,
to: "[email protected]",
subject: "Build failed in Jenkins: ${currentBuild.fullDisplayName}",
body: """<p>FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]':</p>
<p>Check console output at &QUOT;<a href='${env.BUILD_URL}'>${env.JOB_NAME} [${env.BUILD_NUMBER}]</a>&QUOT;</p>"""
subject: "Build of Map Component failed in Jenkins: ${currentBuild.fullDisplayName}",
body: """<p>FAILED: <a href='https://github.com/clarity-h2020/map-component'>Map Component</a> Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]':</p>"""
}
unstable {
emailext attachLog: true,
Expand Down
36 changes: 36 additions & 0 deletions examples/mapsForStudyAOAPStep.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<script>
(function ($, Drupal) {
window.Drupal.behaviors.mapComponentIFrameConnector = {
attach: function (context, drupalSettings) {
// Using once() to apply the mapComponentIFrameConnector effect when you want to run just one function.
$(window, context).once('mapComponentIFrameConnector').each(function () {
var grouping_tag = 'taxonomy_term--hazards';
if (undefined !== drupalSettings && undefined !== drupalSettings.csisHelpers && undefined !== drupalSettings.csisHelpers.initMapComponent) {
var mapType = 'AdaptationOptionsAppraisalMap';
var iFrameMapComponent = document.getElementById('AdaptationOptionsAppraisalMap');
drupalSettings.csisHelpers.initMapComponent(mapType, grouping_tag, iFrameMapComponent);

var mapType = 'AdaptationHazardLocalEffectsMap';
var iFrameMapComponent = document.getElementById('AdaptationHazardLocalEffectsMap');
drupalSettings.csisHelpers.initMapComponent(mapType, grouping_tag, iFrameMapComponent);
} else {
console.error('no global drupalSettings object found, probably not connected to Drupal!');
}
});
}
};

})(jQuery, Drupal);
</script>

<h3>The map below always shows the impact without adaptation options on the left and the impact with adaptation options
on the right side.</h3>
<iframe name="AdaptationOptionsAppraisalMap" id="AdaptationOptionsAppraisalMap"
src="https://csis.myclimateservice.eu/apps/map-component/build/loader.html" style="width:100%;height:500px">
</iframe>

<h3>The map below always shows the hazard with local effects without adaptation options on the left and the impact with
adaptation options on the right side.</h3>
<iframe name="AdaptationHazardLocalEffectsMap" id="AdaptationHazardLocalEffectsMap"
src="https://csis.myclimateservice.eu/apps/map-component/build/loader.html" style="width:100%;height:500px">
</iframe>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clarity-map-component",
"version": "2.7.0",
"version": "2.7.1",
"private": true,
"license": "LGPL",
"dependencies": {
Expand Down

0 comments on commit 11c80b4

Please sign in to comment.