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
2aaebb3c
Commit
2aaebb3c
authored
May 28, 2017
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: Added localization to editor-codeblock
parent
31c3cbe2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
29 deletions
+31
-29
editor-codeblock.vue
client/js/components/editor-codeblock.vue
+23
-5
browser.json
server/locales/en/browser.json
+7
-0
editor-codeblock.pug
server/views/modals/editor-codeblock.pug
+0
-23
view.pug
server/views/pages/view.pug
+1
-1
No files found.
client/js/components/editor-codeblock.vue
View file @
2aaebb3c
...
...
@@ -7,11 +7,14 @@
transition(name='modal-content')
.modal-content.is-expanded(v-show='isShown')
header.is-green
span Insert Code Block
span
{{
$t
(
'editor.codeblocktitle'
)
}}
p.modal-notify(v-bind:class='{ "is-active": isLoading }')
span
{{
$t
(
'editor.codeblockloading'
,
{
name
:
modeSelected
}
)
}}
i
section
.
is
-
gapless
.
columns
.
is
-
stretched
.
column
.
is
-
one
-
quarter
.
modal
-
sidebar
.
is
-
green
(
style
=
{
'max-width'
:
'350px'
}
)
.model-sidebar-header
Language
.
model
-
sidebar
-
header
{{
$t
(
'editor.codeblocklanguage'
)
}}
.
model
-
sidebar
-
content
p
.
control
.
is
-
fullwidth
select
(
v
-
model
=
'modeSelected'
)
...
...
@@ -19,8 +22,8 @@
.
column
.
ace
-
container
#
codeblock
-
editor
footer
a.button.is-grey.is-outlined(v-on:click='cancel')
Discard
a.button.is-green(v-on:click='insertCode')
Insert Code Block
a
.
button
.
is
-
grey
.
is
-
outlined
(
v
-
on
:
click
=
'cancel'
)
{{
$t
(
'editor.discard'
)
}}
a
.
button
.
is
-
green
(
v
-
on
:
click
=
'insertCode'
)
{{
$t
(
'editor.codeblockinsert'
)
}}
<
/template
>
<
script
>
...
...
@@ -33,7 +36,8 @@
return
{
modes
:
[],
modeSelected
:
'text'
,
modelistLoaded
:
[]
modelistLoaded
:
[],
isLoading
:
false
}
}
,
computed
:
{
...
...
@@ -72,13 +76,27 @@
if
(
self
.
_
.
includes
(
self
.
modelistLoaded
,
m
))
{
codeEditor
.
getSession
().
setMode
(
'ace/mode/'
+
m
)
}
else
{
self
.
isLoading
=
true
self
.
$http
.
get
(
'/js/ace/mode-'
+
m
+
'.js'
).
then
(
resp
=>
{
if
(
resp
.
ok
)
{
eval
(
resp
.
bodyText
)
self
.
modelistLoaded
.
push
(
m
)
ace
.
acequire
(
'ace/mode/'
+
m
)
codeEditor
.
getSession
().
setMode
(
'ace/mode/'
+
m
)
self
.
_
.
delay
(()
=>
{
self
.
isLoading
=
false
}
,
500
)
}
else
{
this
.
$store
.
dispatch
(
'alert'
,
{
style
:
'red'
,
icon
:
'square-cross'
,
msg
:
'Error: Unable to load language syntax.'
}
)
}
}
).
catch
(
err
=>
{
his
.
$store
.
dispatch
(
'alert'
,
{
style
:
'red'
,
icon
:
'square-cross'
,
msg
:
'Error: '
+
err
.
body
.
msg
}
)
}
)
}
}
,
...
...
server/locales/en/browser.json
View file @
2aaebb3c
{
"editor"
:
{
"discard"
:
"Discard"
,
"codeblocktitle"
:
"Insert Code Block"
,
"codeblockinsert"
:
"Insert Code Block"
,
"codeblocklanguage"
:
"Language"
,
"codeblockloading"
:
"Loading code syntax for {{name}}"
},
"nav"
:
{
"home"
:
"Home"
},
...
...
server/views/modals/editor-codeblock.pug
deleted
100644 → 0
View file @
31c3cbe2
.modal#modal-editor-codeblock
.modal-background
.modal-container
.modal-content.is-expanded
header.is-green
span Insert Code Block
section.is-gapless
.columns.is-stretched
.column.is-one-quarter.modal-sidebar.is-green(style={'max-width':'350px'})
.model-sidebar-header Language
.model-sidebar-content
p.control.is-fullwidth
select(v-model='modeSelected')
option(v-for='mode in modes', v-bind:value='mode.name') {{ mode.caption }}
.column.ace-container
#codeblock-editor
footer
a.button.is-grey.is-outlined(v-on:click='cancel') Discard
a.button.is-green(v-on:click='insertCode') Insert Code Block
server/views/pages/view.pug
View file @
2aaebb3c
...
...
@@ -18,7 +18,7 @@ block rootNavRight
a.button.is-outlined(href='/source/' + pageData.meta.path)
i.icon-loader
span= t('nav.source')
a.button.is-outlined(href='/hist/' + pageData.meta.path)
//-
a.button.is-outlined(href='/hist/' + pageData.meta.path)
i.icon-clock
span= t('nav.history')
if rights.write
...
...
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