Merge pull request #235 from paywteam/master

Merge stable
payw-org · Dec 12, 2019 · 412959e · 412959e
2 parents c131ee9 + 04ad187
commit 412959e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/components/auth/AuthCommonForm.vue b/src/components/auth/AuthCommonForm.vue
@@ -191,7 +191,7 @@ export default {
      * @param {KeyboardEvent} e
      */
     handleKeydown(e) {
-      if (e.key.match(/[@ ]/)) {
+      if (e && e.key && e.key.match(/[@ ]/)) {
         e.preventDefault()
       }
     },

diff --git a/src/components/cafeteria/MealTimeGroup.vue b/src/components/cafeteria/MealTimeGroup.vue
@@ -135,6 +135,7 @@ export default {
         flex-wrap: wrap;
         justify-content: space-evenly;
         padding: s(3) s(2);
+        word-break: break-all;
 
         .menu-item {
           margin: 0 s(2) s(1) s(2);

diff --git a/src/modules/eodiro-api/api-host.js b/src/modules/eodiro-api/api-host.js
@@ -5,7 +5,7 @@ export default class ApiHost {
    */
   static setHost(host) {
     if (host.startsWith('eodiro')) {
-      host = 'https://' + host
+      host = 'https://api2.' + host
     } else {
       host = 'http://' + host.split(':')[0] + ':4000'
     }