gemma: client/src/components/Contextbox.vue annotate

annotate client/src/components/Contextbox.vue @ 3678:8f58851927c0

client: make layer factory only return new layer config for individual maps instead of each time it is invoked. The purpose of the factory was to support multiple maps with individual layers. But returning a new config each time it is invoked leads to bugs that rely on the layer's state. Now this factory reuses the same objects it created before, per map.

author	Markus Kottlaender <markus@intevation.de>
date	Mon, 17 Jun 2019 17:31:35 +0200
parents	ec27ee21f7bc
children	982816fca381

rev	line source
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	1 <template>
1362 ca33ad696594 remove the first empyty lines Fadi Abbud <fadi.abbud@intevation.de> parents: 1299 diff changeset	2 <div :class="style">
3262 a2e9671f4ad6 client: removed closing html tags Markus Kottlaender <markus@intevation.de> parents: 3261 diff changeset	3 <Bottlenecks v-if="contextBoxContent === 'bottlenecks'" />
a2e9671f4ad6 client: removed closing html tags Markus Kottlaender <markus@intevation.de> parents: 3261 diff changeset	4 <Staging v-if="contextBoxContent === 'staging'" />
a2e9671f4ad6 client: removed closing html tags Markus Kottlaender <markus@intevation.de> parents: 3261 diff changeset	5 <Stretches v-if="contextBoxContent === 'stretches'" />
3298 ec27ee21f7bc client: define sections: added route and support in context box Markus Kottlaender <markus@intevation.de> parents: 3263 diff changeset	6 <Sections v-if="contextBoxContent === 'sections'" />
3262 a2e9671f4ad6 client: removed closing html tags Markus Kottlaender <markus@intevation.de> parents: 3261 diff changeset	7 <ImportOverview v-if="contextBoxContent === 'importoverview'" />
a2e9671f4ad6 client: removed closing html tags Markus Kottlaender <markus@intevation.de> parents: 3261 diff changeset	8 <ImportConfiguration v-if="contextBoxContent === 'importconfiguration'" />
1362 ca33ad696594 remove the first empyty lines Fadi Abbud <fadi.abbud@intevation.de> parents: 1299 diff changeset	9 </div>
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	10 </template>
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	11
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	12 <script>
1362 ca33ad696594 remove the first empyty lines Fadi Abbud <fadi.abbud@intevation.de> parents: 1299 diff changeset	13 /* This is Free Software under GNU Affero General Public License v >= 3.0
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	14 * without warranty, see README.md and license for details.
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	15 *
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	16 * SPDX-License-Identifier: AGPL-3.0-or-later
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	17 * License-Filename: LICENSES/AGPL-3.0.txt
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	18 *
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	19 * Copyright (C) 2018 by via donau
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	20 * – Österreichische Wasserstraßen-Gesellschaft mbH
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	21 * Software engineering by Intevation GmbH
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	22 *
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	23 * Author(s):
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	24 * Markus Kottländer <markus.kottlaender@intevation.de>
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	25 */
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	26 import { mapState } from "vuex";
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	27
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	28 export default {
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	29 name: "contextbox",
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	30 components: {
2399 e120631797f6 wip Thomas Junk <thomas.junk@intevation.de> parents: 2387 diff changeset	31 Bottlenecks: () => import("@/components/Bottlenecks"),
3263 d23532a4d0c3 client: define stretches: renamed component file and moved to subdirectory Markus Kottlaender <markus@intevation.de> parents: 3262 diff changeset	32 Stretches: () => import("@/components/stretches/Stretches"),
3298 ec27ee21f7bc client: define sections: added route and support in context box Markus Kottlaender <markus@intevation.de> parents: 3263 diff changeset	33 Sections: () => import("@/components/sections/Sections"),
2985 1b8bb4f89227 client: removed .js and .vue extention from imports Markus Kottlaender <markus@intevation.de> parents: 2972 diff changeset	34 ImportOverview: () => import("@/components/importoverview/ImportOverview"),
1b8bb4f89227 client: removed .js and .vue extention from imports Markus Kottlaender <markus@intevation.de> parents: 2972 diff changeset	35 ImportConfiguration: () => import("@/components/importconfiguration/Import")
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	36 },
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	37 computed: {
1282 a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	38 ...mapState("application", [
a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	39 "showSearchbarLastState",
a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	40 "contextBoxContent",
a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	41 "showContextBox"
a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	42 ]),
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	43 style() {
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	44 return [
1282 a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	45 "ui-element shadow-xs contextbox",
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	46 {
1282 a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	47 contextboxcollapsed: !this.showContextBox,
a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	48 contextboxextended: this.showContextBox,
a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	49 "rounded-bottom": this.contextBoxContent !== "imports",
a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	50 rounded: this.contextBoxContent === "imports"
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	51 }
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	52 ];
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	53 }
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	54 },
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	55 methods: {
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	56 close() {
3261 916d4c898f08 client: import stretches: prevent map/identify popup from opening when selecting a distance mark on the map Markus Kottlaender <markus@intevation.de> parents: 3012 diff changeset	57 this.$store.commit("map/mapPopupEnabled", true);
2282 2e40909a975d clean searchbar when context is changed Thomas Junk <thomas.junk@intevation.de> parents: 2154 diff changeset	58 this.$store.commit("application/searchQuery", "");
1282 a7dd8a3356fc fixed contextBox animations Markus Kottlaender <markus@intevation.de> parents: 1278 diff changeset	59 this.$store.commit("application/showContextBox", false);
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	60 this.$store.commit(
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	61 "application/showSearchbar",
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	62 this.showSearchbarLastState
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	63 );
2329 514193fd0120 refac: improve routing structure. We now have /bottlenecks, /stretches, /review routes Thomas Junk <thomas.junk@intevation.de> parents: 2282 diff changeset	64 this.$router.push("/");
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	65 }
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	66 }
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	67 };
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	68 </script>
aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	69
1449 bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	70 <style lang="scss" scoped>
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	71 .contextbox {
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	72 position: relative;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	73 background-color: #ffffff;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	74 opacity: $slight-transparent;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	75 transition: max-width 0.3s, max-height 0.3s;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	76 overflow: hidden;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	77 background: #fff;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	78 }
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	79 .contextbox > div:last-child {
3012 802fcb50c484 search, contextbox: increased available area Thomas Junk <thomas.junk@intevation.de> parents: 2985 diff changeset	80 width: 668px;
1449 bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	81 }
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	82
1449 bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	83 .contextboxcollapsed {
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	84 max-width: 0;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	85 max-height: 0;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	86 }
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	87
1449 bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	88 .contextboxextended {
3012 802fcb50c484 search, contextbox: increased available area Thomas Junk <thomas.junk@intevation.de> parents: 2985 diff changeset	89 max-width: 668px;
1449 bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	90 }
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	91
1449 bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	92 .close-contextbox {
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	93 position: absolute;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	94 z-index: 2;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	95 right: 0;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	96 top: 7px;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	97 height: $icon-width;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	98 width: $icon-height;
bb47531bdd22 sass to scss Thomas Junk <thomas.junk@intevation.de> parents: 1403 diff changeset	99 }
1276 aec9ed491dad more cleanup in client/src Markus Kottlaender <markus@intevation.de> parents: diff changeset	100 </style>

Mercurial > gemma

annotate client/src/components/Contextbox.vue @ 3678:8f58851927c0