summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorUdo Walter2019-01-15 13:35:55 +0100
committerUdo Walter2019-01-15 13:35:55 +0100
commit80dec98d05f76b8b724a2b7d21a2a8c0a9ddb127 (patch)
treed3468b3db9dee2641cc1381a39530df2d31461a7 /webapp
parentmerge (diff)
downloadbas-80dec98d05f76b8b724a2b7d21a2a8c0a9ddb127.tar.gz
bas-80dec98d05f76b8b724a2b7d21a2a8c0a9ddb127.tar.xz
bas-80dec98d05f76b8b724a2b7d21a2a8c0a9ddb127.zip
[webapp] small bugfixes
Diffstat (limited to 'webapp')
-rw-r--r--webapp/src/components/ConfiguratorModuleConfig.vue2
-rw-r--r--webapp/src/components/DashboardPage.vue1
-rw-r--r--webapp/src/main.js2
3 files changed, 3 insertions, 2 deletions
diff --git a/webapp/src/components/ConfiguratorModuleConfig.vue b/webapp/src/components/ConfiguratorModuleConfig.vue
index 4381ab8..3b3c18e 100644
--- a/webapp/src/components/ConfiguratorModuleConfig.vue
+++ b/webapp/src/components/ConfiguratorModuleConfig.vue
@@ -73,7 +73,7 @@
<span>{{ $t('defaultEntry') }}</span></v-tooltip>
</v-list-tile-action>
<v-list-tile-content class="item-content">
- <v-select return-object style="max-width: 280px" item-text="name" offset-y :label="$t('entry')" color="primary" v-model="item.entry"
+ <v-select return-object style="max-width: 280px" item-text="name" menu-props="offsetY" :label="$t('entry')" color="primary" v-model="item.entry"
:items="item.entry.id ? [item.entry, ...availableEntries] : availableEntries"></v-select>
<v-text-field v-if="item.entry.id" class="custom-name-input" :label="$t('customName')" color="primary" v-model="item.customName"></v-text-field>
<v-text-field v-if="item.entry.id" style="max-width: 60px" prepend-inner-icon="keyboard" color="primary" v-model="item.keyBind" maxlength="1"></v-text-field>
diff --git a/webapp/src/components/DashboardPage.vue b/webapp/src/components/DashboardPage.vue
index 9696466..922b14b 100644
--- a/webapp/src/components/DashboardPage.vue
+++ b/webapp/src/components/DashboardPage.vue
@@ -26,6 +26,7 @@
class="drawer-handle-closed"
></v-touch>
<v-navigation-drawer
+ style="z-index: 11;"
class="drawer non-selectable"
:style="drawerDraggingStyle"
persistent
diff --git a/webapp/src/main.js b/webapp/src/main.js
index 69af37c..53064ca 100644
--- a/webapp/src/main.js
+++ b/webapp/src/main.js
@@ -59,7 +59,7 @@ Vue.use(VueCodemirror, {
Vue.use(VueTouch)
axios.interceptors.response.use(null, error => {
- if (error.response.data.status === 'TOKEN_INVALID' || error.response.data.status === 'TOKEN_MISSING') {
+ if (error && (error.response.data.status === 'TOKEN_INVALID' || error.response.data.status === 'TOKEN_MISSING')) {
axios.post('/api/logout').then(response => { router.push('/login') })
}
return Promise.reject(error)