mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 07:07:35 +01:00
Fix client side errors that happened on page load (#15502)
* fix momentjs error on page load * use correct method to set moment locale * fix vue draggable deprecation
This commit is contained in:
@@ -321,8 +321,8 @@ export default {
|
|||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
petClass () {
|
petClass () {
|
||||||
const foolEvent = this.currentEventList?.find(event => moment()
|
const foolEvent = this.currentEventList?.find(event => event.aprilFools && moment()
|
||||||
.isBetween(event.start, event.end) && event.aprilFools);
|
.isBetween(event.start, event.end));
|
||||||
if (foolEvent) {
|
if (foolEvent) {
|
||||||
return this.foolPet(this.member.items.currentPet, foolEvent.aprilFools);
|
return this.foolPet(this.member.items.currentPet, foolEvent.aprilFools);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,8 +86,8 @@
|
|||||||
v-if="taskList.length > 0"
|
v-if="taskList.length > 0"
|
||||||
ref="tasksList"
|
ref="tasksList"
|
||||||
class="sortable-tasks"
|
class="sortable-tasks"
|
||||||
:options="{disabled: activeFilter.label === 'scheduled' || !canBeDragged(),
|
:disabled="activeFilter.label === 'scheduled' || !canBeDragged()"
|
||||||
scrollSensitivity: 64}"
|
scrollSensitivity="64"
|
||||||
:delay-on-touch-only="true"
|
:delay-on-touch-only="true"
|
||||||
:delay="100"
|
:delay="100"
|
||||||
@update="taskSorted"
|
@update="taskSorted"
|
||||||
|
|||||||
@@ -21,11 +21,9 @@
|
|||||||
>
|
>
|
||||||
<draggable
|
<draggable
|
||||||
v-model="checklist"
|
v-model="checklist"
|
||||||
:options="{
|
handle=".grippy"
|
||||||
handle: '.grippy',
|
filter=".task-dropdown"
|
||||||
filter: '.task-dropdown',
|
:disabled="disabled"
|
||||||
disabled: disabled,
|
|
||||||
}"
|
|
||||||
@update="updateChecklist"
|
@update="updateChecklist"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ function loadLocale (i18nData) {
|
|||||||
script.type = 'text/javascript';
|
script.type = 'text/javascript';
|
||||||
script.text = i18nData.momentLang;
|
script.text = i18nData.momentLang;
|
||||||
head.appendChild(script);
|
head.appendChild(script);
|
||||||
moment.locale(language.momentLangCode);
|
moment.updateLocale(language.momentLangCode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user