Load config.json at runtime
This commit is contained in:
parent
01c0eb503f
commit
589c52f4cd
11 changed files with 71 additions and 39 deletions
|
|
@ -235,7 +235,7 @@
|
|||
</v-col>
|
||||
|
||||
<v-col
|
||||
v-if="config.useShortCodeStickers"
|
||||
v-if="$config.useShortCodeStickers"
|
||||
class="input-area-button text-center flex-grow-0 flex-shrink-1"
|
||||
>
|
||||
<v-btn
|
||||
|
|
@ -473,7 +473,6 @@ import MessageOperationsBottomSheet from "./MessageOperationsBottomSheet";
|
|||
import stickers from "../plugins/stickers";
|
||||
import StickerPickerBottomSheet from "./StickerPickerBottomSheet";
|
||||
import BottomSheet from "./BottomSheet.vue";
|
||||
import config from "../assets/config";
|
||||
import ImageResize from "image-resize";
|
||||
const sizeOf = require("image-size");
|
||||
const dataUriToBuffer = require("data-uri-to-buffer");
|
||||
|
|
@ -555,7 +554,6 @@ export default {
|
|||
|
||||
data() {
|
||||
return {
|
||||
config: config,
|
||||
events: [],
|
||||
currentInput: "",
|
||||
typingMembers: [],
|
||||
|
|
|
|||
|
|
@ -59,7 +59,11 @@
|
|||
}
|
||||
"
|
||||
></v-text-field>
|
||||
<v-checkbox class="mt-0" v-model="sharedComputer" :label="$t('join.shared_computer')" />
|
||||
<v-checkbox
|
||||
class="mt-0"
|
||||
v-model="sharedComputer"
|
||||
:label="$t('join.shared_computer')"
|
||||
/>
|
||||
<v-btn
|
||||
:disabled="!isValid || loading"
|
||||
color="black"
|
||||
|
|
@ -78,13 +82,12 @@
|
|||
<script>
|
||||
import User from "../models/user";
|
||||
import util from "../plugins/utils";
|
||||
import config from "../assets/config";
|
||||
|
||||
export default {
|
||||
name: "Login",
|
||||
data() {
|
||||
return {
|
||||
user: new User(config.defaultServer, "", ""),
|
||||
user: new User(this.$config.defaultServer, "", ""),
|
||||
isValid: true,
|
||||
loading: false,
|
||||
message: "",
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@
|
|||
<script>
|
||||
import profileInfoMixin from "./profileInfoMixin";
|
||||
import ActionRow from "./ActionRow.vue";
|
||||
import config from "../assets/config";
|
||||
|
||||
export default {
|
||||
name: "ProfileInfoPopup",
|
||||
|
|
@ -102,10 +101,10 @@ export default {
|
|||
},
|
||||
computed: {
|
||||
product() {
|
||||
return config.product;
|
||||
return this.$config.product;
|
||||
},
|
||||
productLink() {
|
||||
return config.productLink;
|
||||
return this.$config.productLink;
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue