Bug 1557978 - adapt to bug 1556561 removing <children> from the autocomplete binding. r=Paenglab
This commit is contained in:
Magnus Melin
Родитель
7db0020023
Коммит
8f7214009e
|
|
@ -44,13 +44,8 @@
|
|||
<label control="hrefInput"
|
||||
accesskey="&LinkURLEditField2.accessKey;"
|
||||
width="1">&LinkURLEditField2.label;</label>
|
||||
<textbox id="hrefInput" type="autocomplete"
|
||||
autocompletesearch="unifiedcomplete" timeout="50" maxrows="6"
|
||||
class="uri-element padded" oninput="ChangeLinkLocation();">
|
||||
<menupopup class="autocomplete-history-popup"
|
||||
popupalign="topleft" popupanchor="bottomleft"
|
||||
oncommand="this.parentNode.value = event.target.getAttribute('label'); ChangeLinkLocation();"/>
|
||||
</textbox>
|
||||
<textbox id="hrefInput" type="text"
|
||||
class="uri-element padded" oninput="ChangeLinkLocation();"/>
|
||||
<hbox align="center">
|
||||
<checkbox id="MakeRelativeLink"
|
||||
for="hrefInput"
|
||||
|
|
|
|||
|
|
@ -40,13 +40,8 @@
|
|||
<label control="hrefInput"
|
||||
accesskey="&LinkURLEditField2.accessKey;"
|
||||
width="1">&LinkURLEditField2.label;</label>
|
||||
<textbox id="hrefInput" type="autocomplete"
|
||||
autocompletesearch="unifiedcomplete" timeout="50" maxrows="6"
|
||||
class="uri-element padded" oninput="ChangeLinkLocation();">
|
||||
<menupopup class="autocomplete-history-popup"
|
||||
popupalign="topleft" popupanchor="bottomleft"
|
||||
oncommand="this.parentNode.value = event.target.getAttribute('label'); ChangeLinkLocation();"/>
|
||||
</textbox>
|
||||
<textbox id="hrefInput" type="text"
|
||||
class="uri-element padded" oninput="ChangeLinkLocation();"/>
|
||||
<hbox align="center">
|
||||
<checkbox id="MakeRelativeLink"
|
||||
for="hrefInput"
|
||||
|
|
|
|||
|
|
@ -324,6 +324,15 @@
|
|||
align="center"
|
||||
flex="1"
|
||||
class="chromeclass-toolbar-additional">
|
||||
<!-- Mimic the search/clear buttons of the standard search textbox,
|
||||
but adjust for the reality that clear doesn't make much sense
|
||||
since gloda results only show in a tab and the idiom for closing
|
||||
tabs is closing the tab. Our binding does process escape to
|
||||
clear the box, if people want to clear it that way...
|
||||
-->
|
||||
<hbox>
|
||||
<image class="gloda-search-icon"/>
|
||||
</hbox>
|
||||
<textbox id="searchInput"
|
||||
class="searchBox"
|
||||
flex="1"
|
||||
|
|
@ -337,18 +346,7 @@
|
|||
placeholder=""
|
||||
emptytextbase="&search.label.base1;"
|
||||
keyLabelNonMac="&search.keyLabel.nonmac;"
|
||||
keyLabelMac="&search.keyLabel.mac;"
|
||||
>
|
||||
<!-- Mimic the search/clear buttons of the standard search textbox,
|
||||
but adjust for the reality that clear doesn't make much sense
|
||||
since gloda results only show in a tab and the idiom for closing
|
||||
tabs is closing the tab. Our binding does process escape to
|
||||
clear the box, if people want to clear it that way...
|
||||
-->
|
||||
<hbox>
|
||||
<image class="gloda-search-icon"/>
|
||||
</hbox>
|
||||
</textbox>
|
||||
keyLabelMac="&search.keyLabel.mac;"/>
|
||||
</toolbaritem>
|
||||
#endif
|
||||
<toolbarbutton id="button-compact" class="toolbarbutton-1"
|
||||
|
|
|
|||
|
|
@ -763,6 +763,9 @@
|
|||
<spacer flex="1" />
|
||||
<spacer flex="1" />
|
||||
<hbox flex="1" class="remote-gloda-search-container">
|
||||
<hbox>
|
||||
<image class="gloda-search-icon" />
|
||||
</hbox>
|
||||
<textbox class="remote-gloda-search searchBox"
|
||||
flex="1"
|
||||
type="glodacomplete"
|
||||
|
|
@ -775,11 +778,7 @@
|
|||
placeholder=""
|
||||
emptytextbase="&search.label.base1;"
|
||||
keyLabelNonMac="&search.keyLabel.nonmac;"
|
||||
keyLabelMac="&search.keyLabel.mac;">
|
||||
<hbox>
|
||||
<image class="gloda-search-icon" />
|
||||
</hbox>
|
||||
</textbox>
|
||||
keyLabelMac="&search.keyLabel.mac;"/>
|
||||
</hbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
|
|
|||
|
|
@ -78,8 +78,9 @@
|
|||
this.collapsed = !this.glodaEnabled;
|
||||
|
||||
// make sure we set our emptytext here from the get-go
|
||||
if (this.hasAttribute("placeholder"))
|
||||
this.placeholder = this.getAttribute("placeholder");
|
||||
if (this.hasAttribute("placeholder")) {
|
||||
this.placeholder = this.getAttribute("placeholder");
|
||||
}
|
||||
} catch (e) {
|
||||
let { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
|
||||
logException(e, true);
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
<richlistbox id="addressingWidget" style="height: 15em;" onclick="awClickEmptySpace(event.target, true)">
|
||||
<richlistitem class="addressingWidgetItem" allowevents="true">
|
||||
<hbox class="addressingWidgetCell" flex="1">
|
||||
<image onclick="this.nextElementSibling.select();" class="person-icon"/>
|
||||
<textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
|
||||
type="autocomplete" flex="1"
|
||||
autocompletesearch="addrbook ldap"
|
||||
|
|
@ -67,9 +68,7 @@
|
|||
minresultsforpopup="3"
|
||||
ontextentered="awRecipientTextCommand(param, this); if (param && this.value != '') param.preventDefault();"
|
||||
onkeydown="awRecipientKeyDown(event, this);"
|
||||
onclick="awNotAnEmptyArea(event);">
|
||||
<image onclick="this.parentNode.select();" class="person-icon"/>
|
||||
</textbox>
|
||||
onclick="awNotAnEmptyArea(event);"/>
|
||||
</hbox>
|
||||
</richlistitem>
|
||||
</richlistbox>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@
|
|||
<richlistbox id="addressingWidget" style="height: 15em;" onclick="awClickEmptySpace(event.target, true)">
|
||||
<richlistitem class="addressingWidgetItem" allowevents="true">
|
||||
<hbox class="addressingWidgetCell" flex="1">
|
||||
<image onclick="this.nextElementSibling.select();" class="person-icon"/>
|
||||
<textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
|
||||
type="autocomplete" flex="1"
|
||||
autocompletesearch="addrbook ldap"
|
||||
|
|
@ -78,9 +79,7 @@
|
|||
minresultsforpopup="3"
|
||||
ontextentered="awRecipientTextCommand(param, this); if (param && this.value != '') param.preventDefault();"
|
||||
onkeydown="awRecipientKeyDown(event, this);"
|
||||
onclick="awNotAnEmptyArea(event);">
|
||||
<image onclick="this.parentNode.select();" class="person-icon"/>
|
||||
</textbox>
|
||||
onclick="awNotAnEmptyArea(event);"/>
|
||||
</hbox>
|
||||
</richlistitem>
|
||||
</richlistbox>
|
||||
|
|
|
|||
|
|
@ -58,6 +58,15 @@
|
|||
align="center"
|
||||
flex="1"
|
||||
class="chromeclass-toolbar-additional">
|
||||
<!-- Mimic the search/clear buttons of the standard search textbox,
|
||||
but adjust for the reality that clear doesn't make much sense
|
||||
since gloda results only show in a tab and the idiom for closing
|
||||
tabs is closing the tab. Our binding does process escape to
|
||||
clear the box, if people want to clear it that way...
|
||||
-->
|
||||
<hbox>
|
||||
<image class="gloda-search-icon"/>
|
||||
</hbox>
|
||||
<textbox id="IMSearchInput"
|
||||
class="searchBox"
|
||||
flex="1"
|
||||
|
|
@ -71,18 +80,7 @@
|
|||
placeholder=""
|
||||
emptytextbase="&search.label.base1;"
|
||||
keyLabelNonMac="&search.keyLabel.nonmac;"
|
||||
keyLabelMac="&search.keyLabel.mac;"
|
||||
>
|
||||
<!-- Mimic the search/clear buttons of the standard search textbox,
|
||||
but adjust for the reality that clear doesn't make much sense
|
||||
since gloda results only show in a tab and the idiom for closing
|
||||
tabs is closing the tab. Our binding does process escape to
|
||||
clear the box, if people want to clear it that way...
|
||||
-->
|
||||
<hbox>
|
||||
<image class="gloda-search-icon"/>
|
||||
</hbox>
|
||||
</textbox>
|
||||
keyLabelMac="&search.keyLabel.mac;"/>
|
||||
</toolbaritem>
|
||||
<toolbarbutton is="toolbarbutton-appmenu" id="button-chat-appmenu"
|
||||
type="menu"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче