diff --git a/mozilla/content/shared/public/nsXULAtomList.h b/mozilla/content/shared/public/nsXULAtomList.h index ca28a0401f7..9d5f02fe84e 100644 --- a/mozilla/content/shared/public/nsXULAtomList.h +++ b/mozilla/content/shared/public/nsXULAtomList.h @@ -205,7 +205,7 @@ XUL_ATOM(radio, "radio") XUL_ATOM(radiogroup, "radiogroup") XUL_ATOM(menulist, "menulist") XUL_ATOM(menubutton, "menubutton") -XUL_ATOM(textfield, "textfield") +XUL_ATOM(textbox, "textbox") XUL_ATOM(textarea, "textarea") XUL_ATOM(listbox, "listbox") XUL_ATOM(tooltip, "tooltip") diff --git a/mozilla/content/xul/content/src/nsXULAtomList.h b/mozilla/content/xul/content/src/nsXULAtomList.h new file mode 100644 index 00000000000..2ef3f2e4f8a --- /dev/null +++ b/mozilla/content/xul/content/src/nsXULAtomList.h @@ -0,0 +1,249 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1999 Netscape Communications Corporation. All + * Rights Reserved. + * + * Original Author: David W. Hyatt (hyatt@netscape.com) + * + * Contributor(s): + */ + +/****** + + This file contains the list of all XUL nsIAtoms and their values + + It is designed to be used as inline input to nsXULAtoms.cpp *only* + through the magic of C preprocessing. + + All entires must be enclosed in the macro XUL_ATOM which will have cruel + and unusual things done to it + + It is recommended (but not strictly necessary) to keep all entries + in alphabetical order + + The first argument to XUL_ATOM is the C++ identifier of the atom + The second argument is the string value of the atom + + ******/ + + +XUL_ATOM(button, "button") +XUL_ATOM(spinner, "spinner") +XUL_ATOM(scrollbar, "scrollbar") +XUL_ATOM(slider, "slider") +XUL_ATOM(palettename, "palettename") +XUL_ATOM(fontpicker, "fontpicker") +XUL_ATOM(text, "text") +XUL_ATOM(toolbar, "toolbar") +XUL_ATOM(toolbaritem, "toolbaritem") +XUL_ATOM(toolbox, "toolbox") +XUL_ATOM(image, "image") + + // The tree atoms +XUL_ATOM(tree, "tree") // The start of a tree view +XUL_ATOM(treecaption, "treecaption") // The caption of a tree view +XUL_ATOM(treehead, "treehead") // The header of the tree view +XUL_ATOM(treerow, "treerow") // A row in the tree view +XUL_ATOM(treerows, "treerows") // A row in the tree view +XUL_ATOM(treecell, "treecell") // An item in the tree view +XUL_ATOM(treeitem, "treeitem") // A cell in the tree view +XUL_ATOM(treechildren, "treechildren") // The children of an item in the tree view +XUL_ATOM(treeindentation, "treeindentation") // Specifies that the indentation for the level should occur here. +XUL_ATOM(allowevents, "allowevents") // Lets events be handled on the cell contents or in menus. +XUL_ATOM(treecol, "treecol") // A column in the tree view +XUL_ATOM(treecolgroup, "treecolgroup") // A column group in the tree view +XUL_ATOM(treecols, "treecols") // A column group in the tree view +XUL_ATOM(treefoot, "treefoot") // The footer of the tree view +XUL_ATOM(scrollbarlist, "scrollbarlist") // An atom for internal use by the tree view +XUL_ATOM(indent, "indent") // indicates that a cell should be indented +XUL_ATOM(outer, "outer") // indicates that a treechildren is the outermost rowgroup +XUL_ATOM(sizemode, "sizemode") // when set, measure strings to determine preferred width + +XUL_ATOM(open, "open") // Whether or not a menu, tree, etc. is open + +XUL_ATOM(outliner, "outliner") +XUL_ATOM(outlinerbody, "outlinerbody") +XUL_ATOM(outlinercol, "outlinercol") +XUL_ATOM(cycler, "cycler") +XUL_ATOM(primary, "primary") +XUL_ATOM(current, "current") +XUL_ATOM(mozoutlinerrow, ":-moz-outliner-row") +XUL_ATOM(mozoutlinercell, ":-moz-outliner-cell") +XUL_ATOM(mozoutlinercolumn, ":-moz-outliner-column") +XUL_ATOM(mozoutlinercelltext, ":-moz-outliner-cell-text") +XUL_ATOM(mozoutlinertwisty, ":-moz-outliner-twisty") +XUL_ATOM(mozoutlinerindentation, ":-moz-outliner-indentation") + +XUL_ATOM(menubar, "menubar") // An XP menu bar. +XUL_ATOM(menu, "menu") // Represents an XP menu +XUL_ATOM(menuitem, "menuitem") // Represents an XP menu item +XUL_ATOM(menupopup, "menupopup") // The XP menu's children. +XUL_ATOM(menutobedisplayed, "menutobedisplayed") // The menu is about to be displayed at the next sync w/ frame +XUL_ATOM(menuactive, "menuactive") // Whether or not a menu is active (without necessarily being open) +XUL_ATOM(accesskey, "accesskey") // The shortcut key for a menu or menu item +XUL_ATOM(acceltext, "acceltext") // Text to use for the accelerator +XUL_ATOM(popupset, "popupset") // Contains popup menus, context menus, and tooltips +XUL_ATOM(popup, "popup") // The popup for a context menu, popup menu, or tooltip +XUL_ATOM(menugenerated, "menugenerated") // Internal +XUL_ATOM(popupanchor, "popupanchor") // Anchor for popups +XUL_ATOM(popupalign, "popupalign") // Alignment for popups +XUL_ATOM(ignorekeys, "ignorekeys") // Alignment for popups +XUL_ATOM(sizetopopup, "sizetopopup") // Whether or not menus size to their popup children (used by menulists) + +XUL_ATOM(key, "key") // The key element / attribute +XUL_ATOM(keycode, "keycode") // The keycode attribute +XUL_ATOM(keytext, "keytext") // The keytext attribute +XUL_ATOM(modifiers, "modifiers") // The modifiers attribute +XUL_ATOM(broadcaster, "broadcaster") // A broadcaster +XUL_ATOM(observes, "observes") // The observes element +XUL_ATOM(templateAtom, "template") // A XUL template + +XUL_ATOM(progressbar, "progressbar") +XUL_ATOM(progresstext, "progresstext") +XUL_ATOM(crop, "crop") + +XUL_ATOM(mode, "mode") +XUL_ATOM(equalsize, "equalsize") +XUL_ATOM(box, "box") +XUL_ATOM(hbox, "hbox") +XUL_ATOM(vbox, "vbox") +XUL_ATOM(scrollbox, "scrollbox") +XUL_ATOM(mousethrough, "mousethrough") +XUL_ATOM(flex, "flex") +XUL_ATOM(spring, "spring") +XUL_ATOM(orient, "orient") +XUL_ATOM(autostretch, "autostretch") +XUL_ATOM(minwidth, "min-width") +XUL_ATOM(minheight, "min-height") + +XUL_ATOM(autorepeatbutton, "autorepeatbutton") + +XUL_ATOM(bulletinboard, "bulletinboard") + +XUL_ATOM(titledbox, "titledbox") +XUL_ATOM(title, "title") +XUL_ATOM(titledboxContentPseudo, ":titledbox-content") + +XUL_ATOM(stack, "stack") +XUL_ATOM(deck, "deck") +XUL_ATOM(tabcontrol, "tabcontrol") +XUL_ATOM(tab, "tab") +XUL_ATOM(tabpanel, "tabpanel") +XUL_ATOM(tabpage, "tabpage") +XUL_ATOM(tabbox, "tabbox") +XUL_ATOM(index, "index") +XUL_ATOM(maxpos, "maxpos") +XUL_ATOM(curpos, "curpos") +XUL_ATOM(scrollbarbutton, "scrollbarbutton") +XUL_ATOM(increment, "increment") +XUL_ATOM(pageincrement, "pageincrement") +XUL_ATOM(thumb, "thumb") +XUL_ATOM(toggled, "toggled") +XUL_ATOM(grippy, "grippy") +XUL_ATOM(splitter, "splitter") +XUL_ATOM(collapse, "collapse") +XUL_ATOM(collapsed, "collapsed") +XUL_ATOM(resizebefore, "resizebefore") +XUL_ATOM(resizeafter, "resizeafter") +XUL_ATOM(state, "state") +XUL_ATOM(debug, "debug") + +XUL_ATOM(fixed, "fixed") + +// grid +XUL_ATOM(grid, "grid") +XUL_ATOM(rows, "rows") +XUL_ATOM(columns, "columns") +XUL_ATOM(row, "row") +XUL_ATOM(column, "column") + +// toolbar & toolbar d&d atoms +XUL_ATOM(ddDropLocation, "dd-droplocation") +XUL_ATOM(ddDropLocationCoord, "dd-droplocationcoord") +XUL_ATOM(ddDropOn, "dd-dropon") +XUL_ATOM(ddTriggerRepaintSorted, "dd-triggerrepaintsorted") +XUL_ATOM(ddTriggerRepaintRestore, "dd-triggerrepaintrestore") +XUL_ATOM(ddTriggerRepaint, "dd-triggerrepaint") +XUL_ATOM(ddNoDropBetweenRows, "dd-nodropbetweenrows") +XUL_ATOM(container, "container") +XUL_ATOM(ddDragDropArea, "dragdroparea") +XUL_ATOM(ddDropMarker, ":-moz-drop-marker") + +XUL_ATOM(widget, "widget") +XUL_ATOM(window, "window") + +XUL_ATOM(iframe, "iframe") +XUL_ATOM(browser, "browser") +XUL_ATOM(editor, "editor") + +// + +XUL_ATOM(checkbox, "checkbox") +XUL_ATOM(radio, "radio") +XUL_ATOM(radiogroup, "radiogroup") +XUL_ATOM(menulist, "menulist") +XUL_ATOM(menubutton, "menubutton") +XUL_ATOM(textbox, "textbox") +XUL_ATOM(textarea, "textarea") +XUL_ATOM(listbox, "listbox") +XUL_ATOM(tooltip, "tooltip") +XUL_ATOM(context, "context") +XUL_ATOM(style, "style") +XUL_ATOM(selected, "selected") +XUL_ATOM(clazz, "class") +XUL_ATOM(id, "id") +XUL_ATOM(persist, "persist") +XUL_ATOM(ref, "ref") +XUL_ATOM(command, "command") +XUL_ATOM(value, "value") +XUL_ATOM(width, "width") +XUL_ATOM(height, "height") +XUL_ATOM(left, "left") +XUL_ATOM(top, "top") +XUL_ATOM(events, "events") +XUL_ATOM(targets, "targets") +XUL_ATOM(uri, "uri") +XUL_ATOM(empty, "empty") +XUL_ATOM(textnode, "textnode") +XUL_ATOM(rule, "rule") +XUL_ATOM(action, "action") +XUL_ATOM(containment, "containment") +XUL_ATOM(flags, "flags") +XUL_ATOM(Template, "template") +XUL_ATOM(member, "member") +XUL_ATOM(conditions, "conditions") +XUL_ATOM(property, "property") +XUL_ATOM(instanceOf, "instanceOf") +XUL_ATOM(xulcontentsgenerated, "xulcontentsgenerated") +XUL_ATOM(parent, "parent") +XUL_ATOM(iscontainer, "iscontainer") +XUL_ATOM(isempty, "isempty") +XUL_ATOM(bindings, "bindings") +XUL_ATOM(binding, "binding") +XUL_ATOM(triple, "triple") +XUL_ATOM(subject, "subject") +XUL_ATOM(predicate, "predicate") +XUL_ATOM(child, "child") +XUL_ATOM(object, "object") +XUL_ATOM(tag, "tag") +XUL_ATOM(content, "content") + +XUL_ATOM(blankrow, "blankrow") +XUL_ATOM(titlebar, "titlebar") +XUL_ATOM(resizer, "resizer") +XUL_ATOM(dir, "dir") + diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul index 6972950e9b1..fb0cbb6fea7 100644 --- a/mozilla/editor/ui/composer/content/editor.xul +++ b/mozilla/editor/ui/composer/content/editor.xul @@ -228,7 +228,7 @@ - diff --git a/mozilla/editor/ui/composer/content/pref-composer.js b/mozilla/editor/ui/composer/content/pref-composer.js index cda79d31b05..3f0fb1ede12 100644 --- a/mozilla/editor/ui/composer/content/pref-composer.js +++ b/mozilla/editor/ui/composer/content/pref-composer.js @@ -255,7 +255,7 @@ function ChooseImageFile() dialog.BackgroundImageInput.value = fileName; ValidateAndPreviewImage(true); } - SetTextfieldFocus(dialog.BackgroundImageInput); + SetTextboxFocus(dialog.BackgroundImageInput); } function ChangeBackgroundImage() @@ -283,7 +283,7 @@ function ValidateAndPreviewImage(ShowErrorMessage) backgroundImage = ""; if (ShowErrorMessage) { - SetTextfieldFocus(dialog.BackgroundImageInput); + SetTextboxFocus(dialog.BackgroundImageInput); // Tell user about bad image ShowInputErrorMessage(GetString("MissingImageError")); } diff --git a/mozilla/editor/ui/composer/content/pref-composer.xul b/mozilla/editor/ui/composer/content/pref-composer.xul index 14ae5c501e8..172d490e9fb 100644 --- a/mozilla/editor/ui/composer/content/pref-composer.xul +++ b/mozilla/editor/ui/composer/content/pref-composer.xul @@ -54,7 +54,7 @@ <box align="horizontal" valign="middle"> <text value="&documentsInMenu;"/> - <textfield + <textbox id="recentFiles" name="recent string" type="text" @@ -141,7 +141,7 @@ name = "autosave" prefattribute="checked" /> - <textfield + <textbox id="autoSaveAmount" name="time" type="text" @@ -169,7 +169,7 @@ prefindex = "0" prefstring = "editor.use_html_editor" /> - <textfield + <textbox name = "&chooseButton.label;" pref = "true" preftype = "string" @@ -192,7 +192,7 @@ prefstring ="editor.use_image_editor" /> - <textfield + <textbox name="chooseButton.label" pref = "true" preftype = "string" diff --git a/mozilla/editor/ui/composer/content/pref-editing.xul b/mozilla/editor/ui/composer/content/pref-editing.xul index 0460edc3d25..94b9e36471d 100644 --- a/mozilla/editor/ui/composer/content/pref-editing.xul +++ b/mozilla/editor/ui/composer/content/pref-editing.xul @@ -48,7 +48,7 @@ <titledbox orient="vertical"> <title value="&authorName.label;"/> - <textfield id="editorAuthor" flex="1" + <textbox id="editorAuthor" flex="1" pref="true" preftype="string" prefstring="editor.author" prefattribute="value"/> </titledbox> @@ -158,7 +158,7 @@ <text class="label" value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/> <box valign="middle" autostretch="never"> - <textfield id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width : 16em"/> + <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width : 16em"/> <button class="dialog" value="&chooseFile.label;" accesskey="&chooseFile.accesskey;" oncommand="ChooseImageFile()"/> <data id="backgroundImageData" pref="true" preftype="string" prefstring="editor.default_background_image" prefattribute="value"/> diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js index 57c36318731..c4b653b65ec 100644 --- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js +++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js @@ -248,7 +248,7 @@ function doSelect(e) cell.setAttribute("class","FocusSelected"); input.setAttribute("class","FocusSelected"); - SetTextfieldFocus(input); + SetTextboxFocus(input); } } */ @@ -263,7 +263,7 @@ function AddTreeItem ( name, value, treekidsId, attArray, valueCaseFunc ) var attrcell = document.createElementNS ( XUL_NS, "treecell" ); attrcell.setAttribute( "class", "propertylist" ); attrcell.setAttribute( "value", name ); - // Modify treerow selection to better show focus in textfield + // Modify treerow selection to better show focus in textbox treeitem.setAttribute( "class", "ae-selection"); treerow.appendChild ( attrcell ); @@ -289,27 +289,27 @@ function CreateCellWithField( name, value ) if (!valCell) return null; valCell.setAttribute ( "class", "value propertylist" ); valCell.setAttribute ( "allowevents", "true" ); - var valField = document.createElementNS ( XUL_NS, "textfield" ); + var valField = document.createElementNS ( XUL_NS, "textbox" ); if ( name ) valField.setAttribute ( "id", name ); if (!valField) return null; if ( value ) valField.setAttribute ( "value", value ); valField.setAttribute ( "flex", "1" ); valField.setAttribute ( "class", "plain" ); - valField.setAttribute ( "onfocus", "SelectItemWithTextfield(\""+name+"\")"); + valField.setAttribute ( "onfocus", "SelectItemWithTextbox(\""+name+"\")"); valField.setAttribute ( "allowevents", "true"); valCell.appendChild ( valField ); return valCell; } -function SelectItemWithTextfield(id) +function SelectItemWithTextbox(id) { - var textfield = document.getElementById(id); - if (textfield) + var textbox = document.getElementById(id); + if (textbox) { - var treeItem = textfield.parentNode.parentNode.parentNode; + var treeItem = textbox.parentNode.parentNode.parentNode; if (treeItem) { - // Prevent SelectTreeItem() from setting selection to entire textfield + // Prevent SelectTreeItem() from setting selection to entire textbox gSelecting = true; treeItem.parentNode.parentNode.selectItem(treeItem); gSelecting = false; @@ -317,20 +317,20 @@ function SelectItemWithTextfield(id) } } -// When a "name" treecell is selected, shift focus to the textfield +// When a "name" treecell is selected, shift focus to the textbox function SelectTreeItem(tree) { - // Prevent infinite loop -- SetTextfieldFocusById triggers recursive call + // Prevent infinite loop -- SetTextboxFocusById triggers recursive call if (gSelecting) return; gSelecting = true; if (tree && tree.selectedItems && tree.selectedItems.length) { - // 2nd cell (value column) contains the textfield - var textfieldCell = tree.selectedItems[0].firstChild.firstChild.nextSibling; - if (textfieldCell) + // 2nd cell (value column) contains the textbox + var textboxCell = tree.selectedItems[0].firstChild.firstChild.nextSibling; + if (textboxCell) { // Select its contents and set focus - SetTextfieldFocusById(textfieldCell.firstChild.id); + SetTextboxFocusById(textboxCell.firstChild.id); } } gSelecting = false; diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul index 883cdd6b209..84e936a7cd1 100644 --- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul +++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul @@ -106,9 +106,9 @@ <title value="&AddHTMLAttributeLabel.label;"/> <box autostretch="never"> <text class="label" for="AddHTMLAttributeNameInput" value="&AttName.label;"/> - <textfield flex="1" id="AddHTMLAttributeNameInput" oninput="doHTMLEnabling()" onkeyup="if (event.keyCode == 13) onAddHTMLAttribute();"/> + <textbox flex="1" id="AddHTMLAttributeNameInput" oninput="doHTMLEnabling()" onkeyup="if (event.keyCode == 13) onAddHTMLAttribute();"/> <text class="label" for="AddHTMLAttributeValueInput" value="&AttValue.label;"/> - <textfield flex="1" id="AddHTMLAttributeValueInput" oninput="doHTMLEnabling()" onkeyup="if (event.keyCode == 13) onAddHTMLAttribute();"/> + <textbox flex="1" id="AddHTMLAttributeValueInput" oninput="doHTMLEnabling()" onkeyup="if (event.keyCode == 13) onAddHTMLAttribute();"/> <button class="dialog" id="AddHTMLAttribute" oncommand="onAddHTMLAttribute()" value="&AddAttributeButton.label;" disabled="true"/> </box> </titledbox> @@ -144,9 +144,9 @@ <title value="&AddCSSAttributeLabel.label;"/> <box autostretch="never"> <text class="label" for="AddCSSAttributeNameInput" value="&AttName.label;"/> - <textfield flex="1" id="AddCSSAttributeNameInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddCSSAttribute();"/> + <textbox flex="1" id="AddCSSAttributeNameInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddCSSAttribute();"/> <text class="label" for="AddCSSAttributeValueInput" value="&AttValue.label;"/> - <textfield flex="1" id="AddCSSAttributeValueInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddCSSAttribute();"/> + <textbox flex="1" id="AddCSSAttributeValueInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddCSSAttribute();"/> <button class="dialog" id="AddCSSAttribute" oncommand="onAddCSSAttribute()" value="&AddAttributeButton.label;" disabled="true"/> </box> </titledbox> @@ -182,9 +182,9 @@ <title value="&AddJSEAttributeLabel.label;"/> <box autostretch="never"> <text class="label" for="AddJSEAttributeNameInput" value="&AttName.label;"/> - <textfield flex="1" id="AddJSEAttributeNameInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/> + <textbox flex="1" id="AddJSEAttributeNameInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/> <text class="label" for="AddJSEAttributeValueInput" value="&AttValue.label;"/> - <textfield flex="1" id="AddJSEAttributeValueInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/> + <textbox flex="1" id="AddJSEAttributeValueInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/> <button class="dialog" id="AddJSEAttribute" oncommand="onAddJSEAttribute()" value="&AddAttributeButton.label;" disabled="true"/> </box> </titledbox> diff --git a/mozilla/editor/ui/dialogs/content/EdColorPicker.js b/mozilla/editor/ui/dialogs/content/EdColorPicker.js index 680a8023b96..41b00a4d70b 100644 --- a/mozilla/editor/ui/dialogs/content/EdColorPicker.js +++ b/mozilla/editor/ui/dialogs/content/EdColorPicker.js @@ -142,7 +142,7 @@ function Startup() document.getElementById("DefaultColorButton").setAttribute("collapsed","true"); } - SetTextfieldFocus(dialog.ColorInput); + SetTextboxFocus(dialog.ColorInput); SetWindowLocation(); } @@ -231,7 +231,7 @@ function ValidateData() if (NoDefault && !color) { ShowInputErrorMessage(GetString("NoColorError")); - SetTextfieldFocus(dialog.ColorInput); + SetTextboxFocus(dialog.ColorInput); return false; } return true; diff --git a/mozilla/editor/ui/dialogs/content/EdColorPicker.xul b/mozilla/editor/ui/dialogs/content/EdColorPicker.xul index dc94dca0623..4b886a0c6ee 100644 --- a/mozilla/editor/ui/dialogs/content/EdColorPicker.xul +++ b/mozilla/editor/ui/dialogs/content/EdColorPicker.xul @@ -82,7 +82,7 @@ <text class="label" value="&setColor2.label;"/> <text class="label" value="&setColorExample.label;"/> <box valign="middle" autostretch="never" flex="1="> - <textfield id="ColorInput" style="width: 8em" oninput="SetColorSwatch()"/> + <textbox id="ColorInput" style="width: 8em" oninput="SetColorSwatch()"/> <spring flex="1"/> <spring id="ColorPickerSwatch"/> <spring flex="1"/> diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.js b/mozilla/editor/ui/dialogs/content/EdColorProps.js index a4497564ba1..305031463cd 100644 --- a/mozilla/editor/ui/dialogs/content/EdColorProps.js +++ b/mozilla/editor/ui/dialogs/content/EdColorProps.js @@ -327,7 +327,7 @@ function chooseFile() dialog.BackgroundImageInput.value = fileName; ValidateAndPreviewImage(true); } - SetTextfieldFocus(dialog.BackgroundImageInput); + SetTextboxFocus(dialog.BackgroundImageInput); } function ChangeBackgroundImage() @@ -356,7 +356,7 @@ function ValidateAndPreviewImage(ShowErrorMessage) backgroundImage = null; if (ShowErrorMessage) { - SetTextfieldFocus(dialog.BackgroundImageInput); + SetTextboxFocus(dialog.BackgroundImageInput); // Tell user about bad image ShowInputErrorMessage(GetString("MissingImageError")); } diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.xul b/mozilla/editor/ui/dialogs/content/EdColorProps.xul index f1f19866f1c..4ac3f836723 100644 --- a/mozilla/editor/ui/dialogs/content/EdColorProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdColorProps.xul @@ -141,7 +141,7 @@ <columns><column/><column flex="1"/></columns> <rows> <row autostretch="never" valign="middle" style="margin-bottom: 5px"> - <textfield id="BackgroundImageInput" oninput="ChangeBackgroundImage()" + <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage()" tooltip="aTooltip" tooltiptext="&backgroundImage.tooltip;" style="min-width : 18em"/> <!-- from EdDialogOverlay.xul --> diff --git a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js index eb106d83fae..dac87fc9688 100644 --- a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js +++ b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js @@ -114,22 +114,22 @@ function ValidateNumberString(value, minValue, maxValue) return ""; } -function SetTextfieldFocusById(id) +function SetTextboxFocusById(id) { - SetTextfieldFocus(document.getElementById(id)); + SetTextboxFocus(document.getElementById(id)); } -function SetTextfieldFocus(textfield) +function SetTextboxFocus(textbox) { - if (textfield) + if (textbox) { // Select entire contents // This "fixes" bug 48400 temporarily by - // not calling "select" on empty textfields - if (textfield.value.length > 0) - textfield.select(); + // not calling "select" on empty textboxes + if (textbox.value.length > 0) + textbox.select(); - textfield.focus(); + textbox.focus(); } } diff --git a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js index 5833aba6f8a..ee574d263a2 100644 --- a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js +++ b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js @@ -41,7 +41,7 @@ function Startup() initDialog(); // SET FOCUS TO FIRST CONTROL - //SetTextfieldFocus(dialog.editBox); + //SetTextboxFocus(dialog.editBox); SetWindowLocation(); } diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.js b/mozilla/editor/ui/dialogs/content/EdDictionary.js index dd3b37b5654..f23fc41334a 100644 --- a/mozilla/editor/ui/dialogs/content/EdDictionary.js +++ b/mozilla/editor/ui/dialogs/content/EdDictionary.js @@ -49,7 +49,7 @@ function Startup() // Select the supplied word if it is already in the list SelectWordToAddInList(); - SetTextfieldFocus(WordInput); + SetTextboxFocus(WordInput); SetWindowLocation(); } diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.xul b/mozilla/editor/ui/dialogs/content/EdDictionary.xul index af9e6e6504c..b35950cb6cf 100644 --- a/mozilla/editor/ui/dialogs/content/EdDictionary.xul +++ b/mozilla/editor/ui/dialogs/content/EdDictionary.xul @@ -50,7 +50,7 @@ <spring/> </row> <row> - <textfield id="WordInput" flex="1"/> + <textbox id="WordInput" flex="1"/> <button class="dialog" flex="1" id="AddWord" oncommand="AddWord()" value="&AddButton.label;"/> </row> <row> diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.js b/mozilla/editor/ui/dialogs/content/EdHLineProps.js index 35411f01c10..05f23cb3442 100644 --- a/mozilla/editor/ui/dialogs/content/EdHLineProps.js +++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.js @@ -63,7 +63,7 @@ function Startup() InitDialog() // SET FOCUS TO FIRST CONTROL - SetTextfieldFocus(dialog.widthInput); + SetTextboxFocus(dialog.widthInput); // Resize window window.sizeToContent(); diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul index 1dd64f9fa67..9aab4e49857 100644 --- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul @@ -54,13 +54,13 @@ <rows> <row valign="middle" autostretch="never"> <text class="label" value="&widthEditField.label;" /> - <textfield class="narrow" id="width" flex="1" oninput="forceInteger('width')"/> + <textbox class="narrow" id="width" flex="1" oninput="forceInteger('width')"/> <menulist id="pixelOrPercentMenulist" /> <!-- menupopup and menuitems added by JS --> </row> <row valign="middle" autostretch="never"> <text class="label" value="&heightEditField.label;" /> - <textfield class="narrow" id="height" oninput="forceInteger('height')"/> + <textbox class="narrow" id="height" oninput="forceInteger('height')"/> <text class="label" value="&pixelsPopup.value;" /> </row> </rows> diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js index f5c6844fdf5..b169d4472aa 100644 --- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js +++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js @@ -56,7 +56,7 @@ function Startup() } } - SetTextfieldFocus(dialog.urlInput); + SetTextboxFocus(dialog.urlInput); SetWindowLocation(); } @@ -87,5 +87,5 @@ function chooseFile() } // Put focus into the input field - SetTextfieldFocus(dialog.urlInput); -} \ No newline at end of file + SetTextboxFocus(dialog.urlInput); +} diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul index fc60973ea14..c9b220f40ab 100644 --- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul +++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul @@ -54,7 +54,7 @@ <row> <text class="label" for="urlInput" value="&urlFieldset.label;" align="right"/> - <textfield id="urlInput" class="MinWidth20em" value="http://"/> + <textbox id="urlInput" class="MinWidth20em" value="http://"/> <button class="dialog" id="Browse" oncommand="chooseFile()" value="&browseButton.label;"/> </row> @@ -62,7 +62,7 @@ <row> <text class="label" for="altInput" value="&altFieldset.label;" align="right"/> - <textfield class="MinWidth20em" id="altInput"/> + <textbox class="MinWidth20em" id="altInput"/> </row> </rows> </grid> @@ -77,7 +77,7 @@ <text class="label" for="targetInput" value="&target.label;" align="right" /> </row> <row> - <textfield class="MinWidth20em" id="targetInput"/> + <textbox class="MinWidth20em" id="targetInput"/> <text class="label" id="commonLabel" value="&commonFieldset.label;"/> diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.js b/mozilla/editor/ui/dialogs/content/EdImageProps.js index a161cfbf52a..66cc886a23a 100644 --- a/mozilla/editor/ui/dialogs/content/EdImageProps.js +++ b/mozilla/editor/ui/dialogs/content/EdImageProps.js @@ -174,7 +174,7 @@ function Startup() // Initialize widgets with image attributes in the case where the entire dialog isn't visible onMoreFewerImage(); // this call will initialize all widgets if entire dialog is visible - SetTextfieldFocus(dialog.srcInput); + SetTextboxFocus(dialog.srcInput); SetWindowLocation(); } @@ -257,7 +257,7 @@ function chooseFile() } GetImageFromURL(); // Put focus into the input field - SetTextfieldFocus(dialog.srcInput); + SetTextboxFocus(dialog.srcInput); } function GetImageFromURL() @@ -403,7 +403,7 @@ function onMoreFewerImage() // Show the "Advanced Edit" button on same line as "More Properties" dialog.AdvancedEditButton.setAttribute("collapsed","false"); dialog.AdvancedEditButton2.setAttribute("collapsed","true"); - // Weird caret appearing when we collapse, so force focus to URL textfield + // Weird caret appearing when we collapse, so force focus to URL textbox dialog.srcInput.focus(); } else @@ -573,7 +573,7 @@ function ValidateData() if (doAltTextError && !alt) { ShowInputErrorMessage(GetString("NoAltText")); - SetTextfieldFocus(dialog.altTextInput); + SetTextboxFocus(dialog.altTextInput); doAltTextError = false; return false; } @@ -600,7 +600,7 @@ function ValidateData() { if ( !SeeMore ) onMoreFewerImage(); - SetTextfieldFocus(dialog.widthInput); + SetTextboxFocus(dialog.widthInput); return false; } if (isPercentWidth) @@ -612,7 +612,7 @@ function ValidateData() { if ( !SeeMore ) onMoreFewerImage(); - SetTextfieldFocus(dialog.heightInput); + SetTextboxFocus(dialog.heightInput); return false; } if (isPercentHeight) diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul index 9841aea28c9..ecbf9e607c7 100644 --- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul @@ -65,7 +65,7 @@ value = "&locationEditField.label;" tooltip="aTooltip" tooltiptext="&locationEditField.tooltip;" /> - <textfield + <textbox id = "srcInput" oninput = "doOverallEnabling()" onmouseup = "doOverallEnabling()" @@ -80,7 +80,7 @@ for = "altTextInput" tooltip = "aTooltip" tooltiptext="&altTextEditField.tooltip;" value = "&altTextEditField.label;" /> - <textfield + <textbox id ="altTextInput" style = "min-width : 20em"/> <spring/> <!-- placeholder for 3rd column --> @@ -168,7 +168,7 @@ id = "widthLabel" for = "widthInput" value = "&widthEditField.label;" /> - <textfield + <textbox id = "widthInput" class = "narrow" onfocus = "oldSourceInt = this.value;" @@ -183,7 +183,7 @@ id = "heightLabel" for = "heightInput" value = "&heightEditField.label;" /> - <textfield + <textbox id = "heightInput" class = "narrow" onfocus = "oldSourceInt = this.value;" @@ -246,7 +246,7 @@ class = "label align-right" id = "leftrightLabel" value = "&leftRightEditField.label;"/> - <textfield + <textbox class = "narrow" id = "imageleftrightInput" oninput = "forceInteger(this.id)"/> @@ -260,7 +260,7 @@ class = "label align-right" id = "topbottomLabel" value = "&topBottomEditField.label;"/> - <textfield + <textbox class = "narrow" id = "imagetopbottomInput" oninput = "forceInteger(this.id)"/> @@ -273,7 +273,7 @@ <text class = "label align-right" id = "borderLabel" value = "&borderEditField.label;"/> - <textfield + <textbox class = "narrow" id = "border" oninput = "forceInteger(this.id)"/> diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.js b/mozilla/editor/ui/dialogs/content/EdInsSrc.js index 4b44106f6e2..487f8b26846 100644 --- a/mozilla/editor/ui/dialogs/content/EdInsSrc.js +++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.js @@ -45,7 +45,7 @@ function Startup() // Set initial focus srcInput.focus(); - // Note: We can't set the caret location in a multiline textfield + // Note: We can't set the caret location in a multiline textbox SetWindowLocation(); } diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul index 11f6b1ee248..993635dfbef 100644 --- a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul +++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul @@ -47,7 +47,7 @@ <text class="label" id="srcMessage" value="&sourceEditField.label;"/> <box orient="vertical" flex="1" style="width: 30em; height: 20em;"> - <textfield id="srcInput" multiline="true" rows="1" style="width: 1em" flex="1"/> + <textbox id="srcInput" multiline="true" rows="1" style="width: 1em" flex="1"/> </box> <!-- Will this accept the embedded HTML tags? --> <box> diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.js b/mozilla/editor/ui/dialogs/content/EdInsertTable.js index fc5bc2cc917..55ef0a3fbc5 100644 --- a/mozilla/editor/ui/dialogs/content/EdInsertTable.js +++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.js @@ -78,7 +78,7 @@ function Startup() // Resize window window.sizeToContent(); - SetTextfieldFocus(dialog.rowsInput); + SetTextboxFocus(dialog.rowsInput); SetWindowLocation(); } @@ -124,7 +124,7 @@ function ValidateData() if (columns == "") { // Set focus to the offending control - SetTextfieldFocus(dialog.columnsInput); + SetTextboxFocus(dialog.columnsInput); return false; } diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul index c595321776c..f49694794f1 100644 --- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul +++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul @@ -54,17 +54,17 @@ <rows> <row valign="middle" text-align="right" autostretch="never"> <text class="label align-right" text-align="right" value="&numRowsEditField.label;" /> - <textfield class="narrow" id="rowsInput" oninput="ChangeRowOrColumn(this.id)" /> + <textbox class="narrow" id="rowsInput" oninput="ChangeRowOrColumn(this.id)" /> <spring/> </row> <row valign="middle" text-align="right" autostretch="never"> <text class="label align-right" value="&numColumnsEditField.label;" /> - <textfield class="narrow" id="columnsInput" oninput="ChangeRowOrColumn(this.id)" /> + <textbox class="narrow" id="columnsInput" oninput="ChangeRowOrColumn(this.id)" /> <spring/> </row> <row valign="middle" text-align="right" autostretch="never"> <text class="label align-right" value="&widthEditField.label;" /> - <textfield class="narrow" id="widthInput" oninput="forceInteger(this.id)" /> + <textbox class="narrow" id="widthInput" oninput="forceInteger(this.id)" /> <menulist id="widthPixelOrPercentMenulist"><menupopup/></menulist> <!-- child elements are appended by JS --> </row> @@ -76,7 +76,7 @@ <box> <text class="label align-right" text-align="right" value="&borderEditField.label;" tooltip="aTooltip" tooltiptext="&borderEditField.tooltip;" /> - <textfield class="narrow" id="borderInput" oninput="forceInteger(this.id)" /> + <textbox class="narrow" id="borderInput" oninput="forceInteger(this.id)" /> <text class="label" value="&pixels.label;"/> </box> <!-- from EdDialogOverlay --> diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.js b/mozilla/editor/ui/dialogs/content/EdLinkProps.js index a53cd9142b0..7db2c400727 100644 --- a/mozilla/editor/ui/dialogs/content/EdLinkProps.js +++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.js @@ -206,9 +206,9 @@ function Startup() // Set initial focus if (insertLinkAtCaret) { // We will be using the HREF inputbox, so text message - SetTextfieldFocus(dialog.linkTextInput); + SetTextboxFocus(dialog.linkTextInput); } else { - SetTextfieldFocus(dialog.hrefInput); + SetTextboxFocus(dialog.hrefInput); // We will not insert a new link at caret, so remove link text input field dialog.linkTextInput.setAttribute("hidden","true"); @@ -243,7 +243,7 @@ function chooseFile() ChangeText(); } // Put focus into the input field - SetTextfieldFocus(dialog.hrefInput); + SetTextboxFocus(dialog.hrefInput); } function FillListboxes() @@ -430,7 +430,7 @@ function ValidateData() if (newLinkText.length == 0) { ShowInputErrorMessage(GetString("EmptyLinkTextError")); - SetTextfieldFocus(dialog.linkTextInput); + SetTextboxFocus(dialog.linkTextInput); return false; } } diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul index b02c165771d..2d5dec25806 100644 --- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul @@ -48,13 +48,13 @@ <box orient="vertical" style="min-width: 20em"> <titledbox orient="vertical"><title id="linkTextCaption" align="left"/> <text class="label" id="linkTextMessage"/> - <textfield id="linkTextInput" flex="1" oninput="ChangeText()"/> + <textbox id="linkTextInput" flex="1" oninput="ChangeText()"/> </titledbox> <titledbox orient="vertical"><title value="&LinkURLBox.label;"/> <text class="label" value="&LinkURLEditField.label;"/> <box autostretch="never" valign="middle"> - <textfield id="hrefInput" flex="1" style="min-width: 18em" oninput="ChangeLocation()"/> + <textbox id="hrefInput" flex="1" style="min-width: 18em" oninput="ChangeLocation()"/> <button class="dialog" id="ChooseFile" flex="1"/> </box> <html class="wrap" flex="1" id="RemoveLinkMsg" style="margin-bottom: 7px">&RemoveLinkMsg.label;</html> diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.js b/mozilla/editor/ui/dialogs/content/EdListProps.js index b4bec9e2966..d52f3f467eb 100644 --- a/mozilla/editor/ui/dialogs/content/EdListProps.js +++ b/mozilla/editor/ui/dialogs/content/EdListProps.js @@ -209,7 +209,7 @@ function SelectListType() break; case 2: NewType = "ol"; - SetTextfieldFocus(dialog.StartingNumberInput); + SetTextboxFocus(dialog.StartingNumberInput); break; case 3: NewType = "dl"; @@ -242,7 +242,7 @@ function SelectBulletStyle() if (NumberStyleIndex != index) { NumberStyleIndex = index; - SetTextfieldFocus(dialog.StartingNumberInput); + SetTextboxFocus(dialog.StartingNumberInput); } } } diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.xul b/mozilla/editor/ui/dialogs/content/EdListProps.xul index 8cafd0c298a..e988e1fb273 100644 --- a/mozilla/editor/ui/dialogs/content/EdListProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdListProps.xul @@ -67,7 +67,7 @@ <spring class="spacer"/> <box> <text class="label" id="StartingNumberLabel" value="&startingNumber.label;"/> - <textfield class="narrow" id="StartingNumber" oninput="forceInteger(this.id)"/> + <textbox class="narrow" id="StartingNumber" oninput="forceInteger(this.id)"/> <spring/> </box> <html id="StartExample" class="wrap" flex="1" style="width: 1em">&startingHelp.label;</html> diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js index 17137f5ac96..39cc2cbddb2 100644 --- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js +++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js @@ -74,7 +74,7 @@ function Startup() InitDialog(); - SetTextfieldFocus(nameInput); + SetTextboxFocus(nameInput); SetWindowLocation(); } @@ -114,7 +114,7 @@ function ValidateData() if (!name) { ShowInputErrorMessage(GetString("MissingAnchorNameError")); - SetTextfieldFocus(nameInput); + SetTextboxFocus(nameInput); return false; } else { // Replace spaces with "_" and strip other characters @@ -125,7 +125,7 @@ function ValidateData() if (originalName != name && AnchorNameExists(name)) { ShowInputErrorMessage(GetString("DuplicateAnchorNameError").replace(/%name%/,name)); - SetTextfieldFocus(nameInput); + SetTextboxFocus(nameInput); return false; } globalElement.setAttribute("name",name); diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul index 76972874c32..b27ef02b103 100644 --- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul @@ -48,7 +48,7 @@ <popupset id="aTooltipSet" /> <text class="label" align="left" for="nameInput" value="&anchorNameEditField.label;"/> - <textfield class="MinWidth20em" id="nameInput" oninput="ChangeName()" + <textbox class="MinWidth20em" id="nameInput" oninput="ChangeName()" tooltip="aTooltip" tooltiptext="&nameInput.tooltip;"/> <spring class="spacer"/> <!-- from EdDialogOverlay --> diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.js b/mozilla/editor/ui/dialogs/content/EdPageProps.js index 5399c1bfdd7..ff7993ca544 100644 --- a/mozilla/editor/ui/dialogs/content/EdPageProps.js +++ b/mozilla/editor/ui/dialogs/content/EdPageProps.js @@ -92,7 +92,7 @@ dump(", lastmod date="+lastmoddate+"\n"); InitDialog(); - SetTextfieldFocus(dialog.TitleInput); + SetTextboxFocus(dialog.TitleInput); SetWindowLocation(); } @@ -112,7 +112,7 @@ function InitDialog() dialog.DescriptionInput.value = descriptionElement.getAttribute("content"); } -function TextfieldChanged(ID) +function TextboxChanged(ID) { switch(ID) { diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.xul b/mozilla/editor/ui/dialogs/content/EdPageProps.xul index cb014f48836..29918defbed 100644 --- a/mozilla/editor/ui/dialogs/content/EdPageProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdPageProps.xul @@ -58,15 +58,15 @@ <spring class="spacer"/> <row valign="middle"> <text class="label" value="&titleInput.label;"/> - <textfield class="MinWidth20em" id="TitleInput" oninput="TextfieldChanged(this.id)"/> + <textbox class="MinWidth20em" id="TitleInput" oninput="TextboxChanged(this.id)"/> </row> <row valign="middle"> <text class="label" value="&authorInput.label;"/> - <textfield class="MinWidth20em" id="AuthorInput" oninput="TextfieldChanged(this.id)"/> + <textbox class="MinWidth20em" id="AuthorInput" oninput="TextboxChanged(this.id)"/> </row> <row valign="middle"> <text class="label" value="&descriptionInput.label;"/> - <textfield class="MinWidth20em" id="DescriptionInput" oninput="TextfieldChanged(this.id)"/> + <textbox class="MinWidth20em" id="DescriptionInput" oninput="TextboxChanged(this.id)"/> </row> </rows> </grid> diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js index 7cd915fa9df..9cffec0c463 100644 --- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js +++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js @@ -248,7 +248,7 @@ function SetWidgetsForMisspelledWord() DoEnabling(); if (MisspelledWord) - SetTextfieldFocus(dialog.ReplaceWordInput); + SetTextboxFocus(dialog.ReplaceWordInput); } function CheckWord() diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul index 47ab0cd7364..73f218fc221 100644 --- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul +++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul @@ -57,7 +57,7 @@ <row valign="middle" autostretch="never"> <text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/> <box valign="middle" autostretch="never"> - <textfield id="ReplaceWord" oninput="ChangeReplaceWord()" style="width: 14em"/> + <textbox id="ReplaceWord" oninput="ChangeReplaceWord()" style="width: 14em"/> <button id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/> </box> </row> diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.js b/mozilla/editor/ui/dialogs/content/EdTableProps.js index d919599b7b9..f92c1f2baa7 100644 --- a/mozilla/editor/ui/dialogs/content/EdTableProps.js +++ b/mozilla/editor/ui/dialogs/content/EdTableProps.js @@ -237,7 +237,7 @@ function Startup() dialog.NextButton.setAttribute("disabled", "true"); } - // User can change these via textfields + // User can change these via textboxes newRowCount = rowCount; newColCount = colCount; @@ -254,7 +254,7 @@ function Startup() if (currentPanel == CellPanel) dialog.SelectionList.focus(); else - SetTextfieldFocus(dialog.TableRowsInput); + SetTextboxFocus(dialog.TableRowsInput); SetWindowLocation(); } @@ -550,7 +550,7 @@ function ChangeSelection(newType) DoCellSelection(); SetSelectionButtons(); - // Enable/Disable appropriate span textfields + // Enable/Disable appropriate span textboxes SetSpanEnable(); // Note: globalCellElement should still be a clone of CellElement @@ -814,7 +814,7 @@ function ValidateNumber(inputWidgetID, listWidget, minVal, maxVal, element, attN SwitchPanel(validatePanel); // Error - shift to offending input widget - SetTextfieldFocus(inputWidget); + SetTextboxFocus(inputWidget); error = true; } else @@ -968,16 +968,16 @@ function ValidateData() return true; } -function ChangeCellTextfield(textfieldID) +function ChangeCellTextbox(textboxID) { // Filter input for just integers - forceInteger(textfieldID); + forceInteger(textboxID); if (currentPanel == CellPanel) CellDataChanged = true; } -// Call this when a textfield or menulist is changed +// Call this when a textbox or menulist is changed // so the checkbox is automatically set function SetCheckbox(checkboxID) { @@ -989,10 +989,10 @@ function SetCheckbox(checkboxID) CellDataChanged = true; } -function ChangeIntTextfield(textfieldID, checkboxID) +function ChangeIntTextbox(textboxID, checkboxID) { // Filter input for just integers - forceInteger(textfieldID); + forceInteger(textboxID); // Set associated checkbox SetCheckbox(checkboxID); diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul index 7bf81f7e28f..253ee9c595b 100644 --- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul +++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul @@ -61,11 +61,11 @@ <rows> <row valign="middle"> <text class="label" value="&tableRows.label;"/> - <textfield class="narrow" id="TableRowsInput" oninput="forceInteger(this.id);"/> + <textbox class="narrow" id="TableRowsInput" oninput="forceInteger(this.id);"/> </row> <row valign="middle"> <text class="label" value="&tableColumns.label;"/> - <textfield class="narrow" id="TableColumnsInput" oninput="forceInteger(this.id);"/> + <textbox class="narrow" id="TableColumnsInput" oninput="forceInteger(this.id);"/> </row> </rows> </grid> @@ -75,7 +75,7 @@ <rows> <row valign="middle"> <text class="label" value="&tableWidth.label;"/> - <textfield class="narrow" id="TableWidthInput" oninput="forceInteger(this.id);"/> + <textbox class="narrow" id="TableWidthInput" oninput="forceInteger(this.id);"/> <menulist id="TableWidthUnits"/> </row> </rows> @@ -87,17 +87,17 @@ <rows> <row valign="middle"> <text class="label" value="&tableBorderWidth.label;"/> - <textfield class="narrow" id="BorderWidthInput" oninput="forceInteger(this.id);"/> + <textbox class="narrow" id="BorderWidthInput" oninput="forceInteger(this.id);"/> <text class="label" align="left" value="&pixels.label;"/> </row> <row valign="middle"> <text class="label" value="&tableSpacing.label;"/> - <textfield class="narrow" id="SpacingInput" oninput="forceInteger(this.id);"/> + <textbox class="narrow" id="SpacingInput" oninput="forceInteger(this.id);"/> <text class="label" value="&tablePxBetwCells.label;"/> </row> <row valign="middle" autostretch="never"> <text class="label" value="&tablePadding.label;"/> - <textfield class="narrow" id="PaddingInput" oninput="forceInteger(this.id);"/> + <textbox class="narrow" id="PaddingInput" oninput="forceInteger(this.id);"/> <text class="label" value="&tablePxBetwBrdrCellContent.label;"/> </row> </rows> @@ -178,12 +178,14 @@ <rows> <row valign="middle" autostretch="never"> <checkbox id="CellHeightCheckbox" value="&tableHeight.label;"/> - <textfield class="narrow" id="CellHeightInput" oninput="ChangeIntTextfield(this.id,'CellHeightCheckbox');"/> + <textbox class="narrow" id="CellHeightInput" + oninput="ChangeIntTextbox(this.id,'CellHeightCheckbox');"/> <menulist id="CellHeightUnits" oncommand="SetCheckbox('CellHeightCheckbox');"/> </row> <row valign="middle" autostretch="never"> <checkbox id="CellWidthCheckbox" value="&tableWidth.label;"/> - <textfield class="narrow" id="CellWidthInput" oninput="ChangeIntTextfield(this.id,'CellWidthCheckbox');"/> + <textbox class="narrow" id="CellWidthInput" + oninput="ChangeIntTextbox(this.id,'CellWidthCheckbox');"/> <menulist id="CellWidthUnits" oncommand="SetCheckbox('CellWidthCheckbox');"/> </row> </rows> @@ -194,11 +196,13 @@ <rows> <row valign="middle" autostretch="never"> <checkbox id="RowSpanCheckbox" value="&cellRowSpan.label;"/> - <textfield class="narrow" id="RowSpanInput" oninput="ChangeIntTextfield(this.id,'RowSpanCheckbox');"/> + <textbox class="narrow" id="RowSpanInput" + oninput="ChangeIntTextbox(this.id,'RowSpanCheckbox');"/> </row> <row valign="middle" autostretch="never"> <checkbox id="ColSpanCheckbox" value="&cellColSpan.label;"/> - <textfield class="narrow" id="ColSpanInput" oninput="ChangeIntTextfield(this.id,'ColSpanCheckbox');"/> + <textbox class="narrow" id="ColSpanInput" + oninput="ChangeIntTextbox(this.id,'ColSpanCheckbox');"/> </row> </rows> </grid> diff --git a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js index fc1aaf49f3f..80abfbc5b24 100644 --- a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js +++ b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js @@ -69,7 +69,7 @@ function Startup() helpTextParent.appendChild(helpText); // SET FOCUS TO FIRST CONTROL - SetTextfieldFocus(dialog.TitleInput); + SetTextboxFocus(dialog.TitleInput); LoadAvailableCharSets(); initDone = true; diff --git a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul index 002a69827d2..e0f452fed28 100644 --- a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul +++ b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul @@ -51,7 +51,7 @@ <titledbox orient="vertical"><title align="left" value="&documentTitleTitle.label;"/> <!-- Text labels filled in from editor.properties --> <text id="EnterTitleLabel" class="label"/> - <textfield id="TitleInput" flex="1" oninput="TitleChanged();"/> + <textbox id="TitleInput" flex="1" oninput="TitleChanged();"/> <html id="TitleHelp" class="label wrap" style="width:1em" flex="1"/> </titledbox> diff --git a/mozilla/embedding/browser/chrome/content/mini-nav.xul b/mozilla/embedding/browser/chrome/content/mini-nav.xul index 005156e1842..d2b683cb100 100644 --- a/mozilla/embedding/browser/chrome/content/mini-nav.xul +++ b/mozilla/embedding/browser/chrome/content/mini-nav.xul @@ -77,7 +77,7 @@ Contributor(s): ______________________________________. --> <button id="stop-button" crop="right" onclick="BrowserStop()" value="&stopButton.label;"/> <box class="box-toolbar-group" flex="1"> <box autostretch="never" valign="middle" flex="1"> - <textfield autocomplete="true" timeout="300" + <textbox autocomplete="true" timeout="300" searchSessionType="urlbar" id="urlbar" onkeypress="if( event.keyCode == 13 ) { BrowserLoadURL(); }"/> </box> diff --git a/mozilla/extensions/inspector/resources/content/extensions/treeEditable.xml b/mozilla/extensions/inspector/resources/content/extensions/treeEditable.xml index 9d761bbeeab..6901352851f 100644 --- a/mozilla/extensions/inspector/resources/content/extensions/treeEditable.xml +++ b/mozilla/extensions/inspector/resources/content/extensions/treeEditable.xml @@ -63,7 +63,7 @@ this.mEditingItem = item; editor.focus(); - // if it proves to be a textfield... select it's text + // if it proves to be a textbox... select it's text if (editor.select) editor.select(); ]]></body> </method> @@ -86,7 +86,7 @@ <method name="createDefaultEditor"> <body><![CDATA[ - var el = document.createElement("textfield"); + var el = document.createElement("textbox"); return el; ]]></body> </method> @@ -157,4 +157,4 @@ </handlers> </binding> -</bindings> \ No newline at end of file +</bindings> diff --git a/mozilla/extensions/inspector/resources/content/jsutil/xul/inFormManager.js b/mozilla/extensions/inspector/resources/content/jsutil/xul/inFormManager.js index 5c8279b6cee..371cdc2ca98 100644 --- a/mozilla/extensions/inspector/resources/content/jsutil/xul/inFormManager.js +++ b/mozilla/extensions/inspector/resources/content/jsutil/xul/inFormManager.js @@ -2,7 +2,7 @@ * inFormManager ------------------------------------------------- * Manages the reading and writing of forms via simple maps of * attribute/value pairs. A "form" is simply a XUL window which -* contains "form widgets" such as textfields and menulists. +* contains "form widgets" such as textboxes and menulists. * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * REQUIRED IMPORTS: ****************************************************************/ @@ -54,7 +54,7 @@ var inFormManager = } }, - read_textfield: function(aEl) + read_textbox: function(aEl) { return aEl.value; }, @@ -79,7 +79,7 @@ var inFormManager = return aEl.getAttribute("color"); }, - write_textfield: function(aEl, aValue) + write_textbox: function(aEl, aValue) { aEl.setAttribute("value", aValue); }, diff --git a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul index 655cc1c6d70..b4f85391bda 100644 --- a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul +++ b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul @@ -50,7 +50,7 @@ <row autostretch="never"> <text value="Border Width"/> <box autostretch="never"> - <textfield id="txfElBorderWidth" style="width: 4em" + <textbox id="txfElBorderWidth" style="width: 4em" pref="true" preftype="int" prefstring="inspector.blink.border-width" prefattribute="value"/> <text value="(px)"/> </box> @@ -58,7 +58,7 @@ <row autostretch="never"> <text value="Blink Duration"/> <box autostretch="never"> - <textfield id="txfElDuration" style="width: 4em" + <textbox id="txfElDuration" style="width: 4em" pref="true" preftype="int" prefstring="inspector.blink.duration" prefattribute="value"/> <text value="(s)"/> </box> @@ -66,7 +66,7 @@ <row autostretch="never"> <text value="Blink Speed"/> <box autostretch="never"> - <textfield id="txfElSpeed" style="width: 4em" + <textbox id="txfElSpeed" style="width: 4em" pref="true" preftype="int" prefstring="inspector.blink.speed" prefattribute="value"/> <text value="(ms)"/> </box> diff --git a/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul b/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul index afbf2d8954a..4b71bcad58a 100644 --- a/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul +++ b/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul @@ -20,11 +20,11 @@ <box orient="vertical"> <box autostretch="never"> <text id="txSearchFor" value="&txSearchFor.label;"/> - <textfield id="txfSearchFor" style="width: 25em;" persist="true"/> + <textbox id="txfSearchFor" style="width: 25em;" persist="true"/> </box> <box autostretch="never"> <text id="txSearchPath" value="&txSearchPath.label;"/> - <textfield id="txfSearchPath" style="width: 25em;" persist="true"/> + <textbox id="txfSearchPath" style="width: 25em;" persist="true"/> <button id="btnSearchPathBrowser" value="Browse" onclick="dialog.browse()" persist="true"/> </box> <box autostretch="never"> diff --git a/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul b/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul index 3db8de9e3b3..26705e98e4f 100644 --- a/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul +++ b/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul @@ -21,13 +21,13 @@ <html style="width: 400px">&junkImgsDescription;</html> <box autostretch="never"> <text id="txSearchPath" value="Search Path:"/> - <textfield id="txfSearchPath" flex="1" style="width: 25em;" persist="true"/> + <textbox id="txfSearchPath" flex="1" style="width: 25em;" persist="true"/> <button id="btnSearchPathBrowser" value="Browse" onclick="dialog.browse()"/> </box> <!-- <box autostretch="never"> <text id="txRemotePath" value="Target URL:"/> - <textfield id="txfRemotePath" flex="1" persist="true"/> + <textbox id="txfRemotePath" flex="1" persist="true"/> </box> <box autostretch="never"> <checkbox id="cbIsSkin" value="Target is a Skin" checked="true" persist="true"/> diff --git a/mozilla/extensions/inspector/resources/content/toolboxOverlay.xul b/mozilla/extensions/inspector/resources/content/toolboxOverlay.xul index d108a086b83..45416160ec6 100644 --- a/mozilla/extensions/inspector/resources/content/toolboxOverlay.xul +++ b/mozilla/extensions/inspector/resources/content/toolboxOverlay.xul @@ -57,7 +57,7 @@ <box autostretch="never" valign="middle" flex="1"> <image id="imgURLBarIcon"/> - <textfield + <textbox id="tfURLBar" class="plain" flex="1" observes="cmdGotoURL" tooltip="PPTooltip" tooltiptext="Enter a URL to inspect"/> diff --git a/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.js b/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.js index ba8a9e33339..4e058b4710a 100644 --- a/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.js +++ b/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.js @@ -136,7 +136,7 @@ ColumnsDialog.prototype = text.setAttribute("value", "Attr"); box.appendChild(text); - var txf = document.createElementNS(kXULNSURI, "textfield"); + var txf = document.createElementNS(kXULNSURI, "textbox"); txf.setAttribute("class", "attr-column-selector"); txf.setAttribute("flex", 1); box.appendChild(txf); @@ -199,7 +199,7 @@ ColumnsDialog.prototype = getColumnValue: function(aColBox) { if (aColBox._isAttrCol) { - var txf = aColBox.getElementsByTagName("textfield")[0]; + var txf = aColBox.getElementsByTagName("textbox")[0]; return "@" + txf.value; } else { return aColBox._ColValue; @@ -211,4 +211,4 @@ ColumnsDialog.prototype = function ColumnsDialogDragDropOut() { dialog.onDragDropOut(); -} \ No newline at end of file +} diff --git a/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul b/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul index 07e3bacd899..250bcacc326 100644 --- a/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul +++ b/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul @@ -33,11 +33,11 @@ <rows> <row id="rwRow1"> <text id="txText1" value=""/> - <textfield id="tfText1" observes="cmdFind"/> + <textbox id="tfText1" observes="cmdFind"/> </row> <row id="rwRow2"> <text id="txText2" value=""/> - <textfield id="tfText2" observes="cmdFind"/> + <textbox id="tfText2" observes="cmdFind"/> </row> </rows> </grid> diff --git a/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul b/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul index 8d60f3f7d18..8329035f56a 100644 --- a/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul +++ b/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul @@ -41,19 +41,19 @@ <rows> <row> <text value="Node Name:"/> - <textfield id="tx_nodeName" readonly="true"/> + <textbox id="tx_nodeName" readonly="true"/> </row> <row> <text value="Namespace URI:"/> - <textfield id="tx_namespace" readonly="true"/> + <textbox id="tx_namespace" readonly="true"/> </row> <row> <text value="Node Type:"/> - <textfield id="tx_nodeType" readonly="true"/> + <textbox id="tx_nodeType" readonly="true"/> </row> <row> <text value="Node Value:"/> - <textfield id="tx_nodeValue" readonly="true" multiline="true"/> + <textbox id="tx_nodeValue" readonly="true" multiline="true"/> </row> </rows> </grid> diff --git a/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul b/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul index 5a8bba18dca..86e3682257d 100644 --- a/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul +++ b/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul @@ -14,5 +14,5 @@ <script type="application/x-javascript" src="chrome://inspector/content/viewers/nodeText/nodeText.js"/> - <textfield id="txNodeValue" readonly="true" multiline="true" flex="1"/> + <textbox id="txNodeValue" readonly="true" multiline="true" flex="1"/> </window> diff --git a/mozilla/extensions/irc/xul/content/chatzilla.xul b/mozilla/extensions/irc/xul/content/chatzilla.xul index d577f79c1e1..1a588f5a60a 100644 --- a/mozilla/extensions/irc/xul/content/chatzilla.xul +++ b/mozilla/extensions/irc/xul/content/chatzilla.xul @@ -227,9 +227,9 @@ collapsed="true"/> <vbox id="input-widgets"> - <textfield id="multiline-input" multiline="true" flex="1" height="100px" + <textbox id="multiline-input" multiline="true" flex="1" height="100px" class="multiline-input-widget" collapsed="true"/> - <textfield id="input" class="input-widget"/> + <textbox id="input" class="input-widget"/> </vbox> </vbox> <!-- outer-box --> diff --git a/mozilla/extensions/transformiix/resources/buster/buster.xul b/mozilla/extensions/transformiix/resources/buster/buster.xul index 0fdcfffff19..46a703079ae 100644 --- a/mozilla/extensions/transformiix/resources/buster/buster.xul +++ b/mozilla/extensions/transformiix/resources/buster/buster.xul @@ -43,13 +43,13 @@ </box> <box align="horizontal"> <text value="Xalan base directory: " class="head" /> - <textfield id="xalan_base" persist="value"/> + <textbox id="xalan_base" persist="value"/> <button value="browse..." oncommand="browse_base_dir()" /> </box> <box align="horizontal"> <titledbox align="horizontal"><title value="search" /> <button value="Search for " oncommand="select()"/> - <textfield style="width: 10em;" id="search-name" persist="value" /><text value=" in " /> + <textbox style="width: 10em;" id="search-name" persist="value" /><text value=" in " /> <menulist id="search-field" persist="data"> <menupopup> <menuitem data="1" value="Name" /> diff --git a/mozilla/extensions/vixen/resources/content/palette/vxPalette.js b/mozilla/extensions/vixen/resources/content/palette/vxPalette.js index eec4e4a689e..38de8777212 100644 --- a/mozilla/extensions/vixen/resources/content/palette/vxPalette.js +++ b/mozilla/extensions/vixen/resources/content/palette/vxPalette.js @@ -37,12 +37,12 @@ var vxPalette = this.insertSingleElement("button", attributes, values, "Insert Button " + nElements); }, - insertTextFieldElement: function (aType) + insertTextboxElement: function (aType) { - var nElements = this.incrementElementCount("textfield"); + var nElements = this.incrementElementCount("textbox"); var attributes = ["value", "id"]; - var values = ["Textfield " + nElements, "textfield_" + nElements]; - this.insertSingleElement("textfield", attributes, values, "Insert Textfield " + nElements); + var values = ["Textbox " + nElements, "textbox" + nElements]; + this.insertSingleElement("textbox", attributes, values, "Insert Textbox " + nElements); }, insertRadioGroup: function () diff --git a/mozilla/extensions/vixen/resources/content/palette/vxPalette.xul b/mozilla/extensions/vixen/resources/content/palette/vxPalette.xul index b3820ef04f4..0977e5e6b15 100644 --- a/mozilla/extensions/vixen/resources/content/palette/vxPalette.xul +++ b/mozilla/extensions/vixen/resources/content/palette/vxPalette.xul @@ -22,8 +22,8 @@ <button value="Button" oncommand="vxPalette.insertButtonElement();"/> - <button value="TextField" - oncommand="vxPalette.insertTextFieldElement();"/> + <button value="TextBox" + oncommand="vxPalette.insertTextboxElement();"/> <button value="RadioGroup" oncommand="vxPalette.insertRadioGroup();"/> diff --git a/mozilla/extensions/vixen/resources/content/vfdCommands.xul b/mozilla/extensions/vixen/resources/content/vfdCommands.xul index 01fbef97f4b..0d320e5d580 100644 --- a/mozilla/extensions/vixen/resources/content/vfdCommands.xul +++ b/mozilla/extensions/vixen/resources/content/vfdCommands.xul @@ -55,8 +55,8 @@ oncommand="nsVFD.insertMenuElement('combobox');"/> <!-- text input commands --> - <command id="cmd_insert_textfield" - oncommand="nsVFD.insertTextElement('textfield');"/> + <command id="cmd_insert_textbox" + oncommand="nsVFD.insertTextElement('textbox');"/> <command id="cmd_insert_textarea" oncommand="nsVFD.insertTextElement('textarea');"/> <command id="cmd_insert_rtf_editor" diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul index 5b66a352c45..732b72edd00 100644 --- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul +++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul @@ -87,27 +87,27 @@ <rows> <row> <text value="&props.name.label;"/> - <textfield id="ifl_name" readonly="true"/> + <textbox id="ifl_name" readonly="true"/> </row> <row> <text value="&props.value.label;"/> - <textfield id="ifl_value" readonly="true"/> + <textbox id="ifl_value" readonly="true"/> </row> <row> <text id="ifl_domaintype" value="&props.domain.label;"/> - <textfield id="ifl_domain" readonly="true"/> + <textbox id="ifl_domain" readonly="true"/> </row> <row> <text value="&props.path.label;"/> - <textfield id="ifl_path" readonly="true"/> + <textbox id="ifl_path" readonly="true"/> </row> <row> <text value="&props.secure.label;"/> - <textfield id="ifl_secure" readonly="true"/> + <textbox id="ifl_secure" readonly="true"/> </row> <row> <text value="&props.expires.label;"/> - <textfield id="ifl_expires" readonly="true"/> + <textbox id="ifl_expires" readonly="true"/> </row> </rows> </grid> diff --git a/mozilla/extensions/wallet/editor/WalletUrlspecific.xul b/mozilla/extensions/wallet/editor/WalletUrlspecific.xul index 32f5ef590b8..7e7b7dbd5ab 100644 --- a/mozilla/extensions/wallet/editor/WalletUrlspecific.xul +++ b/mozilla/extensions/wallet/editor/WalletUrlspecific.xul @@ -47,8 +47,8 @@ if (colonIndex != -1) { var rows = document.getElementById("rows"); var row = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "row"); - var text1 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textfield"); - var text2 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textfield"); + var text1 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox"); + var text2 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox"); var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "spring"); var menuList = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menulist"); var menuPopup = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menupopup"); diff --git a/mozilla/extensions/wallet/editor/WalletViewer.js b/mozilla/extensions/wallet/editor/WalletViewer.js index 45988a7c1e9..8ee6935daec 100644 --- a/mozilla/extensions/wallet/editor/WalletViewer.js +++ b/mozilla/extensions/wallet/editor/WalletViewer.js @@ -216,12 +216,12 @@ nsWalletViewer.prototype = function Append(thisMenuList) { - /* Note: we always want a zero-length textfield so the user + /* Note: we always want a zero-length textbox so the user * can start typing in a new value. So we need to determine - * if user has started typing into the zero-length textfield + * if user has started typing into the zero-length textbox * in which case it's time to create yet another zero-length * one. We also need to determine if user has removed all - * text in a textfield in which case that textfield needs to + * text in a textbox in which case that textbox needs to * be removed */ @@ -232,7 +232,7 @@ nsWalletViewer.prototype = } thisMenuItem.setAttribute('value',thisMenuList.value); - /* determine previous size of textfield */ + /* determine previous size of textbox */ var len = Number(thisMenuItem.getAttribute("len")); /* update previous size */ diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul b/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul index 32f5ef590b8..7e7b7dbd5ab 100644 --- a/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul +++ b/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul @@ -47,8 +47,8 @@ if (colonIndex != -1) { var rows = document.getElementById("rows"); var row = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "row"); - var text1 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textfield"); - var text2 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textfield"); + var text1 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox"); + var text2 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox"); var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "spring"); var menuList = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menulist"); var menuPopup = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menupopup"); diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletViewer.js b/mozilla/extensions/wallet/editor/resources/content/WalletViewer.js index 45988a7c1e9..8ee6935daec 100644 --- a/mozilla/extensions/wallet/editor/resources/content/WalletViewer.js +++ b/mozilla/extensions/wallet/editor/resources/content/WalletViewer.js @@ -216,12 +216,12 @@ nsWalletViewer.prototype = function Append(thisMenuList) { - /* Note: we always want a zero-length textfield so the user + /* Note: we always want a zero-length textbox so the user * can start typing in a new value. So we need to determine - * if user has started typing into the zero-length textfield + * if user has started typing into the zero-length textbox * in which case it's time to create yet another zero-length * one. We also need to determine if user has removed all - * text in a textfield in which case that textfield needs to + * text in a textbox in which case that textbox needs to * be removed */ @@ -232,7 +232,7 @@ nsWalletViewer.prototype = } thisMenuItem.setAttribute('value',thisMenuList.value); - /* determine previous size of textfield */ + /* determine previous size of textbox */ var len = Number(thisMenuItem.getAttribute("len")); /* update previous size */ diff --git a/mozilla/extensions/wallet/resources/content/pref-wallet.xul b/mozilla/extensions/wallet/resources/content/pref-wallet.xul index bd0692e4e03..fbd601c06d6 100644 --- a/mozilla/extensions/wallet/resources/content/pref-wallet.xul +++ b/mozilla/extensions/wallet/resources/content/pref-wallet.xul @@ -65,7 +65,7 @@ for="walletServer" value="&walletServer.label;" accesskey="&walletServer.accesskey;"/> - <textfield id="walletServer" + <textbox id="walletServer" flex="1" pref="true" preftype="string" diff --git a/mozilla/extensions/wallet/walletpreview/WalletPreview.js b/mozilla/extensions/wallet/walletpreview/WalletPreview.js index f70c6fcb55b..46dd2a84e5b 100644 --- a/mozilla/extensions/wallet/walletpreview/WalletPreview.js +++ b/mozilla/extensions/wallet/walletpreview/WalletPreview.js @@ -88,12 +88,12 @@ function Startup() { menuList.setAttribute("allowevents", "true"); menuList.appendChild(menuPopup); - var textField = document.createElement("textfield"); - textField.setAttribute("value", prefillList[i+1]); - textField.setAttribute("readonly", "true"); + var textBox = document.createElement("textbox"); + textBox.setAttribute("value", prefillList[i+1]); + textBox.setAttribute("readonly", "true"); var row = document.createElement("row"); - row.appendChild(textField); + row.appendChild(textBox); row.appendChild(menuList); var rows = document.getElementById("rows"); diff --git a/mozilla/extensions/xml-rpc/test/xml-rpc.xul b/mozilla/extensions/xml-rpc/test/xml-rpc.xul index 312c3a36bde..335dea75607 100644 --- a/mozilla/extensions/xml-rpc/test/xml-rpc.xul +++ b/mozilla/extensions/xml-rpc/test/xml-rpc.xul @@ -60,7 +60,7 @@ var Listener = { <box orient="vertical" flex="1"> <spring flex="1"/> <text value="Enter a state code:"/> -<textfield id="statecode"/> +<textbox id="statecode"/> <text value="Statename:"/> <text id="statename" value=" "/> <spring flex="1"/> diff --git a/mozilla/layout/xul/content/src/nsXULAtomList.h b/mozilla/layout/xul/content/src/nsXULAtomList.h new file mode 100644 index 00000000000..9c156f09de8 --- /dev/null +++ b/mozilla/layout/xul/content/src/nsXULAtomList.h @@ -0,0 +1,210 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1999 Netscape Communications Corporation. All + * Rights Reserved. + * + * Original Author: David W. Hyatt (hyatt@netscape.com) + * + * Contributor(s): + */ + +/****** + + This file contains the list of all XUL nsIAtoms and their values + + It is designed to be used as inline input to nsXULAtoms.cpp *only* + through the magic of C preprocessing. + + All entires must be enclosed in the macro XUL_ATOM which will have cruel + and unusual things done to it + + It is recommended (but not strictly necessary) to keep all entries + in alphabetical order + + The first argument to XUL_ATOM is the C++ identifier of the atom + The second argument is the string value of the atom + + ******/ + + +XUL_ATOM(button, "button") +XUL_ATOM(spinner, "spinner") +XUL_ATOM(scrollbar, "scrollbar") +XUL_ATOM(slider, "slider") +XUL_ATOM(palettename, "palettename") +XUL_ATOM(fontpicker, "fontpicker") +XUL_ATOM(text, "text") +XUL_ATOM(toolbar, "toolbar") +XUL_ATOM(toolbaritem, "toolbaritem") +XUL_ATOM(toolbox, "toolbox") +XUL_ATOM(image, "image") + + // The tree atoms +XUL_ATOM(tree, "tree") // The start of a tree view +XUL_ATOM(treecaption, "treecaption") // The caption of a tree view +XUL_ATOM(treehead, "treehead") // The header of the tree view +XUL_ATOM(treerow, "treerow") // A row in the tree view +XUL_ATOM(treerows, "treerows") // A row in the tree view +XUL_ATOM(treecell, "treecell") // An item in the tree view +XUL_ATOM(treeitem, "treeitem") // A cell in the tree view +XUL_ATOM(treechildren, "treechildren") // The children of an item in the tree view +XUL_ATOM(treeindentation, "treeindentation") // Specifies that the indentation for the level should occur here. +XUL_ATOM(allowevents, "allowevents") // Lets events be handled on the cell contents or in menus. +XUL_ATOM(treecol, "treecol") // A column in the tree view +XUL_ATOM(treecolgroup, "treecolgroup") // A column group in the tree view +XUL_ATOM(treecols, "treecols") // A column group in the tree view +XUL_ATOM(treefoot, "treefoot") // The footer of the tree view +XUL_ATOM(scrollbarlist, "scrollbarlist") // An atom for internal use by the tree view +XUL_ATOM(indent, "indent") // indicates that a cell should be indented +XUL_ATOM(outer, "outer") // indicates that a treechildren is the outermost rowgroup +XUL_ATOM(sizemode, "sizemode") // when set, measure strings to determine preferred width + +XUL_ATOM(open, "open") // Whether or not a menu, tree, etc. is open +XUL_ATOM(focus, "focus") + +XUL_ATOM(outliner, "outliner") +XUL_ATOM(outlinerbody, "outlinerbody") +XUL_ATOM(outlinercol, "outlinercol") + +XUL_ATOM(cycler, "cycler") +XUL_ATOM(primary, "primary") +XUL_ATOM(current, "current") +XUL_ATOM(mozoutlinerrow, ":-moz-outliner-row") +XUL_ATOM(mozoutlinercell, ":-moz-outliner-cell") +XUL_ATOM(mozoutlinercolumn, ":-moz-outliner-column") +XUL_ATOM(mozoutlinercelltext, ":-moz-outliner-cell-text") +XUL_ATOM(mozoutlinertwisty, ":-moz-outliner-twisty") +XUL_ATOM(mozoutlinerindentation, ":-moz-outliner-indentation") +XUL_ATOM(mozoutlinerline, ":-moz-outliner-line") + +XUL_ATOM(menubar, "menubar") // An XP menu bar. +XUL_ATOM(menu, "menu") // Represents an XP menu +XUL_ATOM(menuitem, "menuitem") // Represents an XP menu item +XUL_ATOM(menupopup, "menupopup") // The XP menu's children. +XUL_ATOM(menutobedisplayed, "menutobedisplayed") // The menu is about to be displayed at the next sync w/ frame +XUL_ATOM(menuactive, "menuactive") // Whether or not a menu is active (without necessarily being open) +XUL_ATOM(accesskey, "accesskey") // The shortcut key for a menu or menu item +XUL_ATOM(acceltext, "acceltext") // Text to use for the accelerator +XUL_ATOM(popupset, "popupset") // Contains popup menus, context menus, and tooltips +XUL_ATOM(popup, "popup") // The popup for a context menu, popup menu, or tooltip +XUL_ATOM(menugenerated, "menugenerated") // Internal +XUL_ATOM(popupanchor, "popupanchor") // Anchor for popups +XUL_ATOM(popupalign, "popupalign") // Alignment for popups +XUL_ATOM(ignorekeys, "ignorekeys") // Alignment for popups +XUL_ATOM(sizetopopup, "sizetopopup") // Whether or not menus size to their popup children (used by menulists) + +XUL_ATOM(key, "key") // The key element / attribute +XUL_ATOM(keycode, "keycode") // The keycode attribute +XUL_ATOM(keytext, "keytext") // The keytext attribute +XUL_ATOM(modifiers, "modifiers") // The modifiers attribute +XUL_ATOM(broadcaster, "broadcaster") // A broadcaster +XUL_ATOM(observes, "observes") // The observes element +XUL_ATOM(templateAtom, "template") // A XUL template + +XUL_ATOM(progressbar, "progressbar") +XUL_ATOM(crop, "crop") + +XUL_ATOM(mode, "mode") +XUL_ATOM(equalsize, "equalsize") +XUL_ATOM(box, "box") +XUL_ATOM(hbox, "hbox") +XUL_ATOM(vbox, "vbox") +XUL_ATOM(scrollbox, "scrollbox") +XUL_ATOM(mousethrough, "mousethrough") +XUL_ATOM(flex, "flex") +XUL_ATOM(spring, "spring") +XUL_ATOM(orient, "orient") +XUL_ATOM(autostretch, "autostretch") +XUL_ATOM(minwidth, "min-width") +XUL_ATOM(minheight, "min-height") + +XUL_ATOM(autorepeatbutton, "autorepeatbutton") + +XUL_ATOM(bulletinboard, "bulletinboard") + +XUL_ATOM(titledbox, "titledbox") +XUL_ATOM(title, "title") +XUL_ATOM(titledboxContentPseudo, ":titledbox-content") + +XUL_ATOM(stack, "stack") +XUL_ATOM(deck, "deck") +XUL_ATOM(tabcontrol, "tabcontrol") +XUL_ATOM(tab, "tab") +XUL_ATOM(tabpanel, "tabpanel") +XUL_ATOM(tabpage, "tabpage") +XUL_ATOM(tabbox, "tabbox") +XUL_ATOM(index, "index") +XUL_ATOM(maxpos, "maxpos") +XUL_ATOM(curpos, "curpos") +XUL_ATOM(scrollbarbutton, "scrollbarbutton") +XUL_ATOM(increment, "increment") +XUL_ATOM(pageincrement, "pageincrement") +XUL_ATOM(thumb, "thumb") +XUL_ATOM(toggled, "toggled") +XUL_ATOM(grippy, "grippy") +XUL_ATOM(splitter, "splitter") +XUL_ATOM(collapse, "collapse") +XUL_ATOM(collapsed, "collapsed") +XUL_ATOM(resizebefore, "resizebefore") +XUL_ATOM(resizeafter, "resizeafter") +XUL_ATOM(state, "state") +XUL_ATOM(debug, "debug") + +XUL_ATOM(fixed, "fixed") + +// grid +XUL_ATOM(grid, "grid") +XUL_ATOM(rows, "rows") +XUL_ATOM(columns, "columns") +XUL_ATOM(row, "row") +XUL_ATOM(column, "column") + +// toolbar & toolbar d&d atoms +XUL_ATOM(ddDropLocation, "dd-droplocation") +XUL_ATOM(ddDropLocationCoord, "dd-droplocationcoord") +XUL_ATOM(ddDropOn, "dd-dropon") +XUL_ATOM(ddTriggerRepaintSorted, "dd-triggerrepaintsorted") +XUL_ATOM(ddTriggerRepaintRestore, "dd-triggerrepaintrestore") +XUL_ATOM(ddTriggerRepaint, "dd-triggerrepaint") +XUL_ATOM(ddNoDropBetweenRows, "dd-nodropbetweenrows") +XUL_ATOM(container, "container") +XUL_ATOM(ddDragDropArea, "dragdroparea") +XUL_ATOM(ddDropMarker, ":-moz-drop-marker") + +XUL_ATOM(widget, "widget") +XUL_ATOM(window, "window") + +XUL_ATOM(iframe, "iframe") +XUL_ATOM(browser, "browser") +XUL_ATOM(editor, "editor") + +// + +XUL_ATOM(checkbox, "checkbox") +XUL_ATOM(radio, "radio") +XUL_ATOM(radiogroup, "radiogroup") +XUL_ATOM(menulist, "menulist") +XUL_ATOM(menubutton, "menubutton") +XUL_ATOM(textbox, "textbox") +XUL_ATOM(textarea, "textarea") +XUL_ATOM(listbox, "listbox") + +XUL_ATOM(blankrow, "blankrow") +XUL_ATOM(titlebar, "titlebar") +XUL_ATOM(resizer, "resizer") +XUL_ATOM(dir, "dir") + diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul index 05d1f4895e3..dd35c742bd5 100644 --- a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul +++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul @@ -12,7 +12,10 @@ <script type="text/javascript"> <![CDATA[ - var _elementIDs = ["emailCollection", "emailCollectionIncoming", "emailCollectionOutgoing", "emailCollectionNewsgroup", "addressingAutocomplete", "enableCABsizeLimit", "CABsizeLimit"]; + var _elementIDs = ["emailCollection", "emailCollectionIncoming", + "emailCollectionOutgoing", "emailCollectionNewsgroup", + "addressingAutocomplete", "enableCABsizeLimit", + "CABsizeLimit"]; ]]> function Startup(){ @@ -76,7 +79,7 @@ <checkbox id="enableCABsizeLimit" value="&useCABSizelimitPart1.label;" pref="true" preftype="bool" prefstring="mail.collect_email_address_enable_size_limit" prefattribute="checked"/> - <textfield id="CABsizeLimit" size="6" pref="true" preftype="int" + <textbox id="CABsizeLimit" size="6" pref="true" preftype="int" prefstring="mail.collect_email_address_size_limit" prefattribute="value"/> <text id="useCABSizelimitPart2" class="label" value="&useCABSizelimitPart2.label;"/> </box> diff --git a/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul b/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul index 803331f60b7..60864874503 100644 --- a/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul +++ b/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul @@ -43,7 +43,7 @@ Rights Reserved. <text for="name" style="margin-bottom:.3em" value="&name.label;"/> - <textfield tabindex="0" id="name" style="width: 100%"/> + <textbox tabindex="0" id="name" style="width: 100%"/> <spring flex="1"/> diff --git a/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul index 8b445d6afc2..518509ac3b1 100644 --- a/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul +++ b/mozilla/mailnews/addrbook/resources/content/abCardOverlay.xul @@ -52,28 +52,28 @@ Rights Reserved. <spring flex="1"/> <text for="FirstName" value="&FirstName.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="FirstName" flex="1" oninput="top.GenerateDisplayName()"/> + <textbox id="FirstName" flex="1" oninput="top.GenerateDisplayName()"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="LastName" value="&LastName.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="LastName" flex="1" oninput="top.GenerateDisplayName()"/> + <textbox id="LastName" flex="1" oninput="top.GenerateDisplayName()"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="DisplayName" value="&DisplayName.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="DisplayName" flex="1" oninput="top.DisplayNameChanged()"/> + <textbox id="DisplayName" flex="1" oninput="top.DisplayNameChanged()"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="NickName" value="&NickName.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="NickName" flex="1"/> + <textbox id="NickName" flex="1"/> </box> </box> </box> @@ -89,14 +89,14 @@ Rights Reserved. <spring flex="1"/> <text for="PrimaryEmail" value="&PrimaryEmail.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="PrimaryEmail" flex="1"/> + <textbox id="PrimaryEmail" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="SecondEmail" value="&SecondEmail.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="SecondEmail" flex="1"/> + <textbox id="SecondEmail" flex="1"/> </box> </box> <box orient="horizontal"> @@ -122,35 +122,35 @@ Rights Reserved. <spring flex="1"/> <text for="WorkPhone" value="&WorkPhone.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WorkPhone" flex="1"/> + <textbox id="WorkPhone" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="HomePhone" value="&HomePhone.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="HomePhone" flex="1"/> + <textbox id="HomePhone" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="FaxNumber" value="&FaxNumber.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="FaxNumber" flex="1"/> + <textbox id="FaxNumber" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="PagerNumber" value="&PagerNumber.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="PagerNumber" flex="1"/> + <textbox id="PagerNumber" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="CellularNumber" value="&CellularNumber.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="CellularNumber" flex="1"/> + <textbox id="CellularNumber" flex="1"/> </box> </box> </box> @@ -169,45 +169,45 @@ Rights Reserved. <spring flex="1"/> <text for="HomeAddress" value="&HomeAddress.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="HomeAddress" flex="1"/> + <textbox id="HomeAddress" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="HomeAddress2" value="&HomeAddress2.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="HomeAddress2" flex="1"/> + <textbox id="HomeAddress2" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="HomeCity" value="&HomeCity.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="HomeCity" flex="1"/> + <textbox id="HomeCity" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="HomeState" value="&HomeState.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="HomeState" flex="1"/> + <textbox id="HomeState" flex="1"/> <spring class="stateZipSpacer"/> <text for="HomeZipCode" value="&HomeZipCode.label;" class="CardEditLabel"/> - <textfield id="HomeZipCode" flex="1"/> + <textbox id="HomeZipCode" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="HomeCountry" value="&HomeCountry.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="HomeCountry" flex="1"/> + <textbox id="HomeCountry" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="WebPage2" value="&HomeWebPage.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WebPage2" flex="1"/> + <textbox id="WebPage2" flex="1"/> </box> </box> </box> @@ -222,66 +222,66 @@ Rights Reserved. <spring flex="1"/> <text for="JobTitle" value="&JobTitle.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="JobTitle" flex="1"/> + <textbox id="JobTitle" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="Department" value="&Department.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="Department" flex="1"/> + <textbox id="Department" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="Company" value="&Company.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="Company" flex="1"/> + <textbox id="Company" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="WorkAddress" value="&WorkAddress.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WorkAddress" flex="1"/> + <textbox id="WorkAddress" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="WorkAddress2" value="&WorkAddress2.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WorkAddress2" flex="1"/> + <textbox id="WorkAddress2" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="WorkCity" value="&WorkCity.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WorkCity" flex="1"/> + <textbox id="WorkCity" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="WorkState" value="&WorkState.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WorkState" flex="1"/> + <textbox id="WorkState" flex="1"/> <spring class="stateZipSpacer"/> <text for="WorkZipCode" value="&WorkZipCode.label;" class="CardEditLabel"/> - <textfield id="WorkZipCode" flex="1"/> + <textbox id="WorkZipCode" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="WorkCountry" value="&WorkCountry.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WorkCountry" flex="1"/> + <textbox id="WorkCountry" flex="1"/> </box> </box> <box orient="horizontal"> <spring flex="1"/> <text for="WebPage1" value="&WorkWebPage.label;" class="CardEditLabel"/> <box class="CardEditWidth"> - <textfield id="WebPage1" flex="1"/> + <textbox id="WebPage1" flex="1"/> </box> </box> </box> @@ -295,19 +295,19 @@ Rights Reserved. <box align="vertical" class="alignBoxWithFieldset"> <box flex="1"> <text for="Custom1" value="&Custom1.label;" class="CardEditLabel"/> - <textfield id="Custom1" flex="1"/> + <textbox id="Custom1" flex="1"/> </box> <box flex="1"> <text for="Custom2" value="&Custom2.label;" class="CardEditLabel"/> - <textfield id="Custom2" flex="1"/> + <textbox id="Custom2" flex="1"/> </box> <box flex="1"> <text for="Custom3" value="&Custom3.label;" class="CardEditLabel"/> - <textfield id="Custom3" flex="1"/> + <textbox id="Custom3" flex="1"/> </box> <box flex="1"> <text for="Custom4" value="&Custom4.label;" class="CardEditLabel"/> - <textfield id="Custom4" flex="1"/> + <textbox id="Custom4" flex="1"/> </box> </box> @@ -317,7 +317,7 @@ Rights Reserved. - + diff --git a/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul index d422366327b..6cd09bca110 100644 --- a/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul +++ b/mozilla/mailnews/addrbook/resources/content/abListOverlay.xul @@ -38,21 +38,21 @@ Rights Reserved. - + - + - + @@ -75,7 +75,7 @@ Rights Reserved. - diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountManager.js b/mozilla/mailnews/base/prefs/resources/content/AccountManager.js index 90f2984c175..08ffe3169b0 100644 --- a/mozilla/mailnews/base/prefs/resources/content/AccountManager.js +++ b/mozilla/mailnews/base/prefs/resources/content/AccountManager.js @@ -593,7 +593,7 @@ function getFormElementValue(formElement) { return formElement.selectedItem.data; } - else if (type == "textfield" && + else if (type == "textbox" && formElement.getAttribute("datatype") == "nsIFileSpec") { if (formElement.value) { var filespec = Components.classes["@mozilla.org/filespec;1"].createInstance(Components.interfaces.nsIFileSpec); @@ -603,7 +603,7 @@ function getFormElementValue(formElement) { return null; } } - else if (type == "textfield" && + else if (type == "textbox" && formElement.getAttribute("datatype") == "nsILocalFile") { if (formElement.value) { var localfile = Components.classes["component://mozilla/file/local"].createInstance(Components.interfaces.nsILocalFile); @@ -670,7 +670,7 @@ function setFormElementValue(formElement, value) { formElement.selectedItem = selectedItem; } // handle nsIFileSpec - else if (type == "textfield" && + else if (type == "textbox" && formElement.getAttribute("datatype") == "nsIFileSpec") { if (value) { var filespec = value.QueryInterface(Components.interfaces.nsIFileSpec); @@ -687,7 +687,7 @@ function setFormElementValue(formElement, value) { } } - else if (type == "textfield" && + else if (type == "textbox" && formElement.getAttribute("datatype") == "nsILocalFile") { if (value) { var localfile = value.QueryInterface(Components.interfaces.nsILocalFile); diff --git a/mozilla/mailnews/base/prefs/resources/content/am-copies.xul b/mozilla/mailnews/base/prefs/resources/content/am-copies.xul index 1769cc214cd..6e5edebfc84 100644 --- a/mozilla/mailnews/base/prefs/resources/content/am-copies.xul +++ b/mozilla/mailnews/base/prefs/resources/content/am-copies.xul @@ -40,7 +40,7 @@ - + diff --git a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul index 5404227ceb0..c02c5850e8f 100644 --- a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul +++ b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul @@ -19,7 +19,7 @@ - + @@ -39,17 +39,17 @@ - + - + - + diff --git a/mozilla/mailnews/base/prefs/resources/content/am-main.xul b/mozilla/mailnews/base/prefs/resources/content/am-main.xul index 0a9ac71f284..d92a5220461 100644 --- a/mozilla/mailnews/base/prefs/resources/content/am-main.xul +++ b/mozilla/mailnews/base/prefs/resources/content/am-main.xul @@ -21,7 +21,7 @@ &accountSettingsDesc.label; - + @@ -38,19 +38,19 @@ - + - + - + - + @@ -59,7 +59,7 @@ - +