Skip to content

Commit

Permalink
Merge pull request #1496 from NicoPennec/fix/various
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
NicoPennec authored Jul 22, 2024
2 parents d5509c8 + c1ab147 commit bc1adb9
Show file tree
Hide file tree
Showing 12 changed files with 150 additions and 253 deletions.
147 changes: 68 additions & 79 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"@fullcalendar/multimonth": "6.1.15",
"@fullcalendar/vue": "6.1.15",
"@google/model-viewer": "3.5.0",
"@sentry/vue": "8.18.0",
"@sentry/vue": "8.19.0",
"async": "3.2.5",
"bowser": "2.11.0",
"chart.js": "2.9.4",
"color-hash": "2.0.2",
"color-string": "1.9.1",
"fabric": "cgwire/fabric.js",
"lucide-vue": "0.408.0",
"lucide-vue": "0.414.0",
"marked": "13.0.2",
"marked-emoji": "1.4.1",
"moment": "2.30.1",
Expand Down Expand Up @@ -65,7 +65,6 @@
"wavesurfer.js": "7.8.2"
},
"devDependencies": {
"@types/vue-feather-icons": "5.0.8",
"@vitejs/plugin-vue2": "2.3.1",
"@vue/compiler-sfc": "2.7.16",
"@vue/test-utils": "1.3.6",
Expand All @@ -76,7 +75,7 @@
"eslint-plugin-vue": "9.27.0",
"esm": "3.2.25",
"husky": "8.0.3",
"jsdom": "24.1.0",
"jsdom": "24.1.1",
"lint-staged": "15.2.7",
"localStorage": "1.0.4",
"prettier": "3.3.3",
Expand Down
7 changes: 2 additions & 5 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<router-view v-else />

<preview-modal
:active="previewFileIdToShow.length > 0"
v-if="previewFileIdToShow"
active
:preview-file-id="previewFileIdToShow"
@cancel="() => $store.commit('HIDE_PREVIEW_FILE')"
/>
Expand Down Expand Up @@ -701,10 +702,6 @@ body {
}
} // End dark theme
#app .router-link-active {
color: #00d1b2;
}
.loading-info {
background: white;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/lists/TimeSpentTaskList.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="data-list">
<table-info :is-loading="isLoading" :is-error="isLoadingError" />
<table-info :is-loading="isLoading" :is-error="isError" />

<div class="aggregated-time-spents">
<div
Expand Down Expand Up @@ -82,7 +82,7 @@ export default {
type: Boolean,
default: false
},
isLoadingError: {
isError: {
type: Boolean,
default: false
}
Expand Down
16 changes: 9 additions & 7 deletions src/components/modals/base_modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ export const modalMixin = {

watch: {
/*
* Make sure that the keydown event is removed each time, the modla is
* hidden.
* Make sure that the keydown event is removed each time the modal is hidden.
*/
active() {
if (this.active) {
window.addEventListener('keydown', this.onKeyDown, false)
} else {
window.removeEventListener('keydown', this.onKeyDown)
active: {
immediate: true,
handler() {
if (this.active) {
window.addEventListener('keydown', this.onKeyDown, false)
} else {
window.removeEventListener('keydown', this.onKeyDown)
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Assets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<combobox-department
class="combobox-department flexrow-item"
:selectable-departments="selectableDepartments('Asset')"
:dispay-all-and-my-departments="true"
:display-all-and-my-departments="true"
rounded
v-model="selectedDepartment"
v-if="departments.length > 0"
Expand Down
Loading

0 comments on commit bc1adb9

Please sign in to comment.