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
40f7eac5
Commit
40f7eac5
authored
Jul 08, 2020
by
Marcel van Remmerden
Committed by
Miguel Rincon
Jul 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding translations for file view tooltip
This updates the translation file with the new file view tooltip.
parent
c93986fe
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
11 deletions
+26
-11
app/assets/javascripts/ide/components/ide_status_list.vue
app/assets/javascripts/ide/components/ide_status_list.vue
+12
-5
app/assets/stylesheets/page_bundles/ide.scss
app/assets/stylesheets/page_bundles/ide.scss
+0
-4
changelogs/unreleased/225640-move-link-to-file-view-to-bottom-bar-in-web-ide.yml
...25640-move-link-to-file-view-to-bottom-bar-in-web-ide.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/frontend/ide/components/ide_status_list_spec.js
spec/frontend/ide/components/ide_status_list_spec.js
+6
-2
No files found.
app/assets/javascripts/ide/components/ide_status_list.vue
View file @
40f7eac5
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
GlLink
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
TerminalSyncStatusSafe
from
'
./terminal_sync/terminal_sync_status_safe.vue
'
;
import
{
getFileEOL
}
from
'
../utils
'
;
export
default
{
components
:
{
GlLink
,
TerminalSyncStatusSafe
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
computed
:
{
...
mapGetters
([
'
activeFile
'
]),
activeFileEOL
()
{
...
...
@@ -19,12 +24,14 @@ export default {
<
template
>
<div
class=
"ide-status-list d-flex"
>
<template
v-if=
"activeFile"
>
<div
class=
"ide-status-file"
>
{{
activeFile
.
name
}}
</div
>
<div
class=
"ide-status-file"
>
{{
activeFileEOL
}}
</div
>
<div
v-if=
"!activeFile.binary"
class=
"ide-status-file"
>
{{
activeFile
.
editorRow
}}
:
{{
activeFile
.
editorColumn
}}
<div>
<gl-link
v-gl-tooltip
.
hover
:href=
"activeFile.permalink"
:title=
"__('Open in file view')"
>
{{
activeFile
.
name
}}
</gl-link>
</div>
<div
class=
"ide-status-file"
>
{{
activeFile
.
fileLanguage
}}
</div>
<div>
{{
activeFileEOL
}}
</div>
<div
v-if=
"!activeFile.binary"
>
{{
activeFile
.
editorRow
}}
:
{{
activeFile
.
editorColumn
}}
</div>
<div>
{{
activeFile
.
fileLanguage
}}
</div>
</
template
>
<terminal-sync-status-safe
/>
</div>
...
...
app/assets/stylesheets/page_bundles/ide.scss
View file @
40f7eac5
...
...
@@ -251,10 +251,6 @@ $ide-commit-header-height: 48px;
padding-left
:
$gl-padding
;
}
}
.ide-status-file
{
text-align
:
right
;
}
// Not great, but this is to deal with our current output
.multi-file-preview-holder
{
height
:
100%
;
...
...
changelogs/unreleased/225640-move-link-to-file-view-to-bottom-bar-in-web-ide.yml
0 → 100644
View file @
40f7eac5
---
title
:
Move file link to bottom in Web IDE
merge_request
:
35847
author
:
type
:
changed
locale/gitlab.pot
View file @
40f7eac5
...
...
@@ -15928,6 +15928,9 @@ msgstr ""
msgid "Open in Xcode"
msgstr ""
msgid "Open in file view"
msgstr ""
msgid "Open issues"
msgstr ""
...
...
spec/frontend/ide/components/ide_status_list_spec.js
View file @
40f7eac5
import
Vuex
from
'
vuex
'
;
import
{
createLocalVue
,
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlLink
}
from
'
@gitlab/ui
'
;
import
IdeStatusList
from
'
~/ide/components/ide_status_list.vue
'
;
import
TerminalSyncStatusSafe
from
'
~/ide/components/terminal_sync/terminal_sync_status_safe.vue
'
;
...
...
@@ -9,6 +10,7 @@ const TEST_FILE = {
editorColumn
:
23
,
fileLanguage
:
'
markdown
'
,
content
:
'
abc
\n
ndef
'
,
permalink
:
'
/lorem.md
'
,
};
const
localVue
=
createLocalVue
();
...
...
@@ -19,6 +21,7 @@ describe('ide/components/ide_status_list', () => {
let
store
;
let
wrapper
;
const
findLink
=
()
=>
wrapper
.
find
(
GlLink
);
const
createComponent
=
(
options
=
{})
=>
{
store
=
new
Vuex
.
Store
({
getters
:
{
...
...
@@ -51,8 +54,9 @@ describe('ide/components/ide_status_list', () => {
createComponent
();
});
it
(
'
shows file name
'
,
()
=>
{
expect
(
wrapper
.
text
()).
toContain
(
TEST_FILE
.
name
);
it
(
'
shows a link to the file that contains the file name
'
,
()
=>
{
expect
(
findLink
().
attributes
(
'
href
'
)).
toBe
(
TEST_FILE
.
permalink
);
expect
(
findLink
().
text
()).
toBe
(
TEST_FILE
.
name
);
});
it
(
'
shows file eol
'
,
()
=>
{
...
...
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