Skip to content
Snippets Groups Projects
Commit e523fd00 authored by Adam Procter's avatar Adam Procter
Browse files

fixed sync

parent 584ea6db
No related branches found
No related tags found
No related merge requests found
No preview for this file type
...@@ -311,10 +311,40 @@ export default { ...@@ -311,10 +311,40 @@ export default {
// this.input = e.target.value; // this.input = e.target.value;
// }, 300) // }, 300)
// editNode(e) {
// const el = e.target
// const cursorPos = el.selectionStart
// console.log(cursorPos)
// var nodeid = e.target.id
// var nodetext = e.target.value
// this.$store.dispatch('editNode', { nodeid, nodetext })
// this.$nextTick(() => {
// e.target.selectionStart = e.target.selectionEnd = cursorPos
// })
// this.$nextTick(() => {
// el.setSelectionRange(cursorPos, cursorPos)
// })
//},
// editNode: lodash.debounce(function (e) {
// var nodeid = e.target.id
// var nodetext = e.target.value
// this.$store.dispatch('editNode', { nodeid, nodetext })
// }, 600),
editNode: lodash.debounce(function (e) { editNode: lodash.debounce(function (e) {
const el = e.target
const cursorPos = el.selectionStart
var nodeid = e.target.id var nodeid = e.target.id
var nodetext = e.target.value var nodetext = e.target.value
this.$store.dispatch('editNode', { nodeid, nodetext }) this.$store.dispatch('editNode', { nodeid, nodetext })
this.$nextTick(() => {
el.setSelectionRange(cursorPos, cursorPos)
})
}, 600), }, 600),
deleteFlag(e) { deleteFlag(e) {
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
class="innernode" class="innernode"
:w="310" :w="310"
:h="375" :h="375"
:x="1050" :x="850"
:y="15" :y="15"
:z="1" :z="1"
:draggable="true" :draggable="true"
......
...@@ -28,131 +28,6 @@ ...@@ -28,131 +28,6 @@
</g> </g>
</svg> </svg>
</vue-draggable-resizable> </vue-draggable-resizable>
<svg
xmlns="http://www.w3.org/2000/svg"
width="182"
height="196.814"
viewBox="0 0 182 196.814"
>
<defs>
<style>
.f {
fill: none;
}
.g,
.g {
fill: #333;
}
.c {
fill: #fff;
}
.d,
.e {
stroke: none;
}
</style>
</defs>
<g transform="translate(-1485.374 -735.578)">
<g class="f" transform="translate(1489.998 835.06) rotate(-47)">
<path
class="d"
d="M53.519,0l53.519,142.717L53.055,101.138,0,142.717Z"
/>
<path
class="g"
d="M 53.51882553100586 19.93599700927734 L 15.31051635742188 121.824821472168 L 48.73732376098633 95.62881469726562 L 53.01795196533203 92.27416229248047 L 57.32657623291016 95.59273529052734 L 91.86629486083984 122.195915222168 L 53.51882553100586 19.93599700927734 M 53.51882553100586 -1.52587890625e-05 L 107.0376510620117 142.7168579101562 L 53.05514907836914 101.1384582519531 L 0 142.7168579101562 L 53.51882553100586 -1.52587890625e-05 Z"
/>
</g>
<path
class="g"
d="M53.519,0l53.519,142.717L53.055,101.138,0,142.717Z"
transform="translate(1489.998 835.06) rotate(-47)"
/>
<g class="c" transform="translate(1485.374 813.861) rotate(-47)">
<path
class="g"
d="M 99.45198822021484 132.4564208984375 L 55.19086837768555 98.3656005859375 L 53.03655624389648 96.70631408691406 L 50.89624404907227 98.38362121582031 L 7.655252933502197 132.2708435058594 L 53.51882553100586 9.967990875244141 L 99.45198822021484 132.4564208984375 Z"
/>
<path
class="g"
d="M 53.51882553100586 19.93599700927734 L 15.31051635742188 121.824821472168 L 48.73732376098633 95.62881469726562 L 53.01795196533203 92.27416229248047 L 57.32657623291016 95.59273529052734 L 91.86629486083984 122.195915222168 L 53.51882553100586 19.93599700927734 M 53.51882553100586 -1.52587890625e-05 L 107.0376510620117 142.7168579101562 L 53.05514907836914 101.1384582519531 L 0 142.7168579101562 L 53.51882553100586 -1.52587890625e-05 Z"
/>
</g>
</g>
</svg>
<svg
xmlns="http://www.w3.org/2000/svg"
width="160"
height="194"
viewBox="0 0 160 194"
>
<defs>
<style>
.a,
.d,
.g {
fill: none;
}
.a,
.b,
.c {
stroke: #4f4f4f;
}
.a,
.c,
.d,
.e {
stroke-width: 7px;
}
.b {
fill: #333;
}
.c {
fill: #4f4f4f;
}
.d {
stroke: #2d9cdb;
}
.e {
fill: #fff;
stroke: #333;
}
.f {
stroke: none;
}
</style>
</defs>
<g transform="translate(-914 -825)">
<path
class="a"
d="M849.969,915.934c94.642,0-12.173-151.082,80.414-151.082"
transform="translate(106 84)"
/>
<g class="b" transform="translate(920 979)">
<circle class="f" cx="20" cy="20" r="20" />
<circle class="g" cx="20" cy="20" r="19.5" />
</g>
<g class="c" transform="translate(1034 829)">
<circle class="f" cx="20" cy="20" r="20" />
<circle class="g" cx="20" cy="20" r="16.5" />
</g>
<path
class="d"
d="M849.969,915.934c94.642,0-12.173-151.082,80.414-151.082"
transform="translate(100 80)"
/>
<g class="e" transform="translate(914 975)">
<circle class="f" cx="20" cy="20" r="20" />
<circle class="g" cx="20" cy="20" r="16.5" />
</g>
<g class="e" transform="translate(1028 825)">
<circle class="f" cx="20" cy="20" r="20" />
<circle class="g" cx="20" cy="20" r="16.5" />
</g>
</g>
</svg>
</div> </div>
</template> </template>
......
...@@ -107,6 +107,7 @@ const store = new Vuex.Store({ ...@@ -107,6 +107,7 @@ const store = new Vuex.Store({
state.microcosm = microcosm state.microcosm = microcosm
state.allNodes = doc.rows state.allNodes = doc.rows
store.commit('SET_OTHER_NODES') store.commit('SET_OTHER_NODES')
store.commit('GET_MY_NODES')
}) })
.catch(function (err) { .catch(function (err) {
console.log(err) console.log(err)
...@@ -659,8 +660,7 @@ const store = new Vuex.Store({ ...@@ -659,8 +660,7 @@ const store = new Vuex.Store({
syncDB: () => { syncDB: () => {
pouchdb.replicate.from(remote).on('complete', function () { pouchdb.replicate.from(remote).on('complete', function () {
store.commit('GET_ALL_NODES') store.commit('GET_ALL_NODES')
store.commit('GET_MY_NODES') // store.commit('GET_MY_NODES')
store.commit('GET_POSITIONS') store.commit('GET_POSITIONS')
store.commit('GET_CONNECTIONS') store.commit('GET_CONNECTIONS')
store.commit('GET_EMOJI') store.commit('GET_EMOJI')
...@@ -675,7 +675,7 @@ const store = new Vuex.Store({ ...@@ -675,7 +675,7 @@ const store = new Vuex.Store({
.on('change', function () { .on('change', function () {
// pop info into function to find out more // pop info into function to find out more
store.commit('GET_ALL_NODES') store.commit('GET_ALL_NODES')
store.commit('GET_MY_NODES') // store.commit('GET_MY_NODES')
store.commit('GET_POSITIONS') store.commit('GET_POSITIONS')
store.commit('GET_CONNECTIONS') store.commit('GET_CONNECTIONS')
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
<ScribbleLayer v-bind:drawready="drawready"></ScribbleLayer> <ScribbleLayer v-bind:drawready="drawready"></ScribbleLayer>
</PanZoomContainer> </PanZoomContainer>
<ToolBar /> <!-- <ToolBar /> -->
<ModeToolbar <ModeToolbar
@offlineTriggered="offlineTriggered()" @offlineTriggered="offlineTriggered()"
@onlineTriggered="onlineTriggered()" @onlineTriggered="onlineTriggered()"
...@@ -102,7 +102,7 @@ import PanZoomContainer from '@/experimental/PanZoomContainer' ...@@ -102,7 +102,7 @@ import PanZoomContainer from '@/experimental/PanZoomContainer'
import ConnectionsLayer from '@/components/ConnectionsLayer' import ConnectionsLayer from '@/components/ConnectionsLayer'
import NodesLayer from '@/components/NodesLayer' import NodesLayer from '@/components/NodesLayer'
import OffLine from '@/components/OffLine' import OffLine from '@/components/OffLine'
import ToolBar from '@/components/ToolBar' // import ToolBar from '@/components/ToolBar'
import ScribbleLayer from '@/components/ScribbleLayer' import ScribbleLayer from '@/components/ScribbleLayer'
import UploadLayer from '@/components/UploadLayer' import UploadLayer from '@/components/UploadLayer'
import OtherNodeslayer from '@/components/OtherNodeslayer.vue' import OtherNodeslayer from '@/components/OtherNodeslayer.vue'
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
OtherNodeslayer, OtherNodeslayer,
ConnectionsLayer, ConnectionsLayer,
OnBoard, OnBoard,
ToolBar, // ToolBar,
OffLine, OffLine,
UploadLayer, UploadLayer,
ScribbleLayer, ScribbleLayer,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment