From b137eab7391be6f610081f67e68a9e7572f2ae14 Mon Sep 17 00:00:00 2001
From: yipstanley <stanley_yip@brown.edu>
Date: Tue, 2 Jul 2019 13:54:35 -0400
Subject: zoom

---
 src/client/views/pdf/Annotation.tsx |  2 +-
 src/client/views/pdf/PDFViewer.tsx  | 37 -------------------------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/client/views/pdf/Annotation.tsx b/src/client/views/pdf/Annotation.tsx
index e88839edd..9718c1406 100644
--- a/src/client/views/pdf/Annotation.tsx
+++ b/src/client/views/pdf/Annotation.tsx
@@ -114,7 +114,7 @@ class RegionAnnotation extends React.Component<IRegionAnnotationProps> {
         if (e.button === 0) {
             let targetDoc = Cast(this.props.document.target, Doc, null);
             if (targetDoc) {
-                DocumentManager.Instance.jumpToDocument(targetDoc, true);
+                DocumentManager.Instance.jumpToDocument(targetDoc, false);
             }
         }
         if (e.button === 2) {
diff --git a/src/client/views/pdf/PDFViewer.tsx b/src/client/views/pdf/PDFViewer.tsx
index 23a4713d4..35bf1c4d7 100644
--- a/src/client/views/pdf/PDFViewer.tsx
+++ b/src/client/views/pdf/PDFViewer.tsx
@@ -540,43 +540,6 @@ export class Viewer extends React.Component<IViewerProps> {
                         console.log("rendered");
                         this._rendered = true;
                     });
-<<<<<<< Updated upstream
-=======
-                    let options = {
-                        bar: this._searchCont.current,
-                        toggleButton: this._searchToggle.current,
-                        findField: this._findField.current,
-                        highlightAllCheckbox: this._highlightAll.current,
-                        caseSensitiveCheckbox: this._caseSensitivity.current,
-                        entireWordCheckbox: this._entireWord.current,
-                        findMsg: this._findMsg.current,
-                        findResultsCount: this._findResults.current,
-                        findPreviousButton: this._previousButton.current,
-                        findNextButton: this._nextButton.current,
-                    }
-                    let findBar = new PDFFindBar.PDFFindBar(options, this._eventBus);
-                    this._eventBus.on("find", (evt: any) => {
-                        // this._pdfFindController.executeCommand('find', {
-                        //     query: "the",
-                        //     phraseSearch: true,
-                        //     caseSensitive: false,
-                        //     highlightAll: true,
-                        //     findPrevious: undefined
-                        // });
-                        this._pdfFindController.executeCommand('find' + evt.type, {
-                            query: evt.query,
-                            phraseSearch: evt.phraseSearch,
-                            caseSensitive: evt.caseSensitive,
-                            entireWord: evt.entireWord,
-                            highlightAll: evt.highlightAll,
-                            findPrevious: evt.findPrevious
-                        });
-                    });
-                    this._eventBus.on("updatefindcontrolstate", (evt: any) => {
-                        // console.log("hello");
-                        findBar.updateUIState(evt.state, evt.previous, evt.matchesCount);
-                    })
->>>>>>> Stashed changes
                     pdfViewer.setDocument(this.props.pdf);
                     this._pdfFindController = new PDFJSViewer.PDFFindController(pdfViewer);
                     // this._pdfFindController._linkService = pdfLinkService;
-- 
cgit v1.2.3-70-g09d2