Merge pull request #12251 from DesWurstes/master

Return the query with the findcontrolstate
mozilla · Aug 20, 2020 · 2e95d08 · 2e95d08
2 parents 164be97 + 72f48ee
commit 2e95d08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/web/app.js b/web/app.js
@@ -2438,12 +2438,18 @@ function webViewerUpdateFindMatchesCount({ matchesCount }) {
   }
 }
 
-function webViewerUpdateFindControlState({ state, previous, matchesCount }) {
+function webViewerUpdateFindControlState({
+  state,
+  previous,
+  matchesCount,
+  rawQuery,
+}) {
   if (PDFViewerApplication.supportsIntegratedFind) {
     PDFViewerApplication.externalServices.updateFindControlState({
       result: state,
       findPrevious: previous,
       matchesCount,
+      rawQuery,
     });
   } else {
     PDFViewerApplication.findBar.updateUIState(state, previous, matchesCount);

diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js
@@ -736,6 +736,7 @@ class PDFFindController {
       state,
       previous,
       matchesCount: this._requestMatchesCount(),
+      rawQuery: this._state ? this._state.query : null,
     });
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -736,6 +736,7 @@ class PDFFindController { @@
           state,
           previous,
           matchesCount: this._requestMatchesCount(),
+          rawQuery: this._state ? this._state.query : null,
         });
       }
     }
@@ Expand Down @@