From b50cf76ab589fa1bb4a52014470274f887e067cd Mon Sep 17 00:00:00 2001
From: Adil Allawi <adil@diwan.com>
Date: Mon, 13 Feb 2012 14:38:44 +0000
Subject: [PATCH] Properly integrate new file bidi.js
---
Makefile | 1 +
src/worker_loader.js | 3 ++-
test/test_slave.html | 1 +
test/unit/jsTestDriver.conf | 1 +
web/viewer.html | 2 +-
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 043cb7fb5..f515bf717 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ PDF_JS_FILES = \
worker.js \
../external/jpgjs/jpg.js \
jpx.js \
+ bidi.js \
$(NULL)
# make server
diff --git a/src/worker_loader.js b/src/worker_loader.js
index fc3d7a5f7..69eb1414f 100644
--- a/src/worker_loader.js
+++ b/src/worker_loader.js
@@ -24,7 +24,8 @@ var files = [
'stream.js',
'worker.js',
'../external/jpgjs/jpg.js',
- 'jpx.js'
+ 'jpx.js',
+ 'bidi.js'
];
// Load all the files.
diff --git a/test/test_slave.html b/test/test_slave.html
index a2682a5a6..50bb067e1 100644
--- a/test/test_slave.html
+++ b/test/test_slave.html
@@ -23,6 +23,7 @@
<script type="text/javascript" src="/src/worker.js"></script>
<script type="text/javascript" src="/external/jpgjs/jpg.js"></script>
<script type="text/javascript" src="/src/jpx.js"></script>
+ <script type="text/javascript" src="/src/bidi.js"></script>
<script type="text/javascript" src="driver.js"></script>
<script type="text/javascript">
diff --git a/test/unit/jsTestDriver.conf b/test/unit/jsTestDriver.conf
index 4baf3c026..b2d3e86f1 100644
--- a/test/unit/jsTestDriver.conf
+++ b/test/unit/jsTestDriver.conf
@@ -22,6 +22,7 @@ load:
- ../../src/pattern.js
- ../../src/stream.js
- ../../src/worker.js
+ - ../../src/bidi.js
- ../../external/jpgjs/jpg.js
- ../unit/obj_spec.js
- ../unit/function_spec.js
diff --git a/web/viewer.html b/web/viewer.html
index 85b267516..f2cc4677b 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -27,9 +27,9 @@
<script type="text/javascript" src="../src/pattern.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../src/stream.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../src/worker.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
- <script type="text/javascript" src="../src/bidi.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../external/jpgjs/jpg.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../src/jpx.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
+ <script type="text/javascript" src="../src/bidi.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript">PDFJS.workerSrc = '../src/worker_loader.js';</script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="viewer.js"></script>