Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Motion Bank
MB.js
Quasar Components MoSys
Commits
52f6b6d1
Commit
52f6b6d1
authored
May 23, 2019
by
Christian Hansen
Committed by
Anton Koch
May 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new navigation for mobile view - mosys (#227)
parent
0a880f42
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
9 deletions
+28
-9
partials/GridDisplay.vue
partials/GridDisplay.vue
+13
-3
partials/GridEditor.vue
partials/GridEditor.vue
+15
-6
No files found.
partials/GridDisplay.vue
View file @
52f6b6d1
...
...
@@ -7,14 +7,20 @@
.cell-item(:style="getAnnotationStyle(annotation)")
cell(:annotation="annotation", display="display")
q-page-sticky(position="top-right", :offset="[18, 18]", v-if="$store.state.auth.user")
q-btn(round, color="primary", small, @click="$router.push(`/mosys/grids/${$route.params.uuid}/annotate`)")
q-icon(name="edit")
template(v-if="!isMobile")
q-page-sticky(position="top-right", :offset="[18, 18]", v-if="$store.state.auth.user")
q-btn(round, color="primary", small, @click="$router.push(`/mosys/grids/${$route.params.uuid}/annotate`)")
q-icon(name="edit")
template(v-if="isMobile")
.fixed-top-right.q-mt-sm.q-mr-md(v-if="$store.state.auth.user", style="z-index: 1000000000; padding-top: 3px;")
q-btn(round, color="primary", size="sm", @click="$router.push(`/mosys/grids/${$route.params.uuid}/annotate`)")
q-icon(name="edit")
style-tag(v-if="styles || stylesheetUrl", :styles="styles", :url="stylesheetUrl")
</
template
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
import
Cell
from
'
./Cell
'
import
StyleTag
from
'
../../shared/elements/StyleTag
'
import
{
DateTime
}
from
'
luxon
'
...
...
@@ -36,6 +42,9 @@
}
},
computed
:
{
...
mapGetters
({
isMobile
:
'
globalSettings/getIsMobile
'
}),
queryPositionX
()
{
if
(
this
.
$route
.
query
.
x
)
return
parseInt
(
this
.
$route
.
query
.
x
)
else
return
null
...
...
@@ -57,6 +66,7 @@
},
async
mounted
()
{
await
this
.
loadGrid
(
this
.
$route
.
params
.
uuid
)
this
.
$root
.
$emit
(
'
setBackButton
'
,
'
/mosys/grids
'
)
},
methods
:
{
onScroll
()
{
...
...
partials/GridEditor.vue
View file @
52f6b6d1
...
...
@@ -63,11 +63,18 @@
@dragexit="event => {handleGridResizerDragEnd(event)}")
q-icon(name="network cell")
div.fixed-top-right(style="right:18px; top:68px", v-if="!$store.state.mosys.showSources")
q-btn(round, color="primary", small, @click="handleGridButtonClickEdit", style="margin-right: 0.5em")
q-icon(name="add")
q-btn(round, color="primary", small, @click="$router.push(`/mosys/grids/${$route.params.uuid}`)")
q-icon(name="remove red eye")
template(v-if="!isMobile")
.fixed-top-right(style="right:18px; top:68px", v-if="!$store.state.mosys.showSources")
q-btn(round, color="primary", small, @click="handleGridButtonClickEdit", style="margin-right: 0.5em")
q-icon(name="add")
q-btn(round, color="primary", small, @click="$router.push(`/mosys/grids/${$route.params.uuid}`)")
q-icon(name="remove red eye")
template(v-if="isMobile")
.fixed-top-right.q-mt-sm(v-if="!$store.state.mosys.showSources", style="z-index: 10000; padding-top: 3px;")
q-btn.q-mr-sm(round, color="primary", size="sm", @click="handleGridButtonClickEdit")
q-icon(name="add")
q-btn.q-mr-md(round, color="primary", size="sm", @click="$router.push(`/mosys/grids/${$route.params.uuid}`)")
q-icon(name="remove red eye")
</
template
>
...
...
@@ -119,7 +126,8 @@
},
computed
:
{
...
mapGetters
({
user
:
'
auth/getUserState
'
user
:
'
auth/getUserState
'
,
isMobile
:
'
globalSettings/getIsMobile
'
}),
cellContextMenuActions
()
{
const
actions
=
{
...
...
@@ -163,6 +171,7 @@
},
async
mounted
()
{
await
this
.
fetchData
()
this
.
$root
.
$emit
(
'
setBackButton
'
,
'
/mosys/grids
'
)
},
watch
:
{
annotations
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment