зеркало из https://github.com/mozilla/pjs.git
Bug 278398 forced autocomplete ignores typing after search r=mscott sr=bienvenu
This commit is contained in:
Родитель
9efb84ea7d
Коммит
eb02eea264
|
@ -527,7 +527,7 @@
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<method name="startLookup">
|
<method name="startLookup">
|
||||||
<body><![CDATA[
|
<body><![CDATA[
|
||||||
var str = this.value;
|
var str = this.currentSearchString;
|
||||||
|
|
||||||
this.isSearching = true;
|
this.isSearching = true;
|
||||||
this.mSessionReturns = this.sessionCount;
|
this.mSessionReturns = this.sessionCount;
|
||||||
|
@ -703,6 +703,12 @@
|
||||||
} else if (this.mTransientValue || !this.forceComplete ||
|
} else if (this.mTransientValue || !this.forceComplete ||
|
||||||
!(this.mNeedToComplete || aForceComplete)) {
|
!(this.mNeedToComplete || aForceComplete)) {
|
||||||
this.mNeedToFinish = false;
|
this.mNeedToFinish = false;
|
||||||
|
} else if (this.isWaiting) {
|
||||||
|
// if the user typed, the search results are out of date, so let
|
||||||
|
// the search finish, and tell it to come back here when it's done
|
||||||
|
this.mFinishAfterSearch = true;
|
||||||
|
this.mFireAfterSearch = aFireTextCommand;
|
||||||
|
return;
|
||||||
} else {
|
} else {
|
||||||
// we want to use the default item index for the first session which gave us a valid
|
// we want to use the default item index for the first session which gave us a valid
|
||||||
// default item index...
|
// default item index...
|
||||||
|
@ -721,7 +727,7 @@
|
||||||
if (this.mNeedToFinish) {
|
if (this.mNeedToFinish) {
|
||||||
// if a search is happening at this juncture, bail out of this function
|
// if a search is happening at this juncture, bail out of this function
|
||||||
// and let the search finish, and tell it to come back here when it's done
|
// and let the search finish, and tell it to come back here when it's done
|
||||||
if (this.isSearching || this.isWaiting) {
|
if (this.isSearching) {
|
||||||
this.mFinishAfterSearch = true;
|
this.mFinishAfterSearch = true;
|
||||||
this.mFireAfterSearch = aFireTextCommand;
|
this.mFireAfterSearch = aFireTextCommand;
|
||||||
return;
|
return;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче