Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
3pia
VISPA
VISPA web
Commits
46cce590
Commit
46cce590
authored
May 11, 2018
by
Benjamin Fischer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Workspace: prevent feedback loop on double connect with password ask
parent
54723d62
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
vispa/static/js/workspace.js
vispa/static/js/workspace.js
+9
-7
No files found.
vispa/static/js/workspace.js
View file @
46cce590
...
...
@@ -90,6 +90,12 @@ define([
this
.
on
(
"
password_required
"
,
connectWithPass
.
bind
(
this
,
"
password
"
));
this
.
on
(
"
passphrase_required
"
,
connectWithPass
.
bind
(
this
,
"
SSH key passphrase
"
));
this
.
on
(
"
stateChanged
"
,
function
()
{
if
(
this
.
_passwordDialog
)
{
this
.
_passwordDialog
.
abort
();
}
});
this
.
on
(
"
connecting
"
,
function
()
{
this
.
_setState
(
"
connecting
"
);
});
...
...
@@ -204,10 +210,6 @@ define([
return
;
}
if
(
this
.
_passwordDialog
&&
state
!=
"
disconnected
"
)
{
this
.
_passwordDialog
.
close
();
}
this
.
logger
.
debug
(
state
);
var
changed
=
this
.
_state
!=
state
;
...
...
@@ -244,7 +246,7 @@ define([
}
if
(
this
.
_state
==
"
disconnected
"
&&
!
this
.
_passwordDialog
)
{
this
.
_connect
(
password
||
$
.
cookie
(
"
tmpPass
"
)
||
null
);
this
.
_connect
(
password
||
$
.
cookie
(
"
tmpPass
"
)
||
null
);
$
.
removeCookie
(
"
tmpPass
"
);
}
},
...
...
@@ -290,8 +292,8 @@ define([
var
self
=
this
;
if
(
this
.
_state
==
"
disconnected
"
)
{
if
(
this
.
_passwordDialog
)
{
// abort connecting with pasword
this
.
_passwordDialog
.
close
();
if
(
this
.
_passwordDialog
)
{
// abort connecting with pas
s
word
this
.
_passwordDialog
.
abort
();
}
if
(
$
.
isFunction
(
callback
))
callback
(
null
);
return
;
...
...
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