From e6fdc14e951c1d9202a2f7cdb30345ee5b535242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Amador=20Pato=CC=81n?= Date: Wed, 19 Apr 2017 10:52:55 +0200 Subject: [PATCH] #6 - Info layer on map should be open by default - Info on images bug fix (was not showing any text and should be closed by default) --- src/css/shared/elements/info/styles.less | 1 + src/css/styles.css | 1 + src/shared/steps/map/MapStep.js | 12 ++---------- src/shared/steps/map/MapStep.js.map | 2 +- src/shared/steps/map/MapStep.ts | 11 +---------- src/templates/shared/elements/info/view.html | 8 ++++---- src/templates/shared/steps/map/view.html | 1 + 7 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/css/shared/elements/info/styles.less b/src/css/shared/elements/info/styles.less index ffe19dc..6d7afc6 100644 --- a/src/css/shared/elements/info/styles.less +++ b/src/css/shared/elements/info/styles.less @@ -125,6 +125,7 @@ info { .allMapLayers { max-height: 92%; overflow-y: auto; + width: 350px; .mapLayerWrapper { width: 320px; &:not(:last-child) { diff --git a/src/css/styles.css b/src/css/styles.css index 3b2fbba..f0d4a2d 100644 --- a/src/css/styles.css +++ b/src/css/styles.css @@ -4638,6 +4638,7 @@ info > .component-container .info.hidden { info > .component-container .allMapLayers { max-height: 92%; overflow-y: auto; + width: 350px; } info > .component-container .allMapLayers .mapLayerWrapper { width: 320px; diff --git a/src/shared/steps/map/MapStep.js b/src/shared/steps/map/MapStep.js index 1e04ba6..ba9415a 100644 --- a/src/shared/steps/map/MapStep.js +++ b/src/shared/steps/map/MapStep.js @@ -67,6 +67,7 @@ var MapStepComponent = (function (_super) { return locked; }; MapStepComponent.prototype.ngAfterViewInit = function () { + var _this = this; _super.prototype.ngAfterViewInit.call(this); this.mapService.map = new mapbox_gl_1.Map({ trackResize: false, @@ -76,16 +77,7 @@ var MapStepComponent = (function (_super) { center: this.center }); this.mapService.map.scrollZoom.disable(); - this.setActiveLayer(); - }; - MapStepComponent.prototype.setActiveLayer = function () { - var _this = this; - for (var layer in this.step.info) { - if (this.step.info[layer].collapsed === false) { - this.activeLayer = this.step.info[layer]; - break; - } - } + this.activeLayer = this.step.info[0]; this.mapService.map.on('load', function () { _this.updateLayers(_this.activeLayer); }); diff --git a/src/shared/steps/map/MapStep.js.map b/src/shared/steps/map/MapStep.js.map index 527462d..2c6f407 100644 --- a/src/shared/steps/map/MapStep.js.map +++ b/src/shared/steps/map/MapStep.js.map @@ -1 +1 @@ -{"version":3,"file":"MapStep.js","sourceRoot":"","sources":["MapStep.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"MapStep.js","sourceRoot":"","sources":["MapStep.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/shared/steps/map/MapStep.ts b/src/shared/steps/map/MapStep.ts index 6654b8c..3bbf1b3 100644 --- a/src/shared/steps/map/MapStep.ts +++ b/src/shared/steps/map/MapStep.ts @@ -69,16 +69,7 @@ export class MapStepComponent extends BaseStepComponent { }); this.mapService.map.scrollZoom.disable(); - this.setActiveLayer(); - } - - setActiveLayer() { - for (let layer in this.step.info) { - if (this.step.info[layer].collapsed === false) { - this.activeLayer = this.step.info[layer]; - break; - } - } + this.activeLayer = this.step.info[0]; this.mapService.map.on('load', () => { this.updateLayers(this.activeLayer); }); diff --git a/src/templates/shared/elements/info/view.html b/src/templates/shared/elements/info/view.html index 7f70fca..2fa7026 100644 --- a/src/templates/shared/elements/info/view.html +++ b/src/templates/shared/elements/info/view.html @@ -12,8 +12,8 @@ -
-
+
+
{{info.credit}}
-
+
{{item.title}}
-
+
{{item.credit}}
diff --git a/src/templates/shared/steps/map/view.html b/src/templates/shared/steps/map/view.html index e72caf4..8554422 100644 --- a/src/templates/shared/steps/map/view.html +++ b/src/templates/shared/steps/map/view.html @@ -3,6 +3,7 @@