зеркало из https://github.com/mozilla/gecko-dev.git
Bug 179050 Reuse <textbox type="timed"> in mailnews r=Mnyromyr sr=bienvenu
This commit is contained in:
Родитель
25c4968b91
Коммит
1216181f00
|
@ -1930,7 +1930,7 @@
|
|||
<hbox id="searchBox" persist="collapsed" align="center" flex="1">
|
||||
<label id="searchCriteria" value="&SearchSubjectOrSender.label;" control="searchInput"
|
||||
accesskey="&SearchSubjectOrSender.accesskey;"/>
|
||||
<textbox id="searchInput" flex="5" onfocus="this.select();" onclick="this.select();" oninput="onSearchInput(false);" onkeypress="onSearchKeyPress(event);"/>
|
||||
<textbox id="searchInput" flex="1" onfocus="this.select();" onclick="this.select();" onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) this.select();" oncommand="onEnterInSearchBar();" type="timed" timeout="800"/>
|
||||
<button id="clearButton" label="&clearButton.label;" disabled="true" tooltiptext="&clearButton.tooltip;" oncommand="onClearSearch();"
|
||||
accesskey="&clearButton.accesskey;"/>
|
||||
<button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"
|
||||
|
|
|
@ -44,7 +44,6 @@ var gViewSearchListener;
|
|||
var gSearchBundle;
|
||||
var gStatusBar = null;
|
||||
var gSearchInProgress = false;
|
||||
var gSearchInput = null;
|
||||
var gClearButton = null;
|
||||
var gDefaultSearchViewTerms = null;
|
||||
var gQSViewIsDirty = false;
|
||||
|
@ -472,31 +471,6 @@ function onSearchStop()
|
|||
gSearchSession.interruptSearch();
|
||||
}
|
||||
|
||||
function onSearchKeyPress(event)
|
||||
{
|
||||
// 13 == return
|
||||
if (event && event.keyCode == 13)
|
||||
onSearchInput(true);
|
||||
}
|
||||
|
||||
function onSearchInput(returnKeyHit)
|
||||
{
|
||||
if (gSearchTimer) {
|
||||
clearTimeout(gSearchTimer);
|
||||
gSearchTimer = null;
|
||||
}
|
||||
|
||||
// only select the text when the return key was hit
|
||||
if (returnKeyHit) {
|
||||
GetSearchInput();
|
||||
gSearchInput.select();
|
||||
onEnterInSearchBar();
|
||||
}
|
||||
else {
|
||||
gSearchTimer = setTimeout("onEnterInSearchBar();", 800);
|
||||
}
|
||||
}
|
||||
|
||||
function onClearSearch()
|
||||
{
|
||||
// Use the last focused element so that focus can be restored
|
||||
|
@ -535,7 +509,7 @@ function Search(str)
|
|||
}
|
||||
|
||||
gSearchInput.value = str; //on input does not get fired for some reason
|
||||
onSearchInput(true);
|
||||
onEnterInSearchBar();
|
||||
}
|
||||
|
||||
function saveViewAsVirtualFolder()
|
||||
|
|
Загрузка…
Ссылка в новой задаче