Skip to content

Commit

Permalink
Merge pull request #2326 from WikiWatershed/ki/test-and-fix-itsi-scre…
Browse files Browse the repository at this point in the history
…enshots

Enable ITSI screenshots for compare view

Connects #2166
  • Loading branch information
kellyi committed Oct 5, 2017
2 parents a3aa657 + be40917 commit 5f3969a
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 0 deletions.
59 changes: 59 additions & 0 deletions src/mmw/js/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,57 @@ function RestAPI() {
};
}

function adjustCompareViewBeforeITSIScreenshot() {
toggleCompareViewForITSIScreenshot(true);
}

function adjustCompareViewAfterITSIScreenshot() {
toggleCompareViewForITSIScreenshot(false);
}

function toggleCompareViewForITSIScreenshot(adjustForScreenshot) {
var itsiCompareDialog = 'itsi-compare-dialog',
itsiCompareModal = 'itsi-compare-modal',
itsiCompareRow = 'itsi-compare-row',
compareDialog = '#compare-new-dialog',
compareModalContent = '.compare-modal-content',
compareCloseButton = '.compare-close',
compareChartButton = '#compare-input-button-chart',
compareTableButton = '#compare-input-button-table',
compareChartRow = '.compare-chart-row',
compareTableRow = '.compare-table-row',
compareScenariosRow = '.compare-scenarios',
compareMapsRow = '.compare-scenario-row-content';

if (adjustForScreenshot) {
$(compareDialog).addClass(itsiCompareDialog);
$(compareModalContent).addClass(itsiCompareModal);
$(compareCloseButton).hide();
$(compareChartButton).hide();
$(compareTableButton).hide();
$(compareScenariosRow).addClass(itsiCompareRow);
$(compareMapsRow).addClass(itsiCompareRow);
if ($(compareChartRow).length) {
$(compareChartRow).addClass(itsiCompareRow);
} else if ($(compareTableRow).length) {
$(compareTableRow).addClass(itsiCompareRow);
}
} else {
$(compareDialog).removeClass(itsiCompareDialog);
$(compareModalContent).removeClass(itsiCompareModal);
$(compareCloseButton).show();
$(compareChartButton).show();
$(compareTableButton).show();
$(compareScenariosRow).removeClass(itsiCompareRow);
$(compareMapsRow).removeClass(itsiCompareRow);
if ($(compareChartRow)) {
$(compareChartRow).removeClass(itsiCompareRow);
} else if ($(compareTableRow).length) {
$(compareTableRow).removeClass(itsiCompareRow);
}
}
}

function initializeShutterbug() {
var googleTileLayerSelector = '#map > .leaflet-google-layer > div > div > div:nth-child(1) > div:nth-child(1)';

Expand Down Expand Up @@ -187,6 +238,10 @@ function initializeShutterbug() {
// '/' then to empty string, which leaves a '#' in the URL.
document.location.hash = '/';
document.location.hash = '';

if ($('#compare-new').length) {
adjustCompareViewBeforeITSIScreenshot();
}
})
.on('shutterbug-asyouwere', function() {
// Reset after screenshot has been taken
Expand All @@ -209,6 +264,10 @@ function initializeShutterbug() {
top: '',
});
}

if ($('#compare-new').length) {
adjustCompareViewAfterITSIScreenshot();
}
});

shutterbug.enable('body');
Expand Down
21 changes: 21 additions & 0 deletions src/mmw/sass/pages/_compare.scss
Original file line number Diff line number Diff line change
Expand Up @@ -656,3 +656,24 @@ $compare-chart-table-height: calc(100vh - #{$height-lg} - #{$compare-footer-heig
}
}
}

.itsi-compare-modal {
max-width: 100% !important;
max-height: 100% !important;
}

.itsi-compare-row {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-flex-wrap: wrap;
flex-wrap: wrap;
}

.itsi-compare-dialog {
margin-left: 3% !important;
max-width: 70% !important;
max-height: 100% !important;
width: 70% !important;
height: 100% !important;
}

0 comments on commit 5f3969a

Please sign in to comment.