Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2183/app/xul/esc/chrome/content/esc
Modified Files:
ESC.js esc.css esc.xul
Log Message:
Merge errata changes to the trunk.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ESC.js 7 Jun 2009 00:09:15 -0000 1.24
+++ ESC.js 17 Nov 2009 23:44:36 -0000 1.25
@@ -29,7 +29,6 @@
var gFactoryMode = 0;
var gHiddenPage = 0;
var gExternalUI = 0;
-
loadStringBundle();
//ESC constants
@@ -1279,7 +1278,8 @@
}
else
{
- UpdateEnrollmentArea(keyType,keyID,keyInserted,showFullUI);
+ MyAlert(getBundleString("errorPhoneHomeInfo"));
+ window.close();
}
}
@@ -3260,10 +3260,74 @@
window.resizeBy(0,1);
window.resizeBy(0,-1);
}
+// nsIWebProgressListener to oversee the loading of the external UI
+var uiListener = null;
+var esc_enroll_uri = null;
+
+const STATE_START = Components.interfaces.nsIWebProgressListener.STATE_START;
+const STATE_STOP = Components.interfaces.nsIWebProgressListener.STATE_STOP;
+const STATE_IS_DOCUMENT =
Components.interfaces.nsIWebProgressListener.STATE_IS_DOCUMENT;
+uiListener =
+{
+ QueryInterface: function(aIID)
+ {
+ if (aIID.equals(Components.interfaces.nsIWebProgressListener) ||
+ aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
+ aIID.equals(Components.interfaces.nsISupports))
+ return this;
+ throw Components.results.NS_NOINTERFACE;
+ },
+
+ onStateChange: function(aWebProgress, aRequest, aFlag, aStatus)
+ {
+ if(aFlag & STATE_START && aFlag & STATE_IS_DOCUMENT)
+ {
+ }
+ if(aFlag & STATE_STOP && aFlag & STATE_IS_DOCUMENT)
+ {
+
+ var url = aWebProgress.DOMWindow.document.URL;
+
+ if(url != esc_enroll_uri)
+ {
+ MyAlert(getBundleString("errorEnrollmentUI"));
+
+ if(uiListener)
+ aWebProgress.removeProgressListener(uiListener);
+
+ var enrollWnd = IsPageWindowPresent(ENROLL_WINDOW);
+
+ if(enrollWnd)
+ {
+ enrollWnd.close();
+ }
+ }
+ else
+ {
+ if(uiListener)
+ aWebProgress.removeProgressListener(uiListener);
+ }
+ }
+ },
+
+ onLocationChange: function(aProgress, aRequest, aURI)
+ {
+ },
+ onProgressChange: function(aWebProgress, aRequest, curSelf, maxSelf, curTot, maxTot)
+ {
+ },
+ onStatusChange: function(aWebProgress, aRequest, aStatus, aMessage)
+ {
+ },
+ onSecurityChange: function(aWebProgress, aRequest, aState)
+ {
+ }
+}
function loadExternalESCUI()
{
- var esc_enroll_uri = null;
+
+ esc_enroll_uri = null;
var keyType= null;
var keyID = null;
@@ -3285,7 +3349,6 @@
}
var esc_enrolled_token_url = null;
- var esc_enroll_uri = null;
if(keyID)
{
@@ -3323,8 +3386,9 @@
if(ui_id)
{
+ UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI);
+
ui_id.addProgressListener(uiListener,Components.interfaces.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
ui_id.setAttribute("src",esc_enroll_uri);
- UpdateEnrollmentArea(keyType,keyID,inserted,showFullUI,showExternalUI)
}
}
Index: esc.css
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- esc.css 26 Feb 2009 22:34:43 -0000 1.6
+++ esc.css 17 Nov 2009 23:44:36 -0000 1.7
@@ -334,6 +334,10 @@
border: black solid 4px;
}
+.BorderedBrowser {
+ border: black solid 4px;
+}
+
.SelectedRow {
color: white;
Index: esc.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.xul,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- esc.xul 7 May 2007 23:49:23 -0000 1.6
+++ esc.xul 17 Nov 2009 23:44:36 -0000 1.7
@@ -147,7 +147,7 @@
</hbox>
</vbox>
- <iframe id="esc-ui" flex="1" class="BorderedIFrame"
hidden="true"/>
+ <browser id="esc-ui" class="BorderedBrowser"
height="725" flex="1" hidden="true" src="" />
</groupbox>
<hbox id = "enrollment_button_box">
<spacer flex = "4"/>