From 4b31f043308b2f96e8935d65002524afe91c78a0 Mon Sep 17 00:00:00 2001
From: frankdelange <github-f@unternet.org>
Date: Wed, 29 Mar 2017 15:42:27 +0200
Subject: [PATCH] files_reade: working towards working search, W.I.P.

---
 files_reader/appinfo/app.php                  |  12 -
 files_reader/js/plugin.js                     |   2 +-
 files_reader/templates/.pdfreader.php.swp     | Bin 36864 -> 40960 bytes
 files_reader/templates/pdfreader.php          |   1 +
 files_reader/vendor/pdfjs/.pdf.reader.js.swp  | Bin 53248 -> 53248 bytes
 .../controllers/.outline_controller.js.swp    | Bin 20480 -> 12288 bytes
 .../pdfjs/controllers/outline_controller.js   |  27 +-
 .../pdfjs/controllers/search_controller.js    | 548 +++++++++++++++---
 .../pdfjs/controllers/sidebar_controller.js   |   2 +
 .../pdfjs/controllers/toc_controller.js       |  12 +-
 files_reader/vendor/pdfjs/css/.main.css.swp   | Bin 24576 -> 0 bytes
 files_reader/vendor/pdfjs/css/main.css        |   3 +-
 files_reader/vendor/pdfjs/css/sidebar.css     |   3 +-
 files_reader/vendor/pdfjs/pdf.reader.js       | 143 ++---
 14 files changed, 580 insertions(+), 173 deletions(-)
 delete mode 100644 files_reader/vendor/pdfjs/css/.main.css.swp

diff --git a/files_reader/appinfo/app.php b/files_reader/appinfo/app.php
index 05dcc5c..b4a31cc 100644
--- a/files_reader/appinfo/app.php
+++ b/files_reader/appinfo/app.php
@@ -18,15 +18,3 @@ use OCP\Util;
 \OCA\Files_Reader\Hooks::register();
 Util::addscript('files_reader', 'plugin');
 
-if(class_exists('\\OCP\\AppFramework\\Http\\EmptyContentSecurityPolicy')) {
-	$manager = \OC::$server->getContentSecurityPolicyManager();
-	$csp = new \OCP\AppFramework\Http\EmptyContentSecurityPolicy();
-	$csp->addAllowedStyleDomain('\'self\'');
-	$csp->addAllowedStyleDomain('blob:');	
-	$csp->addAllowedScriptDomain('\'self\'');
-	$csp->addAllowedFrameDomain('\'self\'');
-	$csp->addAllowedChildSrcDomain('\'self\'');
-	$csp->addAllowedFontDomain('\'self\'');
-	$csp->addAllowedImageDomain('blob:');
-	$manager->addDefaultPolicy($csp);
-}
diff --git a/files_reader/js/plugin.js b/files_reader/js/plugin.js
index 8950b61..329cddb 100644
--- a/files_reader/js/plugin.js
+++ b/files_reader/js/plugin.js
@@ -79,7 +79,7 @@
 			if (isMobile || hasTouch) {
 				window.open(viewer, downloadUrl);
             		} else {
-				$iframe = '<iframe style="width:100%;height:100%;display:block;position:absolute;top:0;" src="' + viewer + '" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"  sandbox="allow-scripts allow-same-origin"/>';
+				$iframe = '<iframe style="width:100%;height:100%;display:block;position:absolute;top:0;" src="' + viewer + '" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"  sandbox="allow-popups allow-scripts allow-same-origin"/>';
 				if (isFileList === true) {
 					FileList.setViewerMode(true);
 				}
diff --git a/files_reader/templates/.pdfreader.php.swp b/files_reader/templates/.pdfreader.php.swp
index c20a12cf260f5292d0a18d96957eb58661ffe059..cf98255a9d2b1f262de1fe8c4c45287e688c393f 100644
GIT binary patch
delta 392
zcmXZXze@sP9LMqRotJ6;IK#~#ZV`!~tVn8zj;72Gf*=Ya(xM**LH+~k7}4Sl)+W@@
z5W#hGlnu2tMzq*iTR61Z``{jU@qIqe@I0TV)>3OvYO0i7%Uj0GSXNjGk<icQ`lIqE
zcO@tFt?!4V$GM6LD84?XhDkqr`wVh^4l?Jk>F0jtJTCnlVlLvt&tZ2X(bVq^&8Tki
zRy@EtUA!x2b&->}$W2V76BQZ4YD8oTR|6uyVUZG+kjFK5U*H@^C}SA~4C9?HZ6v);
z=+X5H9XtnRRN8DBC}J8epUt4fC)2p4+z8?U$JtihSF;;!tZ1<}dUfIT*6cwusf^oc
iv#Gqe4`wA|7YnD_-r@1CUAJ<CGp$(JIdJP%b>Sc8^*@mS

delta 186
zcmZoTz|^pSNh--8%+puFLeGE!2m}}y66f8F_|5c<VS)EXsTcg=><s^b;!Hqn2*iv~
z%mSpffY=DiX9d!>KpX?*vjJ&)Af5^3vjb@lAie?Rb8OBOn9e`ZKwy&sivlk<Q1mzu
sgRIw@EEpins5MzNU^?UZ&3glixF;+4v~2$6$HqAMzE9_7r?`EN09nl<;s5{u

diff --git a/files_reader/templates/pdfreader.php b/files_reader/templates/pdfreader.php
index 2ae4298..da97607 100644
--- a/files_reader/templates/pdfreader.php
+++ b/files_reader/templates/pdfreader.php
@@ -50,6 +50,7 @@
 		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/pdf.reader.js')) ?>?v=<?php p($version) ?>"> </script>
 		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/controllers/progress_controller.js')) ?>?v=<?php p($version) ?>"> </script>
 		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/controllers/textlayer_controller.js')) ?>?v=<?php p($version) ?>"> </script>
+		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/controllers/search_controller.js')) ?>?v=<?php p($version) ?>"> </script>
 		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/controllers/reader_controller.js')) ?>?v=<?php p($version) ?>"> </script>
 		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/controllers/sidebar_controller.js')) ?>?v=<?php p($version) ?>"> </script>
 		<script type="text/javascript" nonce="<?php p($nonce) ?>" src="<?php p($urlGenerator->linkTo('files_reader', 'vendor/pdfjs/controllers/settings_controller.js')) ?>?v=<?php p($version) ?>"> </script>
diff --git a/files_reader/vendor/pdfjs/.pdf.reader.js.swp b/files_reader/vendor/pdfjs/.pdf.reader.js.swp
index d46eb6b937f8d9ea7aaaea5bbc3acc522d8fc835..54c25cbc15eaec8e276f88f5d9b4694a167b99e8 100644
GIT binary patch
delta 5869
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

delta 5977
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
E1J4a{p#T5?

diff --git a/files_reader/vendor/pdfjs/controllers/.outline_controller.js.swp b/files_reader/vendor/pdfjs/controllers/.outline_controller.js.swp
index 561889a21ab81a84fcdcf2ed617ad16ffc9af159..40f430a9cb781458a4d5b927c71f0c8cc32ed4c1 100644
GIT binary patch
delta 699
zcmYk)PblPJ7{Kx8XZ)EN#$dOssbvn7r5L3_+qQ*5Vh(C37c-3f&~GM@)Yc%o+wSJT
zkE?KTWOkI|;!j~p%_!@z$#Pi^+E(Ns;wu+VeV*Rlx2K-x?HQg`hTCjjhr6!9US8x7
zB27g7^t<ID?nb(`kS%JMa3qBP8D6JY6?x!24&zY5C23LXM9e;EkGFIwB1?wn>Tx~Y
zo)b*9id?6PTwxzE%wrCt7=a%eYEX(dxV4C!;RJthfCzRmjXt!(2?q+1g;%g58D@(F
z<v2y;2pd?(0*2s+h9=~~hAb%9OBUJ08dmWYU(kbgcu|3J6yVM*a*ktcVH4AsG6yN-
z(28cbQHyF+!H6X6oA??0L<nQ3M<z~<B0JcI4lg`N#Ay;u;s?IN3lE%li^E`|$P83e
zpb!PPPY}7pe;gu)D3<XJpD_j%?@<OP?&FyjE0{tLy5T}4vXOyHmf!-}XQaP4LIf)a
z<7rD44WW%rMb|z~>W!{JOTK@gzgN|KZq+yVPLH_CGEFaTiaddUPwS}aQhW7Zx$EIj
Lo@&xR6mLBO#jbvB

