From f4077f36633b2b58f3715537c2b1108bbb413149 Mon Sep 17 00:00:00 2001 From: "morse%netscape.com" Date: Tue, 1 Feb 2000 08:08:06 +0000 Subject: [PATCH] reverting back to version 1.11, new changes broke single signon --- xpfe/global/resources/content/commonDialog.js | 240 ++++++++++-------- .../global/resources/content/commonDialog.xul | 94 +++---- 2 files changed, 168 insertions(+), 166 deletions(-) diff --git a/xpfe/global/resources/content/commonDialog.js b/xpfe/global/resources/content/commonDialog.js index 1f13cb36d150..e7d224fcb94a 100644 --- a/xpfe/global/resources/content/commonDialog.js +++ b/xpfe/global/resources/content/commonDialog.js @@ -1,84 +1,68 @@ function commonDialogOnLoad() { - dump("commonDialogOnLoad \n"); - doSetOKCancel( commonDialogOnOK, commonDialogOnCancel, commonDialogOnButton2, commonDialogOnButton3 ); + dump("commonDialogOnLoad \n"); + doSetOKCancel( commonDialogOnOK, commonDialogOnCancel, commonDialogOnButton2, commonDialogOnButton3 ); param = window.arguments[0].QueryInterface( Components.interfaces.nsIDialogParamBlock ); if( !param ) dump( " error getting param block interface\n" ); var messageText = param.GetString( 0 ); - var messageFragment; +// dump("message: "+ msg +"\n"); + //SetElementText("info.txt", msg ); + { + var messageFragment; - // Let the caller use "\n" to cause breaks - // Translate these into
tags - var messageParent = document.getElementById("info.txt"); - var done = false; - while (!done) - { - breakIndex = messageText.indexOf('\n'); - if (breakIndex == 0) { - // Ignore break at the first character - messageText = messageText.slice(1); - dump("Found break at begining\n"); - messageFragment = ""; - } - else if (breakIndex > 0) { - // The fragment up to the break - messageFragment = messageText.slice(0, breakIndex); - // Chop off fragment we just found from remaining string - messageText = messageText.slice(breakIndex+1); - } - else { - // "\n" not found. We're done - done = true; - messageFragment = messageText; - } - messageNode = document.createTextNode(messageFragment); - if (messageNode) - messageParent.appendChild(messageNode); - // This is needed when the default namespace of the document is XUL - breakNode = document.createElementWithNameSpace("BR", "http://www.w3.org/TR/REC-html40"); - if (breakNode) - messageParent.appendChild(breakNode); - } - - // set a bold header message + // Let the caller use "\n" to cause breaks + // Translate these into
tags + var messageParent = (document.getElementById("info.txt")); + done = false; + while (!done) { + breakIndex = messageText.indexOf('\n'); + if (breakIndex == 0) { + // Ignore break at the first character + messageText = messageText.slice(1); + dump("Found break at begining\n"); + messageFragment = ""; + } else if (breakIndex > 0) { + // The fragment up to the break + messageFragment = messageText.slice(0, breakIndex); + + // Chop off fragment we just found from remaining string + messageText = messageText.slice(breakIndex+1); + } else { + // "\n" not found. We're done + done = true; + messageFragment = messageText; + } + messageNode = document.createTextNode(messageFragment); + if (messageNode) + messageParent.appendChild(messageNode); + + // This is needed when the default namespace of the document is XUL + breakNode = document.createElementWithNameSpace("BR", "http://www.w3.org/TR/REC-html40"); + if (breakNode) + messageParent.appendChild(breakNode); + } + } var msg = param.GetString( 3 ); +// dump("title message: "+ msg +"\n"); SetElementText("info.header", msg ); - // set the window title var windowTitle = param.GetString( 12 ); window.title = windowTitle; - // set the icon. hm.. this is potentially unskinnable. - var iconURL = param.GetString( 2 ); - // hack around the unskinnable code by looking into the url and attempting to get something meaningful from it: - var fileTag = iconURL.substring( ( iconURL.lastIndexOf("/") + 1 ), iconURL.lastIndexOf(".") ); // BAD BAD HACKERY EVIL ICK WRONG BAD - switch ( fileTag ) - { - case "alert-icon": - var iconClass = "alert-icon"; - break; - case "error-icon": - var iconClass = "error-icon"; - break; - case "question-icon": - var iconClass = "question-icon"; - break; - case "message-icon": - default: - var iconClass = "message-icon"; - break; - } - var element = document.getElementById("icon"); + var iconURL = param.GetString(2 ); + var element = document.getElementById("info.icon"); if( element ) - element.setAttribute( "class", iconClass ); - + element.src = iconURL; + else + dump("couldn't find icon element \n"); // Set button names var buttonText = param.GetString( 8 ); if ( buttonText != "" ) { +// dump( "Setting OK Button to "+buttonText+"\n"); var okButton = document.getElementById("ok"); okButton.setAttribute("value", buttonText); } @@ -86,92 +70,126 @@ function commonDialogOnLoad() buttonText = param.GetString( 9 ); if ( buttonText != "" ) { + +// dump( "Setting Cancel Button to"+buttonText+"\n"); var cancelButton = document.getElementById("cancel"); cancelButton.setAttribute( "value",buttonText); } // Adjust number buttons var numButtons = param.GetInt( 2 ); - if ( numButtons == 1 ) ; + if ( numButtons == 1 ) + { + + } switch ( numButtons ) { case 4: - var button = document.getElementById("Button3"); - button.setAttribute("style", "display:inline;"); - var buttonText = param.GetString( 11 ); - button.setAttribute( "value",buttonText); + { + var button = document.getElementById("Button3"); + button.setAttribute("style", "display:inline;"); + var buttonText = param.GetString( 11 ); + button.setAttribute( "value",buttonText); + } case 3: - var button = document.getElementById("Button2"); - button.setAttribute("style", "display:inline;"); - var buttonText = param.GetString( 10 ); - button.setAttribute( "value",buttonText); + { + var button = document.getElementById("Button2"); + button.setAttribute("style", "display:inline;"); + var buttonText = param.GetString( 10 ); + button.setAttribute( "value",buttonText); + } break; case 1: var element = document.getElementById("cancel"); if ( element ) + { + // dump( "hide button \n" ); element.setAttribute("style", "display:none;" ); + } + else + { + // dump( "couldn't find button \n"); + } break; - default: - break; } + + // Set the Checkbox +// dump(" set checkbox \n"); var checkMsg = param.GetString( 1 ); +// dump("check box msg is "+ checkMsg +"\n"); if ( checkMsg != "" ) { - var checkMsgElement = document.getElementById("checkboxLabel"); - SetElementText( "checkboxLabel", checkMsg ); + var prompt = (document.getElementById("checkboxLabel")); + if ( prompt ) + { + // dump(" setting message \n" ); + prompt.childNodes[1].nodeValue = checkMsg; + } var checkValue = param.GetInt( 1 ); var element=document.getElementById("checkbox" ); var checkbool = checkValue > 0 ? true : false; element.checked = checkbool; } - else { + else + { +// dump("not visibile \n"); var element = document.getElementById("checkboxLabel"); element.setAttribute("style","display: none;" ); } // handle the edit fields +// dump("set editfields \n"); var numEditfields = param.GetInt( 3 ); switch( numEditfields ) { case 2: var element = document.getElementById("dialog.password2"); element.value = param.GetString( 7 ); + var editMsg = param.GetString( 5 ); - if (editMsg) + if (editMsg) { SetElementText("password2.text", editMsg ); + } var editfield1Password = param.GetInt( 4 ); - if ( editfield1Password == 1 ) { + if ( editfield1Password == 1 ) + { var element = document.getElementById("dialog.password1"); element.value = param.GetString( 6 ); var editMsg1 = param.GetString( 4 ); - if (editMsg1) + if (editMsg1) { SetElementText("password1.text", editMsg1 ); + } +// dump("hiding loginEditField"); var element = document.getElementById("loginEditField"); element.setAttribute("style","display: none;" ); var element = document.getElementById("dialog.password1"); element.focus(); - } - else { + } + else + { var element = document.getElementById("dialog.loginname"); element.value = param.GetString( 6 ); var editMsg1 = param.GetString( 4 ); - if (editMsg1) + if (editMsg1) { SetElementText("login.text", editMsg1 ); + } +// dump("hiding password1EditField"); var element = document.getElementById("password1EditField"); element.setAttribute("style","display: none;" ); var element = document.getElementById("dialog.loginname"); element.focus(); - } + } break; case 1: var editfield1Password = param.GetInt( 4 ); - if ( editfield1Password == 1 ) { + if ( editfield1Password == 1 ) + { var element = document.getElementById("dialog.password1"); element.value = param.GetString( 6 ); @@ -182,38 +200,41 @@ function commonDialogOnLoad() // Now hide the meaningless text var element = document.getElementById("password1.text"); element.setAttribute("style", "display:none;" ); +// dump("hiding loginEditField and password2EditField"); var element = document.getElementById("loginEditField"); element.setAttribute("style","display: none;" ); var element = document.getElementById("password2EditField"); element.setAttribute("style","display: none;" ); var element = document.getElementById("dialog.password1"); +// dump("give keyboard focus to password edit field \n"); element.focus(); - } - else { + } + else + { var element = document.getElementById("dialog.loginname"); element.value = param.GetString( 6 ); var editMsg1 = param.GetString( 4 ); - if (editMsg1) + if (editMsg1) { SetElementText("login.text", editMsg1 ); + } // Now hide the meaningless text var element = document.getElementById("login.text"); element.setAttribute("style", "display:none;" ); +// dump("hiding password1EditField and password2EditField"); var element = document.getElementById("password1EditField"); element.setAttribute("style","display: none;" ); var element = document.getElementById("password2EditField"); element.setAttribute("style","display: none;" ); var element = document.getElementById("dialog.loginname"); +// dump("give keyboard focus to password edit field \n"); element.focus(); } break; case 0: - var element = document.getElementById("loginEditField"); - element.setAttribute("style", "display:none;" ); - var element = document.getElementById("password1EditField"); - element.setAttribute("style","display: none;" ); - var element = document.getElementById("password2EditField"); - element.setAttribute("style","display: none;" ); +// dump("hiding all editfields \n"); + var element = document.getElementById("editFields"); + element.setAttribute("style","display: none;" ); break; } @@ -230,56 +251,55 @@ function commonDialogOnLoad() function onCheckboxClick() { param.SetInt( 1, (param.GetInt( 1 ) ? 0 : 1 )); +// dump("setting checkbox to "+ element.checked+"\n"); } -// set the text on a text container function SetElementText( elementID, text ) { - var element = document.getElementById( elementID ); - while( element.hasChildNodes() ) - element.removeChild( element.firstChild ); - var text = document.createTextNode( text ); - element.appendChild( text ); +// dump("setting "+elementID+" to "+text +"\n"); + var element = document.getElementById(elementID); + if( element ) + element.childNodes[0].nodeValue = text; + else + dump("couldn't find element \n"); } -// set an attribute on an element -function SetElementAttribute( elementID, attribute, value ) -{ - var element = document.getElementById( elementID ); - element.setAttribute( attribute, value ); -} function commonDialogOnOK() { +// dump("commonDialogOnOK \n"); param.SetInt(0, 0 ); var element1, element2; var numEditfields = param.GetInt( 3 ); if (numEditfields == 2) { var editfield1Password = param.GetInt( 4 ); - if ( editfield1Password == 1 ) + if ( editfield1Password == 1 ) { element1 = document.getElementById("dialog.password1"); - else + } else { element1 = document.getElementById("dialog.loginname"); + } param.SetString( 6, element1.value ); element2 = document.getElementById("dialog.password2"); param.SetString( 7, element2.value ); - } - else if (numEditfields == 1) { +// dump(" login name - "+ element1.value+ "\n"); +// dump(" password - "+ element2.value+ "\n"); + } else if (numEditfields == 1) { var editfield1Password = param.GetInt( 4 ); if ( editfield1Password == 1 ) { element1 = document.getElementById("dialog.password1"); param.SetString( 6, element1.value ); - } - else { + } else { element1 = document.getElementById("dialog.loginname"); param.SetString( 6, element1.value ); } +// dump(" login name - "+ element2.value+ "\n"); } return true; } function commonDialogOnCancel() { +// dump("commonDialogOnCancel \n"); param.SetInt(0, 1 ); return true; } diff --git a/xpfe/global/resources/content/commonDialog.xul b/xpfe/global/resources/content/commonDialog.xul index 22a54f34de24..16a3866b9200 100644 --- a/xpfe/global/resources/content/commonDialog.xul +++ b/xpfe/global/resources/content/commonDialog.xul @@ -1,74 +1,56 @@ - - - + - + - - - - - - - - - - - - - &header.label; - - - - - &editfield0.label; - - - - - - - - &editfield2.label; - - - - - - - - &editfield2.label; - - - - - - - - - - - &checkbox.label; - - - - - + + + + + + + + &header.label; + + + + - + + + + &editfield0.label; + + + + + &editfield1.label; + + + + + &editfield2.label; + + + + + + + + &checkbox.label; +