Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
88308353
Commit
88308353
authored
Feb 20, 2018
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: editor-code UI fixes
parent
ce7063ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
21 deletions
+18
-21
editor-code.vue
client/js/components/editor-code.vue
+16
-19
editor-modal-access.vue
client/js/components/editor-modal-access.vue
+2
-2
No files found.
client/js/components/editor-code.vue
View file @
88308353
<
template
lang=
'pug'
>
.editor-code
v-toolbar(color='blue', flat, dense, dark)
v-icon(color='blue lighten-5')
border_color
v-icon(color='blue lighten-5')
edit
v-toolbar-title.white--text Sample Page
.editor-code-toolbar
.editor-code-toolbar-group
...
...
@@ -126,15 +126,7 @@ export default {
highlightSelectionMatches
:
{
annotateScrollbar
:
true
},
viewportMargin
:
50
,
extraKeys
:
{
'F11'
(
cm
)
{
cm
.
setOption
(
'fullScreen'
,
!
cm
.
getOption
(
'fullScreen'
))
},
'Esc'
(
cm
)
{
if
(
cm
.
getOption
(
'fullScreen'
))
cm
.
setOption
(
'fullScreen'
,
false
)
}
}
viewportMargin
:
50
}
}
},
...
...
@@ -151,14 +143,19 @@ export default {
},
methods
:
{
onCmReady
(
cm
)
{
cm
.
setSize
(
null
,
'calc(100vh - 50px)'
)
},
onCmFocus
(
cm
)
{
console
.
log
(
'the editor is focus!'
,
cm
)
},
onCmCodeChange
(
newCode
)
{
console
.
log
(
'this is new code'
,
newCode
)
this
.
code
=
newCode
let
self
=
this
cm
.
setSize
(
null
,
'calc(100vh - 100px)'
)
cm
.
setOption
(
'extraKeys'
,
{
'F11'
(
cm
)
{
cm
.
setOption
(
'fullScreen'
,
!
cm
.
getOption
(
'fullScreen'
))
},
'Esc'
(
cm
)
{
if
(
cm
.
getOption
(
'fullScreen'
))
cm
.
setOption
(
'fullScreen'
,
false
)
},
'Ctrl-S'
(
cm
)
{
self
.
$parent
.
save
()
}
})
}
}
}
...
...
@@ -174,7 +171,7 @@ export default {
&
-editor
{
flex
:
1
1
50%
;
display
:
block
;
min-height
:
calc
(
100vh
-
5
0px
);
min-height
:
calc
(
100vh
-
10
0px
);
position
:
relative
;
&
-title
{
...
...
client/js/components/editor-modal-access.vue
View file @
88308353
...
...
@@ -15,14 +15,14 @@
v-flex(xs6)
v-menu(ref='menuPublishStart', lazy='', :close-on-content-click='false', v-model='isPublishStartShown', transition='scale-transition', offset-y='', full-width='', :nudge-right='40', min-width='290px', :return-value.sync='publishStartDate')
v-text-field(slot='activator', label='Publish starting on...', v-model='publishStartDate', prepend-icon='event', readonly)
v-date-picker(v-model='
d
ate', :min='(new Date()).toISOString().substring(0, 10)', reactive)
v-date-picker(v-model='
publishStartD
ate', :min='(new Date()).toISOString().substring(0, 10)', reactive)
v-spacer
v-btn(flat='', color='primary', @click='isPublishStartShown = false') Cancel
v-btn(flat='', color='primary', @click='$refs.menuPublishStart.save(date)') OK
v-flex(xs6)
v-menu(ref='menuPublishEnd', lazy='', :close-on-content-click='false', v-model='isPublishEndShown', transition='scale-transition', offset-y='', full-width='', :nudge-right='40', min-width='290px', :return-value.sync='publishEndDate')
v-text-field(slot='activator', label='Publish ending on...', v-model='publishEndDate', prepend-icon='event', readonly)
v-date-picker(v-model='
d
ate', :min='(new Date()).toISOString().substring(0, 10)', reactive)
v-date-picker(v-model='
publishEndD
ate', :min='(new Date()).toISOString().substring(0, 10)', reactive)
v-spacer
v-btn(flat='', color='primary', @click='isPublishEndShown = false') Cancel
v-btn(flat='', color='primary', @click='$refs.menuPublishEnd.save(date)') OK
...
...
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