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
082eaad3
Commit
082eaad3
authored
Jan 14, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
821b2451
df7fe637
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
app/assets/javascripts/terminal/terminal.js
app/assets/javascripts/terminal/terminal.js
+3
-0
No files found.
app/assets/javascripts/terminal/terminal.js
View file @
082eaad3
...
...
@@ -2,11 +2,13 @@ import _ from 'underscore';
import
$
from
'
jquery
'
;
import
{
Terminal
}
from
'
xterm
'
;
import
*
as
fit
from
'
xterm/lib/addons/fit/fit
'
;
import
*
as
webLinks
from
'
xterm/lib/addons/webLinks/webLinks
'
;
import
{
canScrollUp
,
canScrollDown
}
from
'
~/lib/utils/dom_utils
'
;
const
SCROLL_MARGIN
=
5
;
Terminal
.
applyAddon
(
fit
);
Terminal
.
applyAddon
(
webLinks
);
export
default
class
GLTerminal
{
constructor
(
element
,
options
=
{})
{
...
...
@@ -48,6 +50,7 @@ export default class GLTerminal {
this
.
terminal
.
open
(
this
.
container
);
this
.
terminal
.
fit
();
this
.
terminal
.
webLinksInit
();
this
.
terminal
.
focus
();
this
.
socket
.
onopen
=
()
=>
{
...
...
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