Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1c2d4464
Commit
1c2d4464
authored
Jun 22, 2020
by
derek-knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move editor_service to services dir
parent
0041c815
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/vue_shared/components/rich_content_editor/constants.js
...ts/vue_shared/components/rich_content_editor/constants.js
+1
-1
app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue
...ed/components/rich_content_editor/rich_content_editor.vue
+1
-1
app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js
...components/rich_content_editor/services/editor_service.js
+1
-1
spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js
...red/components/rich_content_editor/editor_service_spec.js
+1
-1
spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
...omponents/rich_content_editor/rich_content_editor_spec.js
+3
-3
No files found.
app/assets/javascripts/vue_shared/components/rich_content_editor/constants.js
View file @
1c2d4464
import
{
__
}
from
'
~/locale
'
;
import
{
generateToolbarItem
}
from
'
./editor_service
'
;
import
{
generateToolbarItem
}
from
'
./
services/
editor_service
'
;
import
buildCustomHTMLRenderer
from
'
./services/build_custom_renderer
'
;
export
const
CUSTOM_EVENTS
=
{
...
...
app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue
View file @
1c2d4464
...
...
@@ -16,7 +16,7 @@ import {
removeCustomEventListener
,
addImage
,
getMarkdown
,
}
from
'
./editor_service
'
;
}
from
'
./
services/
editor_service
'
;
export
default
{
components
:
{
...
...
app/assets/javascripts/vue_shared/components/rich_content_editor/editor_service.js
→
app/assets/javascripts/vue_shared/components/rich_content_editor/
services/
editor_service.js
View file @
1c2d4464
import
Vue
from
'
vue
'
;
import
ToolbarItem
from
'
./toolbar_item.vue
'
;
import
ToolbarItem
from
'
.
.
/toolbar_item.vue
'
;
const
buildWrapper
=
propsData
=>
{
const
instance
=
new
Vue
({
...
...
spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js
View file @
1c2d4464
...
...
@@ -4,7 +4,7 @@ import {
removeCustomEventListener
,
addImage
,
getMarkdown
,
}
from
'
~/vue_shared/components/rich_content_editor/editor_service
'
;
}
from
'
~/vue_shared/components/rich_content_editor/
services/
editor_service
'
;
describe
(
'
Editor Service
'
,
()
=>
{
const
mockInstance
=
{
...
...
spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
View file @
1c2d4464
...
...
@@ -13,10 +13,10 @@ import {
addCustomEventListener
,
removeCustomEventListener
,
addImage
,
}
from
'
~/vue_shared/components/rich_content_editor/editor_service
'
;
}
from
'
~/vue_shared/components/rich_content_editor/
services/
editor_service
'
;
jest
.
mock
(
'
~/vue_shared/components/rich_content_editor/editor_service
'
,
()
=>
({
...
jest
.
requireActual
(
'
~/vue_shared/components/rich_content_editor/editor_service
'
),
jest
.
mock
(
'
~/vue_shared/components/rich_content_editor/
services/
editor_service
'
,
()
=>
({
...
jest
.
requireActual
(
'
~/vue_shared/components/rich_content_editor/
services/
editor_service
'
),
addCustomEventListener
:
jest
.
fn
(),
removeCustomEventListener
:
jest
.
fn
(),
addImage
:
jest
.
fn
(),
...
...
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