From 9863bd8f74101e46720cd542fb7634bfcdb55f10 Mon Sep 17 00:00:00 2001
From: Jerome Wu <jeromewus@gmail.com>
Date: Mon, 7 Oct 2019 20:54:20 +0800
Subject: [PATCH] Upgrade to tesseract.js@2.0.0-beta.1

---
 demo.js    | 34 +++++++++++++++++++++-------------
 index.html |  2 +-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/demo.js b/demo.js
index 2a0f0cb..ee1e31b 100644
--- a/demo.js
+++ b/demo.js
@@ -25,7 +25,9 @@ var lang_drop_instructions = {
 	rus: 'a Russian'
 }
 
-var tessWorker = new Tesseract.TesseractWorker();
+var worker = new Tesseract.createWorker({
+  logger: progressUpdate,
+});
 
 function setUp(){
 	input_overlay.width = input.naturalWidth
@@ -49,10 +51,12 @@ function startDemoIfVisible(argument) {
 function startDemo(){
 	demoStarted = true
 
-	function start(){
-		tessWorker.recognize(input)
-		.progress(progressUpdate)
-		.then(result)
+	async function start(){
+    await worker.load();
+    await worker.loadLanguage('eng');
+    await worker.initialize('eng');
+    const { data } = await worker.recognize(input);
+    result(data);
 
 		input.removeEventListener('load', start)
 	}
@@ -167,16 +171,18 @@ function clearOverLayAndOutput(){
 // }
 
 
-function play(){
+async function play(){
 
 	demo_instructions.style.display = 'none'
 	output_text.style.display = 'block'
 	output_text.innerHTML = ''
 	// output_overlay.innerHTML = ''
 
-	tessWorker.recognize(input, language)
-	.progress( progressUpdate )
-	.then( result )
+  await worker.load();
+  await worker.loadLanguage(language);
+  await worker.initialize(language);
+  const { data } = await worker.recognize(input);
+  result(data);
 }
 
 options.forEach(function(option){
@@ -201,15 +207,17 @@ options.forEach(function(option){
 })
 
 
-document.body.addEventListener('drop', function(e){
+document.body.addEventListener('drop', async function(e){
 	e.stopPropagation();
     e.preventDefault();
     var file = e.dataTransfer.files[0]
 	var reader = new FileReader();
+  await worker.load();
+  await worker.loadLanguage(language);
+  await worker.initialize(language);
+  const { data } = await worker.recognize(file);
+  result(data);
 
-	tessWorker.recognize(file, language)
-	.progress( progressUpdate )
-	.then( result )
 
 	reader.onload = function(e){
 		input.src = e.target.result;
diff --git a/index.html b/index.html
index 0f5e420..316ffa7 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@
 	<script src="animation/hypercube.js"></script>
 	<script src="animation/animate.js"></script>
 
-  	<script src="https://unpkg.com/tesseract.js@2.0.0-alpha.11/dist/tesseract.min.js"></script>
+  <script src="https://unpkg.com/tesseract.js@2.0.0-beta.1/dist/tesseract.min.js"></script>
 	<script src="demo.js"></script>
 	<script>
 	  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){