Merge branch 'main' of github.com:svub/ibook-app

svub · svub · commit cb0a2a82a946 · 2021-08-02T21:39:36.000+02:00
diff --git a/public/index.html b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/src/App.vue b/src/App.vue
@@ -1,5 +1,5 @@
 <template web lang="pug">
-main(:class="page" :lang="config.language || 'en'")
+main(:class="page" :lang="lang")
   transition(name="page")
     //- use dynamic component: component(:is=page)
     Start(key="1", v-if="page === 'start'")
@@ -89,6 +89,9 @@ export default class App extends Vue {
       this.setOverlay(testOverlay);
     }
 
+    // set root lang
+    document.documentElement.lang = this.lang;
+
     // for debugging and testing
     window["appState"] = appState;
   }
@@ -109,6 +112,10 @@ export default class App extends Vue {
       }))!;
   }
 
+  get lang() {
+    return this.config.language || 'en';
+  }
+
   @Watch('options', { deep: true, immediate: true })
   @Watch('overlay', { immediate: true })
   updateClasses() {
diff --git a/src/components/elements/IfElement.vue b/src/components/elements/IfElement.vue
@@ -10,7 +10,6 @@ import { Store } from "vuex";
 import { If } from "../../shared/entities";
 import { log, warn, error } from "../../shared/util";
 import { AppState } from "../../store";
-import TextElement from "./TextElement.vue";
 
 export function evaluateCondition(condition: string, store: Store<AppState>): boolean {
   // examples conditions (case insensitive), "IF" is not part of condition:
@@ -32,7 +31,7 @@ export function evaluateCondition(condition: string, store: Store<AppState>): bo
           error(`Failed to parse condition "${condition}": should be four elements; example: STATE x > 0`);
         }
         if (!appState.states[name]) {
-          warn(`State ${elements[1]} not found`);
+          warn(`State ${name} not found`);
         }
         const state = appState.states[name]?.value ?? 0;
         const value = parseInt(elements[3]);
@@ -55,7 +54,7 @@ export function evaluateCondition(condition: string, store: Store<AppState>): bo
             return state != value;
           default:
             throw new Error(
-              `Operator ${elements[2]} not supported. Support: =, <, <=, >, >=, !=`
+              `Operator ${elements[2]} not supported. Supported: =, <, <=, >, >=, !=`
             );
         }
       case "item":
diff --git a/src/store/index.ts b/src/store/index.ts
@@ -128,12 +128,13 @@ export default new Vuex.Store({
       state.items.push(item.id);
     },
     removeItem(state, { item }: { item: RemoveItem }) {
-      if (state.items.includes(item.id)) {
+      const index = state.items.indexOf(item.id);
+      if (index < 0) {
         return warn(`removeItem: item ${ item.id } not in inventory`);
       }
       // TODO is it enough to just remove the item? or do I need to recreate the map?
       // Vue.delete(state.items, item.id);
-      state.items.splice(state.items.indexOf(item.id), 1);
+      state.items.splice(index, 1);
     },
     setOption(state, { option, choice }: { option: Option; choice: Choice }) {
       if (!option.choices.find(c => c.id === choice.id)) {
