From c3ac49a8c4ce075635374fb60f49c7a3c0f89e2e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 23 Nov 2022 15:51:09 +0200
Subject: [PATCH 1/2] Fixed default doc importing

---
 app/imports/api/docs/Docs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/api/docs/Docs.js b/app/imports/api/docs/Docs.js
index b9fa1e4f..cb8aeb4e 100644
--- a/app/imports/api/docs/Docs.js
+++ b/app/imports/api/docs/Docs.js
@@ -145,7 +145,7 @@ if (Meteor.isClient) {
 } else if (Meteor.isServer) {
   Meteor.startup(() => {
     if (!Docs.findOne()) {
-      Assets.getText('docs/defaultDocs.json', (string) => {
+      Assets.getText('docs/defaultDocs.json', (error, string) => {
         const docs = JSON.parse(string)
         docs.forEach(doc => Docs.insert(doc));
       });

From 7e49100d148c5dfea11c59c3950c887b089ae24f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 23 Nov 2022 15:52:45 +0200
Subject: [PATCH 2/2] Fixed dragging on mobile

---
 .../ui/components/global/DragHandle.vue       | 45 +++++++++++++++++++
 .../ui/components/global/globalIndex.js       |  2 +
 .../client/ui/components/tree/TreeNode.vue    | 12 ++---
 .../ui/components/tree/TreeNodeList.vue       |  2 -
 .../creatureList/CreatureListTile.vue         |  9 ++--
 .../components/inventory/ItemListTile.vue     |  7 +--
 .../components/spells/SpellListTile.vue       |  7 +--
 7 files changed, 57 insertions(+), 27 deletions(-)
 create mode 100644 app/imports/client/ui/components/global/DragHandle.vue

diff --git a/app/imports/client/ui/components/global/DragHandle.vue b/app/imports/client/ui/components/global/DragHandle.vue
new file mode 100644
index 00000000..8c06cc0f
--- /dev/null
+++ b/app/imports/client/ui/components/global/DragHandle.vue
@@ -0,0 +1,45 @@
+<template>
+  <v-icon
+    class="handle"
+    v-bind="$attrs"
+    @click.stop="() => { }"
+    @touchstart.native.stop="() => { }"
+    @touchend.native="portalEvent"
+  >
+    mdi-drag
+  </v-icon>
+</template>
+
+<script lang="js">
+import { defer } from 'lodash'
+
+export default {
+  methods: {
+    portalEvent(e) {
+      // Stop everything in the document listening for this touch event
+      e.stopPropagation();
+      // But also send it to straight to the root for draggable.js
+      defer(() => {
+        e.target.ownerDocument.dispatchEvent(e);
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+.handle {
+  cursor: move !important;
+  cursor: -webkit-grab !important;
+}
+.handle::after {
+  opacity: 0 !important;
+}
+</style>
+
+<style>
+.sortable-drag.handle {
+  cursor: move !important;
+  cursor: -webkit-grabbing !important;
+}
+</style>
diff --git a/app/imports/client/ui/components/global/globalIndex.js b/app/imports/client/ui/components/global/globalIndex.js
index bb0898d5..f7e48b3e 100644
--- a/app/imports/client/ui/components/global/globalIndex.js
+++ b/app/imports/client/ui/components/global/globalIndex.js
@@ -1,6 +1,7 @@
 import Vue from 'vue';
 // Global components
 import DatePicker from '/imports/client/ui/components/global/DatePicker.vue';
+import DragHandle from '/imports/client/ui/components/global/DragHandle.vue';
 import IconPicker from '/imports/client/ui/components/global/IconPicker.vue';
 import TextField from '/imports/client/ui/components/global/TextField.vue';
 import TextArea from '/imports/client/ui/components/global/TextArea.vue';
@@ -13,6 +14,7 @@ import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue';
 import SmartSlider from '/imports/client/ui/components/global/SmartSlider.vue';
 
 Vue.component('DatePicker', DatePicker);
+Vue.component('DragHandle', DragHandle);
 Vue.component('IconPicker', IconPicker);
 Vue.component('TextField', TextField);
 Vue.component('TextArea', TextArea);
diff --git a/app/imports/client/ui/components/tree/TreeNode.vue b/app/imports/client/ui/components/tree/TreeNode.vue
index 2a8ee46e..9ef46561 100644
--- a/app/imports/client/ui/components/tree/TreeNode.vue
+++ b/app/imports/client/ui/components/tree/TreeNode.vue
@@ -30,14 +30,12 @@
         :class="{'ml-4': startExpanded}"
         style="flex-grow: 0;"
       >
-        <v-icon
+        <drag-handle
           v-if="organize"
-          class="handle mr-2"
+          class="mr-2"
           :class="selected && 'primary--text'"
           :disabled="expanded"
-        >
-          mdi-drag
-        </v-icon>
+        />
         <!--{{node && node.order}}-->
         <tree-node-view
           :model="node"
@@ -177,10 +175,6 @@ export default {
   min-height: 32px;
 }
 
-.handle {
-  cursor: move;
-}
-
 .empty .drag-area {
   box-shadow: -2px 0px 0px 0px rgb(128, 128, 128, 0.4);
 }
diff --git a/app/imports/client/ui/components/tree/TreeNodeList.vue b/app/imports/client/ui/components/tree/TreeNodeList.vue
index 71925cac..0eef77c3 100644
--- a/app/imports/client/ui/components/tree/TreeNodeList.vue
+++ b/app/imports/client/ui/components/tree/TreeNodeList.vue
@@ -4,7 +4,6 @@
     v-model="displayedChildren"
     class="drag-area"
     :group="group"
-    :move="move"
     :animation="200"
     ghost-class="ghost"
     draggable=".item"
@@ -27,7 +26,6 @@
       @selected="e => $emit('selected', e)"
       @reordered="e => $emit('reordered', e)"
       @reorganized="e => $emit('reorganized', e)"
-      @dragstart.native="e => e.dataTransfer.setData('cow', child.node && child.node.name)"
     />
   </draggable>
 </template>
diff --git a/app/imports/client/ui/creature/creatureList/CreatureListTile.vue b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
index ee9a7d95..2685ff13 100644
--- a/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
@@ -40,12 +40,9 @@
       <shared-icon :model="model" />
     </v-list-item-action>
     <v-list-item-action v-if="!selection && !dense">
-      <v-icon
-        style="height: 100%; width: 40px; cursor: move;"
-        class="handle"
-      >
-        mdi-drag
-      </v-icon>
+      <drag-handle
+        style="height: 100%; width: 40px;"
+      />
     </v-list-item-action>
   </v-list-item>
 </template>
diff --git a/app/imports/client/ui/properties/components/inventory/ItemListTile.vue b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
index cf252ddc..839db61d 100644
--- a/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
+++ b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
@@ -33,13 +33,10 @@
       />
     </v-list-item-action>
     <v-list-item-action class="drag-handle">
-      <v-icon
+      <drag-handle 
         :disabled="context.editPermission === false"
         style="height: 100%; width: 40px; cursor: move;"
-        class="handle"
-      >
-        mdi-drag
-      </v-icon>
+      />
     </v-list-item-action>
   </v-list-item>
 </template>
diff --git a/app/imports/client/ui/properties/components/spells/SpellListTile.vue b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
index 6c47536f..2b20c73f 100644
--- a/app/imports/client/ui/properties/components/spells/SpellListTile.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
@@ -29,14 +29,11 @@
         @click.native.stop="() => {}"
         @change="setPrepared"
       />
-      <v-icon
+      <drag-handle
         v-else-if="!hideHandle"
         :disabled="context.editPermission === false"
         style="height: 100%; width: 40px; cursor: move;"
-        class="handle"
-      >
-        mdi-drag
-      </v-icon>
+      />
       <v-btn
         v-else-if="showInfoButton"
         icon