delta 1311
zcmZ|PU2GIp6u|LQT4)zrwhg5*eURH_O1G8HRxz;&kxCnh@+A+@n2=Dno!Q+9+nF*S
zyGA3+gGrwd=#bc$C>06`ViB@W1|cB`QNx!{1VfC88b~yLBwCCyssC9v8XmmKZ|2U-
zIp^M)xikA;-9J;)KH4|@(pJ^4_X(|8WZ&$aR~8n{%j3qm_M5ef13%N-U;eqawJ}vI
z3xq7f6l$vK*w^Do^|+S(W0)?tG~bL*sk){wIa(c^rutOaqE?pL<03yU6Zs0aa0YWI
zVIM}Y8(Xj$8d~s2lgMp+h70%<=Wr4y;NoTUV>z18fcZv|U-1*}H%dwF(K(M#@IKzd
zTNuU`Y(^hy@PNCS$2T~IqnO4!FffJ}@jM35h83vCouwjIa2_)_3U_HqWG|gD^y3+<
zMJGC-@Iy@Gdz`@>4&rU3k;Lx}A{Q}><Cwqz*5f-~$3;vdhb#uL9?S7pX^BV~Z(t+Z
z(13b;y;$T1uA_`Oe1y|Dj6(>p2^;YOdhj>v;7>fj7x)~PFo_ZD#t;UvwUy1ctcdHl
zhSNBJ9I{x8r_qaO<#gc}7Tz@+$1zOebx62Dd#x^Sd470Rd#YK{dQuX5vwNLLEEWqt
z&{|7++AxOlY0pb0#sb$hZGR}2p72dKQH_elbk`hr3g-VtQHr4d>Npdo{cn+IAT64L
zp0R8rnb02{rIhHd%w^PZ_UKv1canjdXJoQcDdxK)XR4iUUX2HyuSQLkaRS>=maTj)
zL`j|+Puo_;^!$f8y}fF?>l7@*tb_~_qKcNEs~k~V`Hu2(PO&noSqOJ%?E{6htD;NK
z5oCFK*7P^{zH5yJzM1UGxn`y-n$aV7;RJr(vds}Td&0Y#YKtCjs)wo%!_pHx1S1*#
zwt7YQWap{2F~|0tys77%Y_gh5&GL;-C)N?AMy-;`B(!8=RW)YVGK-1sa9!%kVA>GT
z`8n8#eiwW~a+m%se2foq0<(A*lL)XEQO<b0+|j%y9-dt_#k&%Df^*vt)net#0{zRF
WK@kP)!nP<+#lu0ZSXW(2&;A2%><&=?

diff --git a/files_reader/vendor/pdfjs/controllers/outline_controller.js b/files_reader/vendor/pdfjs/controllers/outline_controller.js
index 229c9a8..2bada46 100644
--- a/files_reader/vendor/pdfjs/controllers/outline_controller.js
+++ b/files_reader/vendor/pdfjs/controllers/outline_controller.js
@@ -5,7 +5,6 @@ PDFJS.reader.OutlineController = function(_outline) {
         outline = _outline || [];
 
 	var outlineView = document.getElementById("outlineView"),
-        $list = $("#outlineView"),
         baseUrl = location.href.split('#')[0],
         lastToggleIsShow;
 
@@ -113,9 +112,6 @@ PDFJS.reader.OutlineController = function(_outline) {
         return container;
     }
 
-
-    console.log(outline);
-
 	var onShow = function() {
         outlineView.classList.add('open');
 	};
@@ -124,28 +120,9 @@ PDFJS.reader.OutlineController = function(_outline) {
         outlineView.classList.remove('open');
 	};
 
-	$list.append(generateOutlineItems(outline));
+	outlineView.appendChild(generateOutlineItems(outline));
 
-    /*
-	$list.find(".outline_link").on("click", function(event){
-			var url = this.getAttribute('href');
-
-			event.preventDefault();
-
-			//-- Provide the Book with the url to show
-			//   The Url must be found in the books manifest
-			book.goto(url);
-
-			$list.find(".currentChapter")
-					.addClass("openChapter")
-					.removeClass("currentChapter");
-
-			$(this).parent('li').addClass("currentChapter");
-
-	});
-    */
-
-	$list.find(".outline_toggle").on("click", function(event){
+	$(outlineView).find(".outline_toggle").on("click", function(event){
 			var $el = $(this).parent('li'),
 					open = $el.hasClass("openChapter");
 
diff --git a/files_reader/vendor/pdfjs/controllers/search_controller.js b/files_reader/vendor/pdfjs/controllers/search_controller.js
index 3a51bde..af2912a 100644
--- a/files_reader/vendor/pdfjs/controllers/search_controller.js
+++ b/files_reader/vendor/pdfjs/controllers/search_controller.js
@@ -1,11 +1,36 @@
+var FindStates = {
+    FIND_FOUND: 0,
+    FIND_NOTFOUND: 1,
+    FIND_WRAPPED: 2,
+    FIND_PENDING: 3
+};
+
+var FIND_SCROLL_OFFSET_TOP = -50;
+var FIND_SCROLL_OFFSET_LEFT = -400;
+
+var CHARACTERS_TO_NORMALIZE = {
+    '\u2018': '\'', // Left single quotation mark
+    '\u2019': '\'', // Right single quotation mark
+    '\u201A': '\'', // Single low-9 quotation mark
+    '\u201B': '\'', // Single high-reversed-9 quotation mark
+    '\u201C': '"', // Left double quotation mark
+    '\u201D': '"', // Right double quotation mark
+    '\u201E': '"', // Double low-9 quotation mark
+    '\u201F': '"', // Double high-reversed-9 quotation mark
+    '\u00BC': '1/4', // Vulgar fraction one quarter
+    '\u00BD': '1/2', // Vulgar fraction one half
+    '\u00BE': '3/4', // Vulgar fraction three quarters
+};
+
 PDFJS.reader.SearchController = function () {
+
     var reader = this,
         book = this.book,
         query = "";
 
     var $searchBox = $("#searchBox"),
         $clearBtn = $("#searchBox").next(),
-        $clear_search = $("#clear_search"), 
+        $clear_search = $("#clear_search"),
         $searchResults = $("#searchResults"),
         $searchView = $("#searchView"),
         $body = $("#viewer iframe").contents().find('body'),
@@ -21,6 +46,456 @@ PDFJS.reader.SearchController = function () {
         $searchView.removeClass("open");
     };
 
+    this.onUpdateResultsCount = null;
+    this.onUpdateState = null;
+
+    // Compile the regular expression for text normalization once.
+    var replace = Object.keys(CHARACTERS_TO_NORMALIZE).join('');
+    this.normalizationRegex = new RegExp('[' + replace + ']', 'g');
+
+    var reset = function () {
+        this.startedTextExtraction = false;
+        this.extractTextPromises = [];
+        this.pendingFindMatches = Object.create(null);
+        this.active = false; // If active, find results will be highlighted.
+        this.pageContents = []; // Stores the text for each page.
+        this.pageMatches = [];
+        this.pageMatchesLength = null;
+        this.matchCount = 0;
+        this.selected = { // Currently selected match.
+            pageIdx: -1,
+            matchIdx: -1
+        };
+        this.offset = { // Where the find algorithm currently is in the document.
+            pageIdx: null,
+            matchIdx: null
+        };
+        this.pagesToSearch = null;
+        this.resumePageIdx = null;
+        this.state = null;
+        this.dirtyMatch = false;
+        this.findTimeout = null;
+    };
+
+    reset();
+
+
+    var normalize = function (text) {
+        return text.replace(this.normalizationRegex, function (ch) {
+            return CHARACTERS_TO_NORMALIZE[ch];
+        });
+    };
+
+    // Helper for multiple search - fills matchesWithLength array
+    // and takes into account cases when one search term
+    // include another search term (for example, "tamed tame" or "this is").
+    // Looking for intersecting terms in the 'matches' and
+    // leave elements with a longer match-length.
+
+    var _prepareMatches = function (
+        matchesWithLength, matches, matchesLength) {
+
+            function isSubTerm(matchesWithLength, currentIndex) {
+                var currentElem, prevElem, nextElem;
+                currentElem = matchesWithLength[currentIndex];
+                nextElem = matchesWithLength[currentIndex + 1];
+                // checking for cases like "TAMEd TAME"
+                if (currentIndex < matchesWithLength.length - 1 &&
+                    currentElem.match === nextElem.match) {
+                        currentElem.skipped = true;
+                        return true;
+                    }
+                // checking for cases like "thIS IS"
+                for (var i = currentIndex - 1; i >= 0; i--) {
+                    prevElem = matchesWithLength[i];
+                    if (prevElem.skipped) {
+                        continue;
+                    }
+                    if (prevElem.match + prevElem.matchLength < currentElem.match) {
+                        break;
+                    }
+                    if (prevElem.match + prevElem.matchLength >=
+                        currentElem.match + currentElem.matchLength) {
+                            currentElem.skipped = true;
+                            return true;
+                        }
+                }
+                return false;
+            }
+
+            var i, len;
+            // Sorting array of objects { match: <match>, matchLength: <matchLength> }
+            // in increasing index first and then the lengths.
+            matchesWithLength.sort(function(a, b) {
+                return a.match === b.match ?
+                    a.matchLength - b.matchLength : a.match - b.match;
+            });
+            for (i = 0, len = matchesWithLength.length; i < len; i++) {
+                if (isSubTerm(matchesWithLength, i)) {
+                    continue;
+                }
+                matches.push(matchesWithLength[i].match);
+                matchesLength.push(matchesWithLength[i].matchLength);
+            }
+        };
+
+    var calcFindPhraseMatch = function (
+        query, pageIndex, pageContent) {
+            var matches = [];
+            var queryLen = query.length;
+            var matchIdx = -queryLen;
+            while (true) {
+                matchIdx = pageContent.indexOf(query, matchIdx + queryLen);
+                if (matchIdx === -1) {
+                    break;
+                }
+                matches.push(matchIdx);
+            }
+            this.pageMatches[pageIndex] = matches;
+        };
+
+    var calcFindWordMatch = function (
+        query, pageIndex, pageContent) {
+            var matchesWithLength = [];
+            // Divide the query into pieces and search for text on each piece.
+            var queryArray = query.match(/\S+/g);
+            var subquery, subqueryLen, matchIdx;
+            for (var i = 0, len = queryArray.length; i < len; i++) {
+                subquery = queryArray[i];
+                subqueryLen = subquery.length;
+                matchIdx = -subqueryLen;
+                while (true) {
+                    matchIdx = pageContent.indexOf(subquery, matchIdx + subqueryLen);
+                    if (matchIdx === -1) {
+                        break;
+                    }
+                    // Other searches do not, so we store the length.
+                    matchesWithLength.push({
+                        match: matchIdx,
+                        matchLength: subqueryLen,
+                        skipped: false
+                    });
+                }
+            }
+            // Prepare arrays for store the matches.
+            if (!this.pageMatchesLength) {
+                this.pageMatchesLength = [];
+            }
+            this.pageMatchesLength[pageIndex] = [];
+            this.pageMatches[pageIndex] = [];
+            // Sort matchesWithLength, clean up intersecting terms
+            // and put the result into the two arrays.
+            _prepareMatches(matchesWithLength, this.pageMatches[pageIndex],
+                this.pageMatchesLength[pageIndex]);
+        };
+
+    var calcFindMatch = function (pageIndex) {
+        var pageContent = normalize(this.pageContents[pageIndex]);
+        var query = normalize(this.state.query);
+        var caseSensitive = this.state.caseSensitive;
+        var phraseSearch = this.state.phraseSearch;
+        var queryLen = query.length;
+
+        if (queryLen === 0) {
+            // Do nothing: the matches should be wiped out already.
+            return;
+        }
+
+        if (!caseSensitive) {
+            pageContent = pageContent.toLowerCase();
+            query = query.toLowerCase();
+        }
+
+        if (phraseSearch) {
+            calcFindPhraseMatch(query, pageIndex, pageContent);
+        } else {
+            calcFindWordMatch(query, pageIndex, pageContent);
+        }
+
+        updatePage(pageIndex);
+        if (this.resumePageIdx === pageIndex) {
+            this.resumePageIdx = null;
+            nextPageMatch();
+        }
+
+        // Update the matches count
+        if (this.pageMatches[pageIndex].length > 0) {
+            this.matchCount += this.pageMatches[pageIndex].length;
+            updateUIResultsCount();
+        }
+    };
+
+    var extractText = function () {
+
+        if (this.startedTextExtraction) {
+            return;
+        }
+        this.startedTextExtraction = true;
+
+        this.pageContents = [];
+        var extractTextPromisesResolves = [];
+        var numPages = reader.settings.numPages;
+        for (var i = 0; i < numPages; i++) {
+            this.extractTextPromises.push(new Promise(function (resolve) {
+                extractTextPromisesResolves.push(resolve);
+            }));
+        }
+
+        var self = this;
+        function extractPageText(pageIndex) {
+            reader.getPageTextContent(pageIndex).then(
+                function textContentResolved(textContent) {
+                    var textItems = textContent.items;
+                    var str = [];
+
+                    for (var i = 0, len = textItems.length; i < len; i++) {
+                        str.push(textItems[i].str);
+                    }
+
+                    // Store the pageContent as a string.
+                    self.pageContents.push(str.join(''));
+
+                    extractTextPromisesResolves[pageIndex](pageIndex);
+                    if ((pageIndex + 1) < reader.settings.numPages) {
+						console.log("extracting text from page " + parseInt(pageIndex + 1));
+                        extractPageText(pageIndex + 1);
+                    } else {
+						console.log("finished extracting text");
+                        for (var i=0;i < reader.settings.numPages;i++) {
+                            console.log("PAGE: " + parseInt(i + 1));
+                            console.log(self.pageContents[i]);	
+                        }
+					}
+                }
+            );
+        }
+        extractPageText(0);
+    };
+
+    var executeCommand = function (cmd, state) {
+        if (this.state === null || cmd !== 'findagain') {
+            this.dirtyMatch = true;
+        }
+        this.state = state;
+        updateUIState(FindStates.FIND_PENDING);
+
+		console.log("execute command ", cmd, " with state ", state);
+
+        reader.firstPagePromise.then(function() {
+            extractText();
+
+            clearTimeout(this.findTimeout);
+            if (cmd === 'find') {
+                // Only trigger the find action after 250ms of silence.
+                this.findTimeout = setTimeout(nextMatch.bind(this), 250);
+            } else {
+                nextMatch();
+            }
+        }.bind(this));
+    };
+
+    var updatePage = function (index) {
+
+        if (this.selected.pageIdx === index) {
+            // If the page is selected, scroll the page into view, which triggers
+            // rendering the page, which adds the textLayer. Once the textLayer is
+            // build, it will scroll onto the selected match.
+            reader.settings.currentPage = index + 1;
+        }
+
+        //var page = this.pdfViewer.getPageView(index);
+        //if (page.textLayer) {
+            //    page.textLayer.updateMatches();
+            //}
+    };
+
+    var nextMatch = function () {
+
+        var previous = this.state.findPrevious;
+        var currentPageIndex = reader.settings.currentPage - 1;
+        var numPages = reader.settings.numPages;
+
+        this.active = true;
+
+        if (this.dirtyMatch) {
+            // Need to recalculate the matches, reset everything.
+            this.dirtyMatch = false;
+            this.selected.pageIdx = this.selected.matchIdx = -1;
+            this.offset.pageIdx = currentPageIndex;
+            this.offset.matchIdx = null;
+            this.hadMatch = false;
+            this.resumePageIdx = null;
+            this.pageMatches = [];
+            this.matchCount = 0;
+            this.pageMatchesLength = null;
+            var self = this;
+
+            for (var i = 0; i < numPages; i++) {
+                // Wipe out any previous highlighted matches.
+                updatePage(i);
+
+                // As soon as the text is extracted start finding the matches.
+                if (!(i in this.pendingFindMatches)) {
+                    this.pendingFindMatches[i] = true;
+                    this.extractTextPromises[i].then(function(pageIdx) {
+                        delete self.pendingFindMatches[pageIdx];
+                        calcFindMatch(pageIdx);
+                    });
+                }
+            }
+        }
+
+        // If there's no query there's no point in searching.
+        if (this.state.query === '') {
+            updateUIState(FindStates.FIND_FOUND);
+            return;
+        }
+
+        // If we're waiting on a page, we return since we can't do anything else.
+        if (this.resumePageIdx) {
+            return;
+        }
+
+        var offset = this.offset;
+        // Keep track of how many pages we should maximally iterate through.
+        this.pagesToSearch = numPages;
+        // If there's already a matchIdx that means we are iterating through a
+        // page's matches.
+        if (offset.matchIdx !== null) {
+            var numPageMatches = this.pageMatches[offset.pageIdx].length;
+            if ((!previous && offset.matchIdx + 1 < numPageMatches) ||
+                (previous && offset.matchIdx > 0)) {
+                    // The simple case; we just have advance the matchIdx to select
+                    // the next match on the page.
+                    this.hadMatch = true;
+                    offset.matchIdx = (previous ? offset.matchIdx - 1 :
+                        offset.matchIdx + 1);
+                    updateMatch(true);
+                    return;
+                }
+            // We went beyond the current page's matches, so we advance to
+            // the next page.
+            advanceOffsetPage(previous);
+        }
+        // Start searching through the page.
+        nextPageMatch();
+    };
+
+    var matchesReady = function (matches) {
+        var offset = this.offset;
+        var numMatches = matches.length;
+        var previous = this.state.findPrevious;
+
+        if (numMatches) {
+            // There were matches for the page, so initialize the matchIdx.
+            this.hadMatch = true;
+            offset.matchIdx = (previous ? numMatches - 1 : 0);
+            updateMatch(true);
+            return true;
+        }
+        // No matches, so attempt to search the next page.
+        advanceOffsetPage(previous);
+        if (offset.wrapped) {
+            offset.matchIdx = null;
+            if (this.pagesToSearch < 0) {
+                // No point in wrapping again, there were no matches.
+                updateMatch(false);
+                // while matches were not found, searching for a page
+                // with matches should nevertheless halt.
+                return true;
+            }
+        }
+        // Matches were not found (and searching is not done).
+        return false;
+    };
+
+    /**
+        * The method is called back from the text layer when match presentation
+        * is updated.
+        * @param {number} pageIndex - page index.
+        * @param {number} index - match index.
+        * @param {Array} elements - text layer div elements array.
+        * @param {number} beginIdx - start index of the div array for the match.
+        */
+        var updateMatchPosition = function (
+            pageIndex, index, elements, beginIdx) {
+                if (this.selected.matchIdx === index &&
+                    this.selected.pageIdx === pageIndex) {
+                        //var spot = {
+                            //    top: FIND_SCROLL_OFFSET_TOP,
+                            //    left: FIND_SCROLL_OFFSET_LEFT
+                            //};
+                        //scrollIntoView(elements[beginIdx], spot,
+                            //        /* skipOverflowHiddenElements = */ true);
+                    }
+                console.log("would scroll into view here except for the fact that Reader is a non-scrolling reader...");
+            };
+
+    var nextPageMatch = function () {
+        if (this.resumePageIdx !== null) {
+            console.error('There can only be one pending page.');
+        }
+        do {
+            var pageIdx = this.offset.pageIdx;
+            var matches = this.pageMatches[pageIdx];
+            if (!matches) {
+                // The matches don't exist yet for processing by "matchesReady",
+                // so set a resume point for when they do exist.
+                this.resumePageIdx = pageIdx;
+                break;
+            }
+        } while (!matchesReady(matches));
+    };
+
+    var advanceOffsetPage = function (previous) {
+        var offset = this.offset;
+        var numPages = this.extractTextPromises.length;
+        offset.pageIdx = (previous ? offset.pageIdx - 1 : offset.pageIdx + 1);
+        offset.matchIdx = null;
+
+        this.pagesToSearch--;
+
+        if (offset.pageIdx >= numPages || offset.pageIdx < 0) {
+            offset.pageIdx = (previous ? numPages - 1 : 0);
+            offset.wrapped = true;
+        }
+    };
+
+    var updateMatch = function (found) {
+        var state = FindStates.FIND_NOTFOUND;
+        var wrapped = this.offset.wrapped;
+        this.offset.wrapped = false;
+
+        if (found) {
+            var previousPage = this.selected.pageIdx;
+            this.selected.pageIdx = this.offset.pageIdx;
+            this.selected.matchIdx = this.offset.matchIdx;
+            state = (wrapped ? FindStates.FIND_WRAPPED : FindStates.FIND_FOUND);
+            // Update the currently selected page to wipe out any selected matches.
+            if (previousPage !== -1 && previousPage !== this.selected.pageIdx) {
+                updatePage(previousPage);
+            }
+        }
+
+        updateUIState(state, this.state.findPrevious);
+        if (this.selected.pageIdx !== -1) {
+            updatePage(this.selected.pageIdx);
+        }
+    };
+
+    var updateUIResultsCount = function () {
+        if (this.onUpdateResultsCount) {
+            onUpdateResultsCount(this.matchCount);
+        }
+    };
+
+    var updateUIState = function (state, previous) {
+        if (this.onUpdateState) {
+            onUpdateState(state, previous, this.matchCount);
+        }
+    };
+
+
     var search = function(q) {
         if (q === undefined) {
             q = $searchBox.val();
@@ -38,7 +513,9 @@ PDFJS.reader.SearchController = function () {
 
         reader.SearchController.query = q;
 
-        runQuery(q, $searchResults[0]);
+        //runQuery(q, $searchResults[0]);
+
+		executeCommand('find', {query: q});
 
     };
 
@@ -84,72 +561,11 @@ PDFJS.reader.SearchController = function () {
         book.off("renderer:chapterDisplayed", highlightQuery);
     };
 
-    // perform search and build result list
-    var runQuery = function(query, element) {
-
-        return new Promise(function(resolve, reject) {
-
-            var results = [];
-
-            for (var i = 0; i < book.spine.length; i++) {
-                var spineItem = book.spine[i];
-                results.push(new Promise(function(resolve, reject) {
-                    new Promise(function(resolve, reject) {
-                        resolve(new PDFJS.Chapter(spineItem, book.store, book.credentials));
-                    }).then(function(chapter) {
-                        return new Promise(function(resolve, reject) {
-                            chapter.load().then(function() {
-                                resolve(chapter);
-                            }).catch(reject);
-                        });
-                    }).then(function(chapter) {
-                        return Promise.resolve(chapter.find(query));
-                    }).then(function(result) {
-                        resolve(result);
-                    });
-                }));
-            }
-            Promise.all(results).then(function(results) {
-                return new Promise(function(resolve, reject) {
-                    resolve(results);
-                    var mergedResults = [].concat.apply([], results);
-                    element.innerHTML = "";
-                    for (var i = 0; i < mergedResults.length; i++) {
-                        try {
-                            var listitem = document.createElement("li");
-                            var link = document.createElement("a");
-                            listitem.classList.add("list_item");
-                            listitem.id = "search-"+i;
-                            link.href=mergedResults[i].cfi;
-                            link.textContent = mergedResults[i].excerpt;
-                            link.classList.add("toc_link");
-                            link.addEventListener("click", function(e) {
-                                e.preventDefault();
-                                book.gotoCfi(this.getAttribute("href"));
-                                $searchResults.find(".list_item")
-                                    .removeClass("currentChapter");
-                                $(this).parent("li").addClass("currentChapter");
-                                $(this).data('query', query);
-                                book.on("renderer:chapterDisplayed", highlightQuery);
-                            });
-                            listitem.appendChild(link);
-                            element.appendChild(listitem);
-                        } catch (e) {
-                            console.warn(e);
-                        }
-                    }
-                });
-            });
-        });
-    };
-
 
     return {
-        "show"  : onShow,
-        "hide"  : onHide,
+        "show": onShow,
+        "hide": onHide,
         "search": search,
-        "query" : query,
-        "clear" : clear,
-        "unhighlight"   : unhighlight
+        "executeCommand": executeCommand
     };
 };
diff --git a/files_reader/vendor/pdfjs/controllers/sidebar_controller.js b/files_reader/vendor/pdfjs/controllers/sidebar_controller.js
index 439851c..f78435c 100644
--- a/files_reader/vendor/pdfjs/controllers/sidebar_controller.js
+++ b/files_reader/vendor/pdfjs/controllers/sidebar_controller.js
@@ -35,6 +35,8 @@ PDFJS.reader.SidebarController = function(book) {
         if (settings.sidebarReflow) reader.ReaderController.slideOut();
         $slider.hide();
         $sidebar.addClass("open");
+        if (getActivePanel() === "Toc")
+            reader.TocController.scrollToPage(settings.currentPage);
     }
 
     var hide = function() {
diff --git a/files_reader/vendor/pdfjs/controllers/toc_controller.js b/files_reader/vendor/pdfjs/controllers/toc_controller.js
index 8d8c0b0..89df621 100644
--- a/files_reader/vendor/pdfjs/controllers/toc_controller.js
+++ b/files_reader/vendor/pdfjs/controllers/toc_controller.js
@@ -177,16 +177,26 @@ PDFJS.reader.TocController = function() {
 
 	var onShow = function() {
         tocView.classList.add('open');
+        scrollToPage(settings.currentPage);
 	};
 
 	var onHide = function() {
         tocView.classList.remove('open');
 	};
 
+    var scrollToPage = function (pageNum) {
+        if (pageNum > 0 && pageNum <= settings.numPages) {
+            thumb = document.getElementById("page_" + pageNum);
+            if (thumb)
+                thumb.scrollIntoView();
+        }
+    };
+
 	return {
 		"show" : onShow,
 		"hide" : onHide,
         "tocInsert": tocInsert,
-        "totPopulate": tocPopulate
+        "totPopulate": tocPopulate,
+        "scrollToPage": scrollToPage
 	};
 };
diff --git a/files_reader/vendor/pdfjs/css/.main.css.swp b/files_reader/vendor/pdfjs/css/.main.css.swp
deleted file mode 100644
index 500883336e19765589cc8636ebfd9ec8ad9d8f62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24576
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
Yh9?@}P!<%qn0U2h=Jo&Z;!tw>Z-L<y!~g&Q

diff --git a/files_reader/vendor/pdfjs/css/main.css b/files_reader/vendor/pdfjs/css/main.css
index f3311ce..df97916 100644
--- a/files_reader/vendor/pdfjs/css/main.css
+++ b/files_reader/vendor/pdfjs/css/main.css
@@ -33,10 +33,11 @@ body {
   overflow: hidden;
   -webkit-transition: -webkit-transform .4s, width .2s;
   -moz-transition: -webkit-transform .4s, width .2s;
-
+  /*
   -moz-box-shadow:    inset 0 0 50px rgba(0,0,0,.1);
   -webkit-box-shadow: inset 0 0 50px rgba(0,0,0,.1);
   box-shadow:         inset 0 0 50px rgba(0,0,0,.1);
+  */
 }
 
 #titlebar {
diff --git a/files_reader/vendor/pdfjs/css/sidebar.css b/files_reader/vendor/pdfjs/css/sidebar.css
index 5b43d7f..c9b259c 100644
--- a/files_reader/vendor/pdfjs/css/sidebar.css
+++ b/files_reader/vendor/pdfjs/css/sidebar.css
@@ -60,8 +60,9 @@
 .sidebar div > button {
     /* font-size: 1.5em; */
     /* font-size: 1em; */
-    padding: 0.4em;
+    padding: 0.4em 0.2em;
     margin: 0;
+    height: 100%;
 }
 
 .mobile .sidebar div > button {
diff --git a/files_reader/vendor/pdfjs/pdf.reader.js b/files_reader/vendor/pdfjs/pdf.reader.js
index dafade0..af53a54 100644
--- a/files_reader/vendor/pdfjs/pdf.reader.js
+++ b/files_reader/vendor/pdfjs/pdf.reader.js
@@ -41,6 +41,7 @@ PDFJS.Reader = function(bookPath, _options) {
         cssZoomOnly: false, // true || false, only zoom using CSS, render document at 100% size
         textSelect: false,   // true || false, add selectable text layer
         doubleBuffer: true, // true || false, draw to off-screen canvas
+        cacheNext: true,    // true || false, pre-render next page (by creathing thumbnail))
         numPages: 0,
         currentPage: 1,
         scale: DEFAULT_SCALE,
@@ -106,9 +107,6 @@ PDFJS.Reader = function(bookPath, _options) {
             canvas: document.getElementById("left"),
             ctx: document.getElementById("left").getContext('2d'),
             textdiv: document.getElementById("text_left"),
-            cache_canvas: null,
-            cache_ctx: null,
-            cache_textdiv: null,
             textLayer: null,
             renderTask: null,
             oscanvas: null,
@@ -119,9 +117,6 @@ PDFJS.Reader = function(bookPath, _options) {
             canvas: document.getElementById("right"),
             ctx: document.getElementById("right").getContext('2d'),
             textdiv: document.getElementById("text_right"),
-            cache_canvas: null,
-            cache_ctx: null,
-            cache_textdiv: null,
             textLayer: null,
             renderTask: null,
             oscanvas: null,
@@ -194,6 +189,9 @@ PDFJS.Reader = function(bookPath, _options) {
                 reader.settings.currentPage = parseInt(reader.settings.session.cursor.anchor);
             }
 
+            var firstPagePromise = book.getPage(1);
+            reader.firstPagePromise = firstPagePromise;
+
             // set labels
             reader.book.getPageLabels().then(function (labels) {
                 if (labels) {
@@ -228,7 +226,7 @@ PDFJS.Reader = function(bookPath, _options) {
             // BookmarksController depends on NotesController so load NotesController first
             //reader.NotesController = PDFJS.reader.NotesController.call(reader, book);
             //reader.BookmarksController = PDFJS.reader.BookmarksController.call(reader, book);
-            //reader.SearchController = PDFJS.reader.SearchController.call(reader, book);
+            reader.SearchController = PDFJS.reader.SearchController.call(reader, book);
             //reader.MetaController = PDFJS.reader.MetaController.call(reader, meta);
             reader.TocController = PDFJS.reader.TocController.call(reader, book);
         },
@@ -270,58 +268,61 @@ PDFJS.Reader.prototype.getThumb = function (pageNum, insert) {
         renderContext,
         renderTask;
 
-    reader.book.getPage(parseInt(pageNum)).then(function(page) {
-        page_rotation = page.rotate;
-        rotation = (page_rotation + reader.settings.rotation) % 360;
-        initial_viewport = page.getViewport(1, rotation);
-        canvas = document.createElement("canvas");
-        ctx = canvas.getContext("2d");
-        outputscale = reader.getOutputScale(ctx);
-        if (outputscale < 1)
-            outputscale = 1;    // ignore browser zoom
-        page_width = initial_viewport.width;
-        page_height = initial_viewport.height;
-        page_aspect = parseFloat(page_width / page_height);
-        scale = parseFloat(reader.settings.thumbnailWidth / page_width);
-        canvas.width = parseInt(reader.settings.thumbnailWidth * outputscale);
-        canvas.height = parseInt(canvas.width / page_aspect);
+    if (reader.thumbs[pageNum] === undefined) {
 
-        viewport = initial_viewport.clone({scale: scale, rotation: rotation});
+        reader.thumbs[pageNum] = true;
 
-        //ctx.scale(outputscale, outputscale);
-        transform = (outputscale === 1)
-            ? null
-            : [outputscale, 0, 0, outputscale, 0, 0];
+        reader.book.getPage(parseInt(pageNum)).then(function(page) {
+            page_rotation = page.rotate;
+            rotation = (page_rotation + reader.settings.rotation) % 360;
+            initial_viewport = page.getViewport(1, rotation);
+            canvas = document.createElement("canvas");
+            ctx = canvas.getContext("2d");
+            outputscale = reader.getOutputScale(ctx);
+            if (outputscale < 1)
+                outputscale = 1;    // ignore browser zoom
+            page_width = initial_viewport.width;
+            page_height = initial_viewport.height;
+            page_aspect = parseFloat(page_width / page_height);
+            scale = parseFloat(reader.settings.thumbnailWidth / page_width);
+            canvas.width = parseInt(reader.settings.thumbnailWidth * outputscale);
+            canvas.height = parseInt(canvas.width / page_aspect);
 
-        console.log("thumbs, canvas w*h " + canvas.width + "*" + canvas.height);
+            viewport = initial_viewport.clone({scale: scale, rotation: rotation});
 
-        renderContext = {
-            canvasContext: ctx,
-            viewport: viewport,
-            transform: transform
-        };
+            //ctx.scale(outputscale, outputscale);
+            transform = (outputscale === 1)
+                ? null
+                : [outputscale, 0, 0, outputscale, 0, 0];
 
-        renderTask = page.render(renderContext);
+            renderContext = {
+                canvasContext: ctx,
+                viewport: viewport,
+                transform: transform
+            };
 
-        renderTask.promise.then(
-            function pdfPageRenderCallback () {
-                thumb = new Image();
-                thumb.id = "thumb_" + pageNum;
-                thumb.className = "thumbnail";
-                thumb.src = canvas.toDataURL();
-                canvas.width = canvas.height = 0;
-                delete canvas;
-                if (insert) {
-                    reader.TocController.tocInsert(thumb, pageNum, true);
-                } else {
-                    reader.thumbs[pageNum] = thumb;
+            renderTask = page.render(renderContext);
+
+            renderTask.promise.then(
+                function pdfPageRenderCallback () {
+                    thumb = new Image();
+                    thumb.id = "thumb_" + pageNum;
+                    thumb.className = "thumbnail";
+                    thumb.src = canvas.toDataURL();
+                    canvas.width = canvas.height = 0;
+                    delete canvas;
+                    if (insert) {
+                        reader.TocController.tocInsert(thumb, pageNum, true);
+                    } else {
+                        reader.thumbs[pageNum] = thumb;
+                    }
+                },
+                function pdfPageRenderError (error) {
+                    console.log("pdfPageRenderError in getThumb: " + error);
                 }
-            },
-            function pdfPageRenderError (error) {
-                console.log("pdfPageRenderError in getThumb: " + error);
-            }
-        );
-    });
+            );
+        });
+    }
 };
 
 PDFJS.Reader.prototype.setZoom = function(zoom) {
@@ -366,7 +367,6 @@ PDFJS.Reader.prototype.cancelRender = function (index) {
         resourcelst = reader.resourcelst[index];
 
     if (resourcelst.renderTask) {
-        console.log("cancel render on canvas " + index + ", pageNum " + resourcelst.pageNum);
         resourcelst.renderTask.cancel();
         resourcelst.renderTask = resourcelst.pageNum = null;
         resourcelst.oscanvas = resourcelst.osctx = null;
@@ -378,7 +378,7 @@ PDFJS.Reader.prototype.cancelRender = function (index) {
     }
 };
 
-PDFJS.Reader.prototype.renderPage = function(pageNum, cache_result) {
+PDFJS.Reader.prototype.renderPage = function(pageNum) {
 
     var reader = this,
         $viewer = $("#viewer");
@@ -410,7 +410,9 @@ PDFJS.Reader.prototype.renderPage = function(pageNum, cache_result) {
         renderContext,
         renderTask,
         resourcelst,
-        swap_orientation;
+        swap_orientation,
+        double_buffer,
+        cache_next;
 
     max_view_width = window.innerWidth;
     max_view_height = window.innerHeight;
@@ -447,6 +449,8 @@ PDFJS.Reader.prototype.renderPage = function(pageNum, cache_result) {
     textdiv = resourcelst.textdiv;
     outputscale = reader.getOutputScale(resourcelst.ctx);
     fraction = reader.approximateFraction(outputscale);
+    double_buffer = reader.settings.doubleBuffer;
+    cache_next = reader.settings.cacheNext;
 
     if (pageNum <= this.settings.numPages && pageNum >= 1) {
 
@@ -545,7 +549,6 @@ PDFJS.Reader.prototype.renderPage = function(pageNum, cache_result) {
             viewport = initial_viewport.clone({scale: scale, rotation: rotation});
 
             if (reader.settings.cssZoomOnly) {
-                console.log("css zoom only");
                 var actualSizeViewport = viewport.clone({scale: 1});
                 canvas.width = actualSizeViewport.width;
                 canvas.height = actualSizeViewport.height;
@@ -554,12 +557,10 @@ PDFJS.Reader.prototype.renderPage = function(pageNum, cache_result) {
             } 
 
             if (reader.settings.canvasLimit > 0) {
-                console.log("canvas is limited");
                 var pixelsInViewport = viewport.width * viewport.height;
                 var maxscale =
                     Math.sqrt(reader.settings.canvasLimit / pixelsInViewport);
                 if (outputscale > maxscale) {
-                    console.log("outputscale: " + outputscale, "maxscale: " + maxscale);
                     outputscale = maxscale;
                     reader.output_scaled = true;
                     reader.restricted_scaling = true;
@@ -608,7 +609,7 @@ PDFJS.Reader.prototype.renderPage = function(pageNum, cache_result) {
 
             /* /textLayer */
 
-            if (reader.settings.doubleBuffer) {
+            if (double_buffer) {
                 resourcelst.oscanvas = oscanvas = document.createElement("canvas");
                 resourcelst.osctx = context = osctx = oscanvas.getContext('2d');
                 oscanvas.width = canvas.width;
@@ -629,14 +630,13 @@ PDFJS.Reader.prototype.renderPage = function(pageNum, cache_result) {
             renderTask.promise.then(
                 function pdfPageRenderCallback (something) {
                     if (reader.cancelPage[pageNum] === undefined) { 
-                        console.log("finished rendering page " + pageNum);
-                        if (reader.settings.doubleBuffer)
+                        if (double_buffer)
                             ctx.drawImage(oscanvas, 0, 0);
                         if (textLayer)
                             textLayer.render(reader.settings.textRenderDelay);
-                    } else {
-                        console.log("rendering page " + pageNum + " finished but cancelled");
-                    }
+                        if (cache_next)
+                            reader.getThumb(parseInt(pageNum + pageShift), true);
+                    } 
                 },
                 function pdfPageRenderError(error) {
                     console.log("pdfPageRenderError: " + error);
@@ -672,8 +672,6 @@ PDFJS.Reader.prototype.queuePage = function(page) {
             page -= (page + 1) % 2;
         }
 
-        console.log("page: " + page);
-
     } else {
         pageShift = 1;
     }
@@ -933,3 +931,16 @@ PDFJS.Reader.prototype.cachedPageNum = function (pageRef) {
     return (reader.pageRefs[reader.pageRefStr(pageRef)])
         || null;
 };
+
+PDFJS.Reader.prototype.getPageTextContent = function (pageIndex) {
+
+    var reader = this,
+        book = reader.book;
+
+    return book.getPage(pageIndex + 1).then(function (page) {
+        return page.getTextContent({
+            normalizeWhitespace: true,
+        });
+    });
+};
+