Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-sb-devops
Commits
4c110c29
Commit
4c110c29
authored
5 years ago
by
Devesh
Browse files
Options
Download
Patches
Plain Diff
Issue #SB-13927 fix: user initiated accout merge hiding state and sign up
parent
b18d675b
master
login-changes
loginRegisterBtn
prasath-release-5.1.0
release-5.1.0
release-5.1.0-api
release-5.1.0-apiuat
release-5.1.0-bulk-enrol-unenrol
release-5.1.0-uat
release-5.1.0-uatLatest
release-5.1.0-uatapi
release-5.1.0-upsmf-prod
release-uat-nginx
revert-5-login-changes
upstream/release-5.1.0-vdn
3nodeinstall
3node-prior-rebase-2-5
3node-2.6.0
3node
3node_bak_new
temp-ratelimit_RC1
tag-for-backups
tag-for-backups_RC1
tag-2.4.0
sunbird.org-release-2.3.0
service-rename-player-2.5.0_RC9
service-rename-kong-2.5.0_RC4
revert-incorrect
revert-942-release-2.6.0
revert-872-SC-1392-ftl-fix
release-dock-0.0.3_RC2
release-dock-0.0.3_RC1
release-5.2.0-inquiry_RC1
release-5.1.0_RC3
release-5.1.0_RC2
release-5.1.0_RC1
release-5.0.2
release-5.0.2_RC1
release-5.0.1
release-5.0.1_RC1
release-5.0.0
release-5.0.0_RC5
release-5.0.0_RC4
release-5.0.0_RC3
release-5.0.0_RC2
release-5.0.0_RC1
release-5.0.0-vdn_RC1
release-4.10.2_RC1
release-4.10.1
release-4.10.1_RC2
release-4.10.1_RC1
release-4.10.0
release-4.10.0_RC1
release-4.10.0-vdn_RC1
release-4.9.0
release-4.9.0_RC4
release-4.9.0_RC3
release-4.9.0_RC2
release-4.9.0_RC1
release-4.9.0-vdn_RC2
release-4.9.0-vdn_RC1
release-4.8.0
release-4.8.0_RC8
release-4.8.0_RC7
release-4.8.0_RC6
release-4.8.0_RC5
release-4.8.0_RC4
release-4.8.0_RC3
release-4.8.0_RC2
release-4.8.0_RC1
release-4.8.0-vdn_RC1
release-4.7.0
release-4.7.0_RC3
release-4.7.0_RC2
release-4.7.0_RC1
release-4.7.0-vdn_RC1
release-4.6.0
release-4.6.0_RC4
release-4.6.0_RC3
release-4.6.0_RC2
release-4.6.0_RC1
release-4.5.0
release-4.5.0_RC6
release-4.5.0_RC5
release-4.5.0_RC4
release-4.5.0_RC3
release-4.5.0_RC2
release-4.5.0_RC1
release-4.4.1_RC2
release-4.4.1_RC1
release-4.4.1-vdn_RC2
release-4.4.1-vdn_RC1
release-4.4.0
release-4.4.0_RC10
release-4.4.0_RC9
release-4.4.0_RC8
release-4.4.0_RC7
release-4.4.0_RC6
release-4.4.0_RC5
release-4.4.0_RC4
release-4.4.0_RC3
release-4.4.0_RC2
release-4.4.0_RC1
release-4.3.0
release-4.3.0_RC7
release-4.3.0_RC6
release-4.3.0_RC5
release-4.3.0_RC4
release-4.3.0_RC3
release-4.3.0_RC2
release-4.3.0_RC1
release-4.2.0
release-4.2.0_RC6
release-4.2.0_RC5
release-4.2.0_RC4
release-4.2.0_RC3
release-4.2.0_RC2
release-4.2.0_RC1
release-4.1.0
release-4.1.0_RC20
release-4.1.0_RC19
release-4.1.0_RC18
release-4.1.0_RC17
release-4.1.0_RC16
release-4.1.0_RC15
release-4.1.0_RC14
release-4.1.0_RC13
release-4.1.0_RC12
release-4.1.0_RC11
release-4.1.0_RC10
release-4.1.0_RC9
release-4.1.0_RC8
release-4.1.0_RC7
release-4.1.0_RC6
release-4.1.0_RC5
release-4.1.0_RC4
release-4.1.0_RC3
release-4.1.0_RC2
release-4.1.0_RC1
release-4.0.0
release-4.0.0_RC6
release-4.0.0_RC5
release-4.0.0_RC4
release-4.0.0_RC3
release-4.0.0_RC2
release-4.0.0_RC1
release-3.9.0
release-3.9.0_RC18
release-3.9.0_RC17
release-3.9.0_RC16
release-3.9.0_RC15
release-3.9.0_RC14
release-3.9.0_RC13
release-3.9.0_RC12
release-3.9.0_RC11
release-3.9.0_RC10
release-3.9.0_RC9
release-3.9.0_RC8
release-3.9.0_RC7
release-3.9.0_RC6
release-3.9.0_RC5
release-3.9.0_RC4
release-3.9.0_RC3
release-3.9.0_RC2
release-3.9.0_RC1
release-3.8.0
release-3.8.0_RC14
release-3.8.0_RC13
release-3.8.0_RC12
release-3.8.0_RC11
release-3.8.0_RC10
release-3.8.0_RC9
release-3.8.0_RC8
release-3.8.0_RC7
release-3.8.0_RC6
release-3.8.0_RC5
release-3.8.0_RC4
release-3.8.0_RC3
release-3.8.0_RC2
release-3.8.0_RC1
release-3.7.0_RC16
release-3.7.0_RC15
release-3.7.0_RC14
release-3.7.0_RC13
release-3.7.0_RC12
release-3.7.0_RC11
release-3.7.0_RC10
release-3.7.0_RC9
release-3.7.0_RC8
release-3.7.0_RC7
release-3.7.0_RC6
release-3.7.0_RC5
release-3.7.0_RC4
release-3.7.0_RC3
release-3.7.0_RC2
release-3.7.0_RC1
release-3.6.5_RC1
release-3.6.0_RC8
release-3.6.0_RC7
release-3.6.0_RC6
release-3.6.0_RC5
release-3.6.0_RC4
release-3.6.0_RC3
release-3.6.0_RC2
release-3.6.0_RC1
release-3.5.0
release-3.5.0_RC8
release-3.5.0_RC7
release-3.5.0_RC6
release-3.5.0_RC5
release-3.5.0_RC4
release-3.5.0_RC3
release-3.5.0_RC2
release-3.5.0_RC1
release-3.4.0
release-3.4.0_RC21
release-3.4.0_RC20
release-3.4.0_RC19
release-3.4.0_RC18
release-3.4.0_RC17
release-3.4.0_RC16
release-3.4.0_RC15
release-3.4.0_RC14
release-3.4.0_RC13
release-3.4.0_RC12
release-3.4.0_RC11
release-3.4.0_RC10
release-3.4.0_RC9
release-3.4.0_RC8
release-3.4.0_RC7
release-3.4.0_RC6
release-3.4.0_RC5
release-3.4.0_RC4
release-3.4.0_RC3
release-3.4.0_RC2
release-3.4.0_RC1
release-3.3.0_RC24
release-3.3.0_RC23
release-3.3.0_RC22
release-3.3.0_RC21
release-3.3.0_RC20
release-3.3.0_RC19
release-3.3.0_RC18
release-3.3.0_RC17
release-3.3.0_RC16
release-3.3.0_RC15
release-3.3.0_RC14
release-3.3.0_RC13
release-3.3.0_RC12
release-3.3.0_RC11
release-3.3.0_RC10
release-3.3.0_RC9
release-3.3.0_RC8
release-3.3.0_RC7
release-3.3.0_RC6
release-3.3.0_RC5
release-3.3.0_RC4
release-3.3.0_RC3
release-3.3.0_RC2
release-3.3.0_RC1
release-3.2.7
release-3.2.7_RC14
release-3.2.7_RC13
release-3.2.7_RC12
release-3.2.7_RC11
release-3.2.7_RC10
release-3.2.7_RC9
release-3.2.7_RC8
release-3.2.7_RC7
release-3.2.7_RC6
release-3.2.7_RC5
release-3.2.7_RC4
release-3.2.7_RC3
release-3.2.7_RC2
release-3.2.7_RC1
release-3.2.0_RC21
release-3.2.0_RC20
release-3.2.0_RC19
release-3.2.0_RC18
release-3.2.0_RC17
release-3.2.0_RC16
release-3.2.0_RC15
release-3.2.0_RC14
release-3.2.0_RC13
release-3.2.0_RC12
release-3.2.0_RC11
release-3.2.0_RC10
release-3.2.0_RC9
release-3.2.0_RC8
release-3.2.0_RC7
release-3.2.0_RC6
release-3.2.0_RC5
release-3.2.0_RC4
release-3.2.0_RC3
release-3.2.0_RC2
release-3.2.0_RC1
release-3.1.0
release-3.1.0_RC10
release-3.1.0_RC9
release-3.1.0_RC8
release-3.1.0_RC7
release-3.1.0_RC6
release-3.1.0_RC5
release-3.1.0_RC4
release-3.1.0_RC3
release-3.1.0_RC2
release-3.1.0_RC1
release-3.0.1_RC7
release-3.0.1_RC6
release-3.0.1_RC5
release-3.0.1_RC4
release-3.0.1_RC3
release-3.0.1_RC2
release-3.0.1_RC1
release-3.0.0
release-3.0.0_RC42
release-3.0.0_RC41
release-3.0.0_RC40
release-3.0.0_RC39
release-3.0.0_RC38
release-3.0.0_RC37
release-3.0.0_RC36
release-3.0.0_RC35
release-3.0.0_RC34
release-3.0.0_RC33
release-3.0.0_RC32
release-3.0.0_RC31
release-3.0.0_RC30
release-3.0.0_RC29
release-3.0.0_RC28
release-3.0.0_RC27
release-3.0.0_RC26
release-3.0.0_RC25
release-3.0.0_RC24
release-3.0.0_RC23
release-3.0.0_RC22
release-3.0.0_RC21
release-3.0.0_RC20
release-3.0.0_RC19
release-3.0.0_RC18
release-3.0.0_RC17
release-3.0.0_RC16
release-3.0.0_RC15
release-3.0.0_RC14
release-3.0.0_RC13
release-3.0.0_RC12
release-3.0.0_RC11
release-3.0.0_RC10
release-3.0.0_RC9
release-3.0.0_RC8
release-3.0.0_RC7
release-3.0.0_RC6
release-3.0.0_RC5
release-3.0.0_RC4
release-3.0.0_RC3
release-3.0.0_RC2
release-3.0.0_RC1
release-2.10.0
release-2.10.0_RC24
release-2.10.0_RC23
release-2.10.0_RC22
release-2.10.0_RC21
release-2.10.0_RC20
release-2.10.0_RC19
release-2.10.0_RC18
release-2.10.0_RC17
release-2.10.0_RC16
release-2.10.0_RC15
release-2.10.0_RC14
release-2.10.0_RC13
release-2.10.0_RC12
release-2.10.0_RC11
release-2.10.0_RC10
release-2.10.0_RC9
release-2.10.0_RC8
release-2.10.0_RC7
release-2.10.0_RC6
release-2.10.0_RC5
release-2.10.0_RC4
release-2.10.0_RC3
release-2.10.0_RC2
release-2.10.0_RC1
release-2.9.0_RC13
release-2.9.0_RC12
release-2.9.0_RC11
release-2.9.0_RC10
release-2.9.0_RC9
release-2.9.0_RC8
release-2.9.0_RC7
release-2.9.0_RC6
release-2.9.0_RC5
release-2.9.0_RC4
release-2.9.0_RC3
release-2.9.0_RC2
release-2.9.0_RC1
release-2.8.0
release-2.8.0_RC34
release-2.8.0_RC33
release-2.8.0_RC32
release-2.8.0_RC31
release-2.8.0_RC30
release-2.8.0_RC29
release-2.8.0_RC28
release-2.8.0_RC27
release-2.8.0_RC26
release-2.8.0_RC25
release-2.8.0_RC24
release-2.8.0_RC23
release-2.8.0_RC22
release-2.8.0_RC21
release-2.8.0_RC20
release-2.8.0_RC19
release-2.8.0_RC18
release-2.8.0_RC17
release-2.8.0_RC16
release-2.8.0_RC15
release-2.8.0_RC14
release-2.8.0_RC13
release-2.8.0_RC12
release-2.8.0_RC11
release-2.8.0_RC10
release-2.8.0_RC9
release-2.8.0_RC8
release-2.8.0_RC7
release-2.8.0_RC6
release-2.8.0_RC5
release-2.8.0_RC4
release-2.8.0_RC3
release-2.8.0_RC2
release-2.8.0_RC1
release-2.8.0-desktopapis-hotfix
release-2.7.0
release-2.7.0_RC16
release-2.7.0_RC15
release-2.7.0_RC14
release-2.7.0_RC13
release-2.7.0_RC12
release-2.7.0_RC11
release-2.7.0_RC10
release-2.7.0_RC9
release-2.7.0_RC8
release-2.7.0_RC7
release-2.7.0_RC6
release-2.7.0_RC5
release-2.7.0_RC4
release-2.7.0_RC3
release-2.7.0_RC2
release-2.7.0_RC1
release-2.6.5_RC3
release-2.6.5_RC2
release-2.6.5_RC1
release-2.6.5_Kong10_RC2
release-2.6.0
release-2.6.0_kong9
release-2.6.0_kong_RC1
release-2.6.0_RC25
release-2.6.0_RC24
release-2.6.0_RC23
release-2.6.0_RC22
release-2.6.0_RC21
release-2.6.0_RC20
release-2.6.0_RC19
release-2.6.0_RC18
release-2.6.0_RC17
release-2.6.0_RC16
release-2.6.0_RC15
release-2.6.0_RC14
release-2.6.0_RC13
release-2.6.0_RC12
release-2.6.0_RC11
release-2.6.0_RC10
release-2.6.0_RC9
release-2.6.0_RC8
release-2.6.0_RC7
release-2.6.0_RC6
release-2.6.0_RC5
release-2.6.0_RC4
release-2.6.0_RC3
release-2.6.0_RC2
release-2.6.0_RC1
release-2.6.0-k8s_9467d13
release-2.5.0
release-2.5.0_RC12
release-2.5.0_RC11
release-2.5.0_RC10
release-2.5.0_RC9
release-2.5.0_RC9_portalfix
release-2.5.0_RC8
release-2.5.0_RC7
release-2.5.0_RC6
release-2.5.0_RC5
release-2.5.0_RC4
release-2.5.0_RC4_kong
release-2.5.0_RC3
release-2.5.0_RC2
release-2.5.0_RC1
release-2.4.0
release-2.4.0_RC9
release-2.4.0_RC9_portal_RC2
release-2.4.0_RC9_portal_RC1
release-2.4.0_RC8
release-2.4.0_RC7
release-2.4.0_RC6
release-2.4.0_RC5
release-2.4.0_RC4
release-2.4.0_RC3
release-2.3.5_RC5
release-2.3.5_RC4
release-2.3.5_RC3
release-2.3.5_RC2
release-2.3.5_RC1
release-2.3.5_RC1_kong_9
release-2.3.0
release-2.3.0_RC9
release-2.3.0_RC8
release-2.3.0_RC7
release-2.3.0_RC6
portal-fix
player-var
original-tag-2.4.0
master_e26ae85
loadtest-release-2.10.0_nginx_prometheus
kubernetes
keycloak-3.2.0
keycloak-3.2.0_RC1
keycloak7_RC1
jenkins-config
fix-tag-2.4.0
es-mapping
dock-0.0.3_RC7
dock-0.0.3_RC6
dock-0.0.3_RC5
dock-0.0.3_RC4
dock-0.0.3_RC3
dock-0.0.3_RC2
dock-0.0.3_RC1
dock-0.0.3-before-delete
dock-0.0.2_RC13
dock-0.0.2_RC12
dock-0.0.2_RC11
dock-0.0.2_RC10
dock-0.0.2_RC9
dock-0.0.2_RC8
dock-0.0.2_RC7
dock-0.0.2_RC6
dock-0.0.2_RC5
dock-0.0.2_RC4
dock-0.0.2_RC3
dock-0.0.2_RC2
dock-0.0.2_RC1
SMYALTAMASH-patch-1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ansible/artifacts/sunbird/login/resources/js/login.js
+21
-8
ansible/artifacts/sunbird/login/resources/js/login.js
with
21 additions
and
8 deletions
+21
-8
ansible/artifacts/sunbird/login/resources/js/login.js
+
21
−
8
View file @
4c110c29
...
...
@@ -8,6 +8,7 @@ window.onload = function(){
var
error_message
=
(
new
URLSearchParams
(
window
.
location
.
search
)).
get
(
'
error_message
'
);
var
success_message
=
(
new
URLSearchParams
(
window
.
location
.
search
)).
get
(
'
success_message
'
);
var
version
=
(
new
URLSearchParams
(
window
.
location
.
search
)).
get
(
'
version
'
);
var
mergeaccountprocess
=
(
new
URLSearchParams
(
window
.
location
.
search
)).
get
(
'
mergeaccountprocess
'
);
if
(
error_message
){
var
error_msg
=
document
.
getElementById
(
'
error-msg
'
);
error_msg
.
className
=
error_msg
.
className
.
replace
(
"
hide
"
,
""
);
...
...
@@ -25,21 +26,26 @@ window.onload = function(){
forgotElement
.
className
=
forgotElement
.
className
.
replace
(
"
hide
"
,
""
);
forgotElement
.
href
=
forgotElement
.
href
+
'
&version=
'
+
version
;
}
if
(
mergeaccountprocess
===
'
1
'
)
{
hideElement
(
"
kc-registration
"
);
hideElement
(
"
stateButton
"
);
}
}
var
storeLocation
=
function
(){
sessionStorage
.
setItem
(
'
url
'
,
window
.
location
.
href
);
var
storeLocation
=
function
(){
sessionStorage
.
setItem
(
'
url
'
,
window
.
location
.
href
);
}
var
addVersionToURL
=
function
(){
var
version
=
getQueryStringValue
(
"
version
"
);
if
(
version
>=
1
){
var
selfSingUp
=
document
.
getElementById
(
"
selfSingUp
"
);
if
(
selfSingUp
)
{
selfSingUp
.
className
=
selfSingUp
.
className
.
replace
(
/
\b
hide
\b
/g
,
""
);
}
var
stateButton
=
document
.
getElementById
(
"
stateButton
"
);
if
((
version
>=
2
)
&&
stateButton
)
{
...
...
@@ -71,6 +77,13 @@ var inputBoxFocusOut = function(currentElement){
}
};
function
hideElement
(
elementId
)
{
var
elementToHide
=
document
.
getElementById
(
elementId
);
if
(
elementToHide
)
{
addClass
(
elementToHide
,
"
hide
"
);
}
}
function
addClass
(
element
,
classname
)
{
var
arr
;
...
...
@@ -127,7 +140,7 @@ var redirect = (redirectUrlPath) => {
const
updatedQuery
=
curUrlObj
.
search
+
'
&error_callback=
'
+
curUrlObj
.
href
.
split
(
'
?
'
)[
0
];
const
redirect_uriLocation
=
new
URL
(
redirect_uri
);
sessionStorage
.
setItem
(
'
url
'
,
window
.
location
.
href
);
if
(
client_id
===
'
android
'
){
window
.
location
.
href
=
curUrlObj
.
protocol
+
'
//
'
+
curUrlObj
.
host
+
redirectUrlPath
+
updatedQuery
;
}
...
...
@@ -191,7 +204,7 @@ var handleSsoEvent = () => {
redirectToLib
();
}
};
var
handleGoogleAuthEvent
=
()
=>
{
var
handleGoogleAuthEvent
=
()
=>
{
const
googleAuthUrl
=
'
/google/auth
'
;
const
curUrlObj
=
window
.
location
;
let
redirect_uri
=
(
new
URLSearchParams
(
curUrlObj
.
search
)).
get
(
'
redirect_uri
'
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets