diff --git a/mailnews/addrbook/resources/content/abListOverlay.xul b/mailnews/addrbook/resources/content/abListOverlay.xul
index 224a382583ae..182f5a99090b 100644
--- a/mailnews/addrbook/resources/content/abListOverlay.xul
+++ b/mailnews/addrbook/resources/content/abListOverlay.xul
@@ -75,15 +75,12 @@ Rights Reserved.
-
-
+
+
diff --git a/mailnews/compose/resources/content/addressingWidgetOverlay.js b/mailnews/compose/resources/content/addressingWidgetOverlay.js
index a41de007fd09..3cbf49cd7410 100644
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.js
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.js
@@ -722,12 +722,15 @@ function awSetAutoComplete(rowNumber)
_awSetAutoComplete(selectElem, inputElem)
}
+function awRecipientTextCommand(userAction, element)
+{
+ if (userAction == "typing" || userAction == "scrolling")
+ awReturnHit(element);
+}
+
function awRecipientKeyPress(event, element)
{
switch(event.keyCode) {
- case 13:
- awReturnHit(element);
- break;
case 9:
awTabFromRecipient(element, event);
break;
@@ -742,7 +745,7 @@ function awRecipientKeyDown(event, element)
/* do not query directly the value of the text field else the autocomplete widget could potentially
alter it value while doing some internal cleanup, instead, query the value through the first child
*/
- if (!document.getAnonymousNodes(element)[0].firstChild.value)
+ if (!element.value)
awDeleteHit(element);
event.preventBubble(); //We need to stop the event else the tree will receive it and the function
//awKeyDown will be executed!
diff --git a/mailnews/compose/resources/content/addressingWidgetOverlay.xul b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
index efef18fc0d88..21876b88b1dc 100644
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@@ -58,14 +58,14 @@ Rights Reserved.
-
-
+
+
+
diff --git a/themes/classic/global/mac/arrow-dn.gif b/themes/classic/global/mac/arrow-dn.gif
new file mode 100644
index 000000000000..2d125c49771d
Binary files /dev/null and b/themes/classic/global/mac/arrow-dn.gif differ
diff --git a/themes/classic/global/mac/autocomplete.css b/themes/classic/global/mac/autocomplete.css
new file mode 100644
index 000000000000..36b361f20a7f
--- /dev/null
+++ b/themes/classic/global/mac/autocomplete.css
@@ -0,0 +1,77 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
+
+/* ::::: autocomplete ::::: */
+
+textbox[type="autocomplete"]
+ {
+ cursor : default !important;
+ }
+
+.textbox-input
+ {
+ cursor : text;
+ }
+
+.autocomplete-internal-box
+ {
+ padding : 0px !important;
+ }
+
+.autocomplete-textbox-container
+ {
+ padding : 1px 2px 1px 2px;
+ }
+
+/* ::::: history button ::::: */
+
+.autocomplete-history-button
+ {
+ border : 1px outset #CCCCCC;
+ padding : 1px 2px;
+ background-color : #CCCCCC;
+ list-style-image : url("chrome://global/skin/arrow-dn.gif");
+ }
+
+.autocomplete-history-button[open="true"]
+ {
+ border : 1px solid #888888;
+ padding : 2px 1px 0px 3px;
+ }
+
+/* ::::: autocomplete popups ::::: */
+
+.autocomplete-history-popup,
+.autocomplete-result-popup
+ {
+ border : 1px solid #333333 !important;
+ background-color : -moz-field !important;
+ }
+
+.autocomplete-history-popup,
+ {
+ max-height : 180px;
+ }
+
+/* ::::: outliner ::::: */
+
+.autocomplete-outliner
+ {
+ background-color : transparent !important;
+ }
+
+.autocomplete-outlinercol
+ {
+ margin : 0px !important;
+ border : none !important;
+ padding : 0px !important;
+ }
+
+.autocomplete-outlinerbody:-moz-outliner-row(menuactive)
+ {
+ background-color : Highlight;
+ }
+
+.autocomplete-outlinerbody:-moz-outliner-cell-text(menuactive)
+ {
+ color : HighlightText !important;
+ }
diff --git a/themes/classic/global/mac/jar.mn b/themes/classic/global/mac/jar.mn
index e398bcd88053..81c0f1527ed4 100644
--- a/themes/classic/global/mac/jar.mn
+++ b/themes/classic/global/mac/jar.mn
@@ -1,5 +1,6 @@
classic.jar:
skin/classic/global/contents.rdf
+ skin/classic/global/autocomplete.css
skin/classic/global/box.css
skin/classic/global/button.css
skin/classic/global/checkbox.css
@@ -30,6 +31,7 @@ classic.jar:
skin/classic/global/arrow-med-up-hover.gif
skin/classic/global/arrow-med-down.gif
skin/classic/global/arrow-med-down-hover.gif
+ skin/classic/global/arrow-dn.gif
skin/classic/global/button-def-disabled-left.gif
skin/classic/global/button-def-disabled-middle.gif
skin/classic/global/button-def-disabled-right.gif
diff --git a/themes/classic/global/mac/menu.css b/themes/classic/global/mac/menu.css
index b3d86f69237d..4c5b3e768149 100644
--- a/themes/classic/global/mac/menu.css
+++ b/themes/classic/global/mac/menu.css
@@ -278,3 +278,12 @@ autorepeatbutton > .autorepeatbutton-down {
autorepeatbutton:hover > .autorepeatbutton-down {
list-style-image: url("chrome://global/skin/arrow-med-down-hover.gif")
}
+
+/* ::::: autocomplete menuitems ::::: */
+
+.autocomplete-history-popup > menuitem
+ {
+ max-width : none !important;
+ font : message-box;
+ }
+
diff --git a/themes/classic/global/mac/textfield.css b/themes/classic/global/mac/textfield.css
index 9d55bb7d0b14..10d9c2d8062e 100644
--- a/themes/classic/global/mac/textfield.css
+++ b/themes/classic/global/mac/textfield.css
@@ -81,8 +81,3 @@
border : none !important;
}
-/* autocomplete text field */
- .textbox-popup > menuitem
- {
- max-width : none !important;
- }
diff --git a/themes/classic/global/win/autocomplete.css b/themes/classic/global/win/autocomplete.css
new file mode 100644
index 000000000000..580a66b3e7ef
--- /dev/null
+++ b/themes/classic/global/win/autocomplete.css
@@ -0,0 +1,94 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
+
+/* ::::: autocomplete ::::: */
+
+textbox[type="autocomplete"]
+ {
+ cursor : default !important;
+ }
+
+.textbox-input
+ {
+ cursor : text;
+ }
+
+.autocomplete-internal-box
+ {
+ padding : 0px !important;
+ }
+
+.autocomplete-textbox-container
+ {
+ padding : 1px 2px 1px 2px;
+ }
+
+/* ::::: history button ::::: */
+
+.autocomplete-history-button
+ {
+ -moz-binding : url("chrome://global/skin/classicBindings.xml#autocomplete-history-button");
+ border-top : 1px solid -moz-Dialog;
+ border-right : 1px solid ThreeDDarkShadow;
+ border-bottom : 1px solid ThreeDDarkShadow;
+ border-left : 1px solid ThreeDFace;
+ background-color : ThreeDFace;
+ list-style-image : url("chrome://global/skin/scroll-down.gif");
+ }
+
+.autocomplete-history-button > .autocomplete-history-button-internal-box
+ {
+ border-top : 1px solid ThreeDHighlight;
+ border-right : 1px solid ThreeDShadow;
+ border-bottom : 1px solid ThreeDShadow;
+ border-left : 1px solid ThreeDHighlight;
+ padding : 1px;
+ }
+
+.autocomplete-history-button[open="true"]
+ {
+ border : 1px solid ThreeDDarkShadow;
+ }
+
+.autocomplete-history-button[open="true"] > .autocomplete-history-button-internal-box
+ {
+ border : 1px solid ThreeDFace;
+ padding : 2px 0px 0px 2px;
+ }
+
+/* ::::: autocomplete popups ::::: */
+
+.autocomplete-result-popup,
+.autocomplete-history-popup
+ {
+ border : 1px solid ThreeDDarkShadow !important;
+ background-color : -moz-Field !important;
+ }
+
+.autocomplete-history-popup
+ {
+ max-height : 180px;
+ }
+
+/* ::::: outliner ::::: */
+
+.autocomplete-outliner
+ {
+ background-color : transparent !important;
+ }
+
+.autocomplete-outlinercol
+ {
+ margin : 0px !important;
+ border : none !important;
+ padding : 0px !important;
+ }
+
+.autocomplete-outlinerbody:-moz-outliner-row(menuactive)
+ {
+ background-color : Highlight;
+ }
+
+.autocomplete-outlinerbody:-moz-outliner-cell-text(menuactive)
+ {
+ color : HighlightText !important;
+ }
diff --git a/themes/classic/global/win/classicBindings.xml b/themes/classic/global/win/classicBindings.xml
index 64e3d7cd3834..66ddf8ae6f1e 100644
--- a/themes/classic/global/win/classicBindings.xml
+++ b/themes/classic/global/win/classicBindings.xml
@@ -173,6 +173,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- onkeypress="if (event.keyCode == 13) { addToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>
+
+
+
+
+
-
-