aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/webapp/js/common.js
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:36:01 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:36:01 +0100
commitb757096ff32fa80908527220f8e08046015c2449 (patch)
tree837e839c74366a2b3af0c0dacf26cba1dc6f828d /id/ConfigWebTool/src/main/webapp/js/common.js
parented54650118390e2747dece3bad6bd74b6eefec7a (diff)
parent31a10590f3efee8aca463b43623ee689f7b0c605 (diff)
downloadmoa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.gz
moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.tar.bz2
moa-id-spss-b757096ff32fa80908527220f8e08046015c2449.zip
Merge branch 'bs_3_fr' into moa2_0_tlenz_bs_3
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/js/common.js')
-rw-r--r--id/ConfigWebTool/src/main/webapp/js/common.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 7e42eaf30..a14a287db 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -61,21 +61,21 @@ function oaSSOService() {
}
}
function oaStork() {
- if ($('#OAuseSTORKLogon').attr('checked') == 'checked') {
+ if ($('#OAuseSTORKLogon').is(':checked')) {
$('#stork_block').css('display', "block");
} else {
$('#stork_block').css('display', "none");
}
}
function oaVIDP() {
- if ($('#oa_vidp_area').css('display') == "block") {
- $('#oa_vidp_area').css('display', "none");
- $('#button_vidp_show').css('display', "block");
- $('#button_vidp_hidden').css('display', "none");
- } else {
+ if ($('#oa_vidp_area').css('display') == "none" || $('#OAuseVidp').is(':checked')) {
$('#oa_vidp_area').css('display', "block");
$('#button_vidp_show').css('display', "none");
$('#button_vidp_hidden').css('display', "block");
+ } else {
+ $('#oa_vidp_area').css('display', "none");
+ $('#button_vidp_show').css('display', "block");
+ $('#button_vidp_hidden').css('display', "none");
}
}
function oaSAML1() {
@@ -218,9 +218,12 @@ function oaOnLoad() {
oaStorkService();
oaSSOService();
oaLegacyService();
+ oaStork();
AdminTarget();
oaTargetSubSector();
+ oaVIDP();
+
$(".colorfield").each(
function() {
$(this).ColorPicker({