From d431f12deb9204769d60873af2aee56f246af8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Wed, 6 Oct 2021 11:19:27 +0200
Subject: [PATCH] replace != by !==
---
src/components/map-layers/SidebarLayers.vue | 2 +-
.../project/ProjectMappingContextLayer.vue | 12 ++++++------
src/services/project-api.js | 2 +-
src/store/index.js | 4 ++--
src/store/modules/feature.js | 2 +-
src/store/modules/feature_type.js | 2 +-
src/store/modules/map.js | 2 +-
src/views/feature/Feature_edit.vue | 2 +-
src/views/feature/Feature_list.vue | 2 +-
src/views/project/Project_edit.vue | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/components/map-layers/SidebarLayers.vue b/src/components/map-layers/SidebarLayers.vue
index 59cd5d1f..c67abca8 100644
--- a/src/components/map-layers/SidebarLayers.vue
+++ b/src/components/map-layers/SidebarLayers.vue
@@ -124,7 +124,7 @@ export default {
},
methods: {
isActive(basemap) {
- return basemap.active != undefined && basemap.active;
+ return basemap.active !== undefined && basemap.active;
},
activateGroup(basemap) {
this.baseMaps.forEach((basemap) => (basemap.active = false));
diff --git a/src/components/project/ProjectMappingContextLayer.vue b/src/components/project/ProjectMappingContextLayer.vue
index 02837647..a5cf259d 100644
--- a/src/components/project/ProjectMappingContextLayer.vue
+++ b/src/components/project/ProjectMappingContextLayer.vue
@@ -70,14 +70,14 @@ export default {
},
computed: {
- ...mapState("map", ["layers", "availableLayers"]),
+ ...mapState("map", ["layers"]),
selectedLayer: {
get() {
const matchingLayer = this.retrieveLayer(this.layer.title);
- if (matchingLayer != undefined) {
+ if (matchingLayer !== undefined) {
return {
- name: matchingLayer != undefined ? matchingLayer.service : "",
+ name: matchingLayer !== undefined ? matchingLayer.service : "",
value: this.layer ? this.layer.title : "",
};
}
@@ -86,7 +86,7 @@ export default {
set(newValue) {
const matchingLayer = this.retrieveLayer(newValue.title);
- if (matchingLayer != undefined) {
+ if (matchingLayer !== undefined) {
this.updateLayer({
...this.layer,
service: newValue.name,
@@ -113,7 +113,7 @@ export default {
return this.layers.map((el) => {
return {
id: el.id,
- name: el.service,
+ name: `${el.title} - ${el.service}`,
value: el.title,
title: el.title,
};
@@ -150,7 +150,7 @@ export default {
mounted() {
const matchingLayer = this.retrieveLayer(this.layer.title);
- if (matchingLayer != undefined) {
+ if (matchingLayer !== undefined) {
this.updateLayer({
...this.layer,
service: matchingLayer.service,
diff --git a/src/services/project-api.js b/src/services/project-api.js
index fd46c392..b918ad22 100644
--- a/src/services/project-api.js
+++ b/src/services/project-api.js
@@ -5,7 +5,7 @@ import store from '../store'
axios.defaults.headers.common['X-CSRFToken'] = (name => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return (value != null) ? unescape(value[1]) : null;
+ return (value !== null) ? unescape(value[1]) : null;
})('csrftoken');
diff --git a/src/store/index.js b/src/store/index.js
index 713cf40a..8fa44a46 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,7 +10,7 @@ import map from "./modules/map"
axios.defaults.headers.common['X-CSRFToken'] = (name => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return (value != null) ? unescape(value[1]) : null;
+ return (value !== null) ? unescape(value[1]) : null;
})('csrftoken');
@@ -22,7 +22,7 @@ function updateAxiosHeader() {
axios.defaults.headers.common['X-CSRFToken'] = (name => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return (value != null) ? unescape(value[1]) : null;
+ return (value !== null) ? unescape(value[1]) : null;
})('csrftoken');
}
// ! À vérifier s'il y a un changement de token pendant l'éxécution de l'appli
diff --git a/src/store/modules/feature.js b/src/store/modules/feature.js
index 8b186bc2..02c88915 100644
--- a/src/store/modules/feature.js
+++ b/src/store/modules/feature.js
@@ -4,7 +4,7 @@ import router from '../../router'
axios.defaults.headers.common['X-CSRFToken'] = (name => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return (value != null) ? unescape(value[1]) : null;
+ return (value !== null) ? unescape(value[1]) : null;
})('csrftoken');
diff --git a/src/store/modules/feature_type.js b/src/store/modules/feature_type.js
index 1ef68a93..a763e047 100644
--- a/src/store/modules/feature_type.js
+++ b/src/store/modules/feature_type.js
@@ -3,7 +3,7 @@ import axios from "axios"
axios.defaults.headers.common['X-CSRFToken'] = (name => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return (value != null) ? unescape(value[1]) : null;
+ return (value !== null) ? unescape(value[1]) : null;
})('csrftoken');
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 76cfc0bc..24a4501c 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -4,7 +4,7 @@ import { mapUtil } from "@/assets/js/map-util.js";
axios.defaults.headers.common['X-CSRFToken'] = (name => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return (value != null) ? unescape(value[1]) : null;
+ return (value !== null) ? unescape(value[1]) : null;
})('csrftoken');
diff --git a/src/views/feature/Feature_edit.vue b/src/views/feature/Feature_edit.vue
index bf455ac4..98f55061 100644
--- a/src/views/feature/Feature_edit.vue
+++ b/src/views/feature/Feature_edit.vue
@@ -250,7 +250,7 @@ import flip from "@turf/flip";
axios.defaults.headers.common["X-CSRFToken"] = ((name) => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return value != null ? unescape(value[1]) : null;
+ return value !== null ? unescape(value[1]) : null;
})("csrftoken");
export default {
diff --git a/src/views/feature/Feature_list.vue b/src/views/feature/Feature_list.vue
index 875f2688..932dabde 100644
--- a/src/views/feature/Feature_list.vue
+++ b/src/views/feature/Feature_list.vue
@@ -488,7 +488,7 @@ export default {
paginatedFeatures() {
let filterdFeatures = [...this.filteredFeatures];
// Ajout du tri
- if (this.sort.column != "") {
+ if (this.sort.column !== "") {
filterdFeatures = filterdFeatures.sort((a, b) => {
let aProp = this.getFeatureDisplayName(a);
let bProp = this.getFeatureDisplayName(b);
diff --git a/src/views/project/Project_edit.vue b/src/views/project/Project_edit.vue
index 4d250f59..7bbf384a 100644
--- a/src/views/project/Project_edit.vue
+++ b/src/views/project/Project_edit.vue
@@ -199,7 +199,7 @@ import { mapGetters } from "vuex";
axios.defaults.headers.common["X-CSRFToken"] = ((name) => {
var re = new RegExp(name + "=([^;]+)");
var value = re.exec(document.cookie);
- return value != null ? unescape(value[1]) : null;
+ return value !== null ? unescape(value[1]) : null;
})("csrftoken");
export default {
--
GitLab