Bug 250910 - ind toolbar: initialize with the current selection. patch by Michael Ventnor <ventnor.bugzilla@yahoo.com.au>, r=me, ui-r=mconnor.
This commit is contained in:
mozilla.mano%sent.com
Родитель
944febbbda
Коммит
185280d0d2
|
|
@ -148,6 +148,7 @@ pref("accessibility.typeaheadfind.timeout", 4000);
|
|||
pref("accessibility.typeaheadfind.enabletimeout", true);
|
||||
pref("accessibility.typeaheadfind.soundURL", "beep");
|
||||
pref("accessibility.typeaheadfind.enablesound", true);
|
||||
pref("accessibility.typeaheadfind.prefillwithselection", true);
|
||||
|
||||
pref("browser.history_expire_days", 9);
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
return;
|
||||
}
|
||||
|
||||
this.findbar._findAgain(aEvent.shiftKey);
|
||||
this.findbar.onFindAgainCommand(aEvent.shiftKey);
|
||||
}
|
||||
else {
|
||||
// We need to keep a reference to _foundLink because
|
||||
|
|
@ -265,6 +265,11 @@
|
|||
<field name="_flashFindBar">0</field>
|
||||
<field name="_initialFlashFindBarCount">6</field>
|
||||
|
||||
<property name="prefillWithSelection"
|
||||
onget="return this.getAttribute('prefillwithselection') != 'false'"
|
||||
onset="this.setAttribute('prefillwithselection', val); return val;"/>
|
||||
<field name="_selectionMaxLen">150</field>
|
||||
|
||||
<method name="getElement">
|
||||
<parameter name="aAnonymousID"/>
|
||||
<body><![CDATA[
|
||||
|
|
@ -1091,6 +1096,8 @@
|
|||
|
||||
if (this._findMode != this.FIND_NORMAL)
|
||||
this._setFindCloseTimeout();
|
||||
|
||||
return res;
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
|
|
@ -1166,6 +1173,42 @@
|
|||
]]></body>
|
||||
</method>
|
||||
|
||||
<method name="_getInitialSelection">
|
||||
<body><![CDATA[
|
||||
var focusedElement = document.commandDispatcher.focusedElement;
|
||||
var selText;
|
||||
|
||||
if (focusedElement instanceof Components.interfaces.nsIDOMNSEditableElement &&
|
||||
focusedElement.ownerDocument.defaultView.top == this._browser.contentWindow)
|
||||
{
|
||||
// The user may have a selection in an input or textarea
|
||||
selText = focusedElement.editor.selectionController
|
||||
.getSelection(Components.interfaces.nsISelectionController.SELECTION_NORMAL)
|
||||
.toString();
|
||||
}
|
||||
else {
|
||||
// Look for any selected text on the actual page
|
||||
var focusedWindow = document.commandDispatcher.focusedWindow;
|
||||
if (focusedWindow.top == this._browser.contentWindow)
|
||||
selText = focusedWindow.getSelection().toString();
|
||||
}
|
||||
|
||||
if (!selText)
|
||||
return "";
|
||||
|
||||
// Process our text to get rid of unwanted characters
|
||||
if (selText.length > this._selectionMaxLen) {
|
||||
var pattern = new RegExp("^(?:\\s*.){0," + this._selectionMaxLen + "}");
|
||||
pattern.test(selText);
|
||||
selText = RegExp.lastMatch;
|
||||
}
|
||||
return selText.replace(/^\s+/, "")
|
||||
.replace(/\s+$/, "")
|
||||
.replace(/\s+/g, " ")
|
||||
.substr(0, this._selectionMaxLen);
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
<!--
|
||||
- Opens the findbar, focuses the findfield and selects its contents.
|
||||
- Also flashes the findbar the first time it's used.
|
||||
|
|
@ -1177,18 +1220,32 @@
|
|||
<method name="startFind">
|
||||
<parameter name="aMode"/>
|
||||
<body><![CDATA[
|
||||
var prefsvc =
|
||||
Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefBranch2);
|
||||
var userWantsPrefill = true;
|
||||
this.open(aMode);
|
||||
|
||||
if (this._flashFindBar) {
|
||||
this._flashFindBarTimeout =
|
||||
setInterval(function(aSelf) { aSelf._flash(); }, 500, this);
|
||||
var prefsvc =
|
||||
Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefBranch2);
|
||||
|
||||
prefsvc.setIntPref("accessibility.typeaheadfind.flashBar",
|
||||
--this._flashFindBar);
|
||||
}
|
||||
|
||||
if (this.prefillWithSelection)
|
||||
userWantsPrefill =
|
||||
prefsvc.getBoolPref("accessibility.typeaheadfind.prefillwithselection");
|
||||
|
||||
var initialString = (this.prefillWithSelection && userWantsPrefill) ?
|
||||
this._getInitialSelection() : null;
|
||||
if (initialString) {
|
||||
this._findField.value = initialString;
|
||||
this._enableFindButtons(true);
|
||||
}
|
||||
else if (!this._findField.value)
|
||||
this._enableFindButtons(false);
|
||||
|
||||
this._findField.select();
|
||||
this._findField.focus();
|
||||
]]></body>
|
||||
|
|
@ -1214,13 +1271,20 @@
|
|||
<method name="onFindAgainCommand">
|
||||
<parameter name="aFindPrevious"/>
|
||||
<body><![CDATA[
|
||||
var findString = this.browser.fastFind.searchString;
|
||||
var findString = this._browser.fastFind.searchString || this._findField.value;
|
||||
if (!findString) {
|
||||
this.startFind();
|
||||
return;
|
||||
}
|
||||
|
||||
var res = this._findAgain(aFindPrevious);
|
||||
var res;
|
||||
// Ensure the stored SearchString is in sync with what we want to find
|
||||
if (this._findField.value != this._browser.fastFind.searchString &&
|
||||
!this.hidden)
|
||||
res = this._find(this._findField.value);
|
||||
else
|
||||
res = this._findAgain(aFindPrevious);
|
||||
|
||||
if (res == this.nsITypeAheadFind.FIND_NOTFOUND) {
|
||||
if (this.open()) {
|
||||
if (this._findMode != this.FIND_NORMAL)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче