diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5ca4092169a7b5c423ea2301466cda213726b7d..c8c517f714c65f31833e20473338ec5d179884f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ _20th November 2020_
### Fixed
- a human can use spaces, dashes and caps if they like in name and microcosm but couchDB doesn't like them so they are removed on input
-- you can no longer join and microcosm without setting a name, this stops human from thinking they are safe to create nodes
+- you can no longer join a microcosm without setting a name, this stops human from thinking they are safe to create nodes
# 0.1.35
diff --git a/app/src/components/DiscardLayer.vue b/app/src/components/DiscardLayer.vue
index 05e59db7bceae799802f7426c3dac19dd4142843..95c91a4ad0777865675253f08cb26d76ab2efbce 100644
--- a/app/src/components/DiscardLayer.vue
+++ b/app/src/components/DiscardLayer.vue
@@ -15,7 +15,6 @@
</p>
</div>
</div>
-
<div class="btn-row">
<BaseButton buttonClass="danger" @click="restoreNode(nodeid)"
>Restore</BaseButton
diff --git a/app/src/components/ListLayer.vue b/app/src/components/ListLayer.vue
index afc9d8e5d1f0c54d9cf0b2858d895f1a646f2618..1c4a259e06704333faa09d3ad8945abc2772d705 100644
--- a/app/src/components/ListLayer.vue
+++ b/app/src/components/ListLayer.vue
@@ -36,23 +36,12 @@
</div>
<div class="btn-row">
- <!-- <BaseButton buttonClass="danger" @click="deleteFlag()"
- >Discard</BaseButton
- > -->
<SvgButton buttonClass="nodes" @click.prevent="deleteFlag()" />
<div v-if="value.read_mode == true && deleted == false">
<SvgButton2 buttonClass="nodes" @click.prevent="readFlag()" />
-
- <!-- <BaseButton class="read" buttonClass="action" @click="readFlag()"
- >Edit Mode
- </BaseButton> -->
</div>
<div v-else>
<SvgButton2 buttonClass="nodes" @click.prevent="readFlag()" />
-
- <!-- <BaseButton class="read" buttonClass="action" @click="readFlag()"
- >Read Mode</BaseButton
- > -->
</div>
</div>
</form>
@@ -107,7 +96,7 @@ export default {
},
editTrue(e) {
- this.$emit('editTrue', e)
+ this.$emit('edit-true', e)
},
deleteFlag(e) {
diff --git a/app/src/components/NodesLayer.vue b/app/src/components/NodesLayer.vue
index d797b704dea62c2b95740a50c10e15152270d236..b4367f79ec43175c3323d6ba8c9502c8c2426e85 100644
--- a/app/src/components/NodesLayer.vue
+++ b/app/src/components/NodesLayer.vue
@@ -321,7 +321,7 @@ export default {
},
editTrue(e) {
- this.$emit('editTrue', e)
+ this.$emit('edit-true', e)
// this.firstload = false
// // console.log(e)
},
diff --git a/app/src/components/UploadLayer.vue b/app/src/components/UploadLayer.vue
index f08dec267651da2c087f906d5db0c1f3b56f6519..980bb6bdce6174a423bb5ffc583c3cfd66c7ee91 100644
--- a/app/src/components/UploadLayer.vue
+++ b/app/src/components/UploadLayer.vue
@@ -135,8 +135,8 @@ export default {
copyHash.setSelectionRange(0, 99999) /*For mobile devices*/
document.execCommand('copy')
- this.$emit('uploadAdded')
- this.$emit('copyDone')
+ this.$emit('upload-added')
+ this.$emit('copy-done')
},
},
}
diff --git a/app/src/experimental/ModeToolbar.vue b/app/src/experimental/ModeToolbar.vue
index 08c71cd0ec0f23e822671a3cce658f08a317da24..103cefcc4b224859e46a67766eed2ce8961fe575 100644
--- a/app/src/experimental/ModeToolbar.vue
+++ b/app/src/experimental/ModeToolbar.vue
@@ -52,21 +52,21 @@ export default {
this.$store.dispatch('addNode')
}
if (mode == 'upload') {
- this.$emit('uploadAdded')
+ this.$emit('upload-added')
}
if (mode == 'copy') {
- this.$emit('copyDone')
+ this.$emit('copy-done')
alert(
'Now all you need to do is paste into a new node to display your media'
)
}
if (mode == 'draw') {
- this.$emit('drawOn')
+ this.$emit('draw-on')
// console.log(mode)
}
if (mode != 'draw') {
- this.$emit('drawOff')
+ this.$emit('draw-off')
//console.log(mode)
}
},
@@ -98,7 +98,7 @@ export default {
} else {
// handle offline status
console.log('offline')
- ref.$emit('offlineTriggered')
+ ref.$emit('offline-triggered')
}
},
isReachable: function (url) {
diff --git a/app/src/views/Cards.vue b/app/src/views/Cards.vue
index 04988a0f9051610bbe5ae5f8051fdcf5d22ffba0..35e6fe6b5a4ef9a25c1976428b713248d374ec52 100644
--- a/app/src/views/Cards.vue
+++ b/app/src/views/Cards.vue
@@ -51,8 +51,8 @@
<UploadLayer
v-bind:uploadready="uploadready"
v-bind:copyready="copyready"
- @uploadAdded="uploadAdded()"
- @copyDone="copyDone()"
+ @upload-added="uploadAdded()"
+ @copy-done="copyDone()"
/>
</div>
<BaseButton class="new" buttonClass="action" @click="uploadAdded()"
diff --git a/app/src/views/List.vue b/app/src/views/List.vue
index f1db384f888243b352bd81808c4b2a397e813795..26d5cc04447128e42dd467b216dcc53568dcea34 100644
--- a/app/src/views/List.vue
+++ b/app/src/views/List.vue
@@ -4,7 +4,7 @@
<div id="listwrapper">
<ModesCard />
<ListLayer
- @editTrue="(e) => editTrue(e)"
+ @edit-true="(e) => editTrue(e)"
v-for="value in myNodes"
v-bind:key="value.node_id"
v-bind:nodeid="value.node_id"
@@ -47,8 +47,8 @@
<UploadLayer
v-bind:uploadready="uploadready"
v-bind:copyready="copyready"
- @uploadAdded="uploadAdded()"
- @copyDone="copyDone()"
+ @upload-added="uploadAdded()"
+ @copy-done="copyDone()"
/>
</div>
</div>
diff --git a/app/src/views/Organise.vue b/app/src/views/Organise.vue
index 6f5fad05766c27ef04af52b5673ebcd00d2362e4..89de3b4888fed86a7d1174dd86974c58bca39d2d 100644
--- a/app/src/views/Organise.vue
+++ b/app/src/views/Organise.vue
@@ -14,11 +14,11 @@
v-bind:key="value.node_id"
v-bind:nodeid="value.node_id"
v-bind:nodetext="value.node_text"
- @editTrue="(e) => editTrue(e)"
+ @edit-true="(e) => editTrue(e)"
/>
<ModeToolbar
- @offlineTriggered="offlineTriggered()"
- @onlineTriggered="onlineTriggered()"
+ @offline-triggered="offlineTriggered()"
+ @online-triggered="onlineTriggered()"
/>
<ViewToolbar />
@@ -43,7 +43,7 @@
v-bind:deleted="value.deleted"
/>
<NodesLayer
- @editTrue="(e) => editTrue(e)"
+ @edit-true="(e) => editTrue(e)"
v-for="value in myNodes"
v-bind:key="value.node_id"
v-bind:nodeid="value.node_id"
@@ -64,7 +64,7 @@
v-bind:deleted="value.deleted"
/>
<NodesLayer
- @editTrue="(e) => editTrue(e)"
+ @edit-true="(e) => editTrue(e)"
v-for="value in myNodes"
v-bind:key="value.node_id"
v-bind:nodeid="value.node_id"
@@ -81,19 +81,19 @@
</PanZoomContainer>
<!-- <ToolBar /> -->
<ModeToolbar
- @offlineTriggered="offlineTriggered()"
- @onlineTriggered="onlineTriggered()"
- @uploadAdded="uploadAdded()"
- @copyDone="copyDone()"
- @drawOn="drawOn()"
- @drawOff="drawOff()"
+ @offline-triggered="offlineTriggered()"
+ @online-triggered="onlineTriggered()"
+ @upload-added="uploadAdded()"
+ @copy-done="copyDone()"
+ @draw-on="drawOn()"
+ @draw-off="drawOff()"
/>
<ViewToolbar />
<UploadLayer
v-bind:uploadready="uploadready"
v-bind:copyready="copyready"
- @uploadAdded="uploadAdded()"
- @copyDone="copyDone()"
+ @upload-added="uploadAdded()"
+ @copy-done="copyDone()"
/>
</div>
</div>