Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25090
Modified Files:
ESC.js
Log Message:
Provide hide format button feature. #485748.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ESC.js 26 Feb 2009 22:34:42 -0000 1.19
+++ ESC.js 26 Feb 2009 23:30:15 -0000 1.20
@@ -45,12 +45,16 @@
const ENROLLED_TOKEN_URL = "EnrolledTokenURL";
const TOKEN_TYPE = "TokenType";
const RESET_PHONE_HOME = "ResetPhoneHome";
+
+// Config params
+
const ESC_IGNORE_TOKEN_BROWSER_URL = "esc.ignore.token.browser.url";
const ESC_TOKEN_BROWSER_URL_ESTABLISHED = "esc.token.browser.established";
const ESC_IGNORE_KEY_ISSUER_INFO = "esc.ignore.key.issuer.info";
const ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
const ESC_SECURITY_URL="esc.security.url";
const ESC_SECURE_URL="esc.secure.url";
+const ESC_HIDE_FORMAT="esc.hide.format";
const CLEAN_TOKEN = "cleanToken";
const UNINITIALIZED = 1;
@@ -2120,6 +2124,12 @@
isCool = DoGetCoolKeyIsReallyCoolKey(keyType, keyID);
+ var hideFormatConfig = DoCoolKeyGetConfigValue(ESC_HIDE_FORMAT);
+ var hideFormat = false;
+
+ if(hideFormatConfig == "yes")
+ hideFormat = true;
+
var noKey = 0;
if(!keyType && !keyID)
@@ -2245,6 +2255,12 @@
detailsKeyLabel.setAttribute("value",getBundleString("noKeysPresent"));
HideItem(detailsImage);
+ if(hideFormat) {
+ HideItem(formatbtn);
+ if(adminkeymenu)
+ HideItem(menu_format);
+ }
+
return;
}
@@ -2267,6 +2283,7 @@
if(!isLoginKey)
{
EnableItem(formatbtn);
+
if(adminkeymenu)
EnableItem(menu_format);
}
@@ -2291,6 +2308,12 @@
if(!isBusy)
detailsKeyLabel.setAttribute("value",getBundleString("enrolledKey"));
+ if(hideFormat) {
+ HideItem(formatbtn);
+ if(adminkeymenu)
+ HideItem(menu_format);
+ }
+
return;
}
@@ -2333,6 +2356,12 @@
DisableItem(formatbtn);
}
+ if(hideFormat) {
+ HideItem(formatbtn);
+ if(adminkeymenu)
+ HideItem(menu_format);
+ }
+
return;
}
@@ -2367,6 +2396,12 @@
}
+ if(hideFormat) {
+ HideItem(formatbtn);
+ if(adminkeymenu)
+ HideItem(adminkeymenu);
+ }
+
return;
}
@@ -2386,6 +2421,12 @@
DisableItem(menu_format);
DisableItem(menu_resetpassword);
}
+
+ if(hideFormat) {
+ HideItem(formatbtn);
+ if(adminkeymenu)
+ HideItem(menu_format);
+ }
}
}
Show replies by date