mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webcontents: provide position of match with found-in-page event

Browse source
This commit is contained in:
Robo 2016-03-14 06:49:45 +05:30
parent b2059ec8af
commit 8378cbb1e8
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/api/atom_api_web_contents.cc
View file

@ -456,6 +456,7 @@ void WebContents::FindReply(content::WebContents* web_contents,
result.Set("requestId", request_id);
result.Set("selectionArea", selection_rect);
result.Set("finalUpdate", final_update);
result.Set("activeMatchOrdinal", active_match_ordinal);
Emit("found-in-page", result);
} else if (final_update) {
result.Set("requestId", request_id);

1
docs/api/web-contents.md
View file

@ -259,6 +259,7 @@ Returns:
* `result` Object
* `requestId` Integer
* `finalUpdate` Boolean - Indicates if more responses are to follow.
* `activeMatchOrdinal` Integer (optional) - Position of the active match.
* `matches` Integer (optional) - Number of Matches.
* `selectionArea` Object (optional) - Coordinates of first match region.

1
docs/api/web-view-tag.md
View file

@ -573,6 +573,7 @@ Returns:
* `result` Object
* `requestId` Integer
* `finalUpdate` Boolean - Indicates if more responses are to follow.
* `activeMatchOrdinal` Integer (optional) - Position of the active match.
* `matches` Integer (optional) - Number of Matches.
* `selectionArea` Object (optional) - Coordinates of first match region.

13
spec/webview-spec.js
View file

@ -642,12 +642,21 @@ describe('<webview> tag', function() {
describe('found-in-page event', function() {
it('emits when a request is made', function(done) {
var requestId = null;
var totalMatches = null;
var activeMatchOrdinal = [];
var listener = function(e) {
assert.equal(e.result.requestId, requestId);
if (e.result.finalUpdate) {
assert.equal(e.result.matches, 3);
webview.stopFindInPage("clearSelection");
done();
totalMatches = e.result.matches;
listener2();
} else {
activeMatchOrdinal.push(e.result.activeMatchOrdinal);
if (e.result.activeMatchOrdinal == totalMatches) {
assert.deepEqual(activeMatchOrdinal, [1, 2, 3]);
webview.stopFindInPage("clearSelection");
done();
}
}
};
var listener2 = function() {