1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-20 15:18:08 +02:00

Merge remote-tracking branch 'mozilla/master' into pushState

This commit is contained in:
Yury Delendik 2013-08-16 09:18:00 -05:00
commit 7e145c1228
41 changed files with 817 additions and 786 deletions

View file

@ -41,35 +41,16 @@ limitations under the License.
<!--#endif-->
<!--#if !PRODUCTION-->
<script type="text/javascript" src="../src/network.js"></script>
<script type="text/javascript" src="../src/chunked_stream.js"></script>
<script type="text/javascript" src="../src/pdf_manager.js"></script>
<script type="text/javascript" src="../src/core.js"></script>
<script type="text/javascript" src="../src/util.js"></script>
<script type="text/javascript" src="../src/api.js"></script>
<script type="text/javascript" src="../src/canvas.js"></script>
<script type="text/javascript" src="../src/obj.js"></script>
<script type="text/javascript" src="../src/annotation.js"></script>
<script type="text/javascript" src="../src/function.js"></script>
<script type="text/javascript" src="../src/charsets.js"></script>
<script type="text/javascript" src="../src/cidmaps.js"></script>
<script type="text/javascript" src="../src/colorspace.js"></script>
<script type="text/javascript" src="../src/crypto.js"></script>
<script type="text/javascript" src="../src/evaluator.js"></script>
<script type="text/javascript" src="../src/fonts.js"></script>
<script type="text/javascript" src="../src/font_renderer.js"></script>
<script type="text/javascript" src="../src/glyphlist.js"></script>
<script type="text/javascript" src="../src/image.js"></script>
<script type="text/javascript" src="../src/metrics.js"></script>
<script type="text/javascript" src="../src/parser.js"></script>
<script type="text/javascript" src="../src/pattern.js"></script>
<script type="text/javascript" src="../src/stream.js"></script>
<script type="text/javascript" src="../src/worker.js"></script>
<script type="text/javascript" src="../src/jpx.js"></script>
<script type="text/javascript" src="../src/jbig2.js"></script>
<script type="text/javascript" src="../src/bidi.js"></script>
<script type="text/javascript" src="../src/metadata.js"></script>
<script type="text/javascript" src="../external/jpgjs/jpg.js"></script>
<script type="text/javascript" src="../src/shared/util.js"></script>
<script type="text/javascript" src="../src/shared/colorspace.js"></script>
<script type="text/javascript" src="../src/shared/pattern.js"></script>
<script type="text/javascript" src="../src/shared/function.js"></script>
<script type="text/javascript" src="../src/shared/annotation.js"></script>
<script type="text/javascript" src="../src/display/api.js"></script>
<script type="text/javascript" src="../src/display/metadata.js"></script>
<script type="text/javascript" src="../src/display/canvas.js"></script>
<script type="text/javascript" src="../src/display/font_loader.js"></script>
<script type="text/javascript" src="../src/display/font_renderer.js"></script>
<script type="text/javascript">PDFJS.workerSrc = '../src/worker_loader.js';</script>
<!--#endif-->

View file

@ -49,7 +49,7 @@ var FindStates = {
PDFJS.imageResourcesPath = './images/';
//#if (FIREFOX || MOZCENTRAL || B2G || GENERIC || CHROME)
//PDFJS.workerSrc = '../build/pdf.js';
//PDFJS.workerSrc = '../build/pdf.worker.js';
//#endif
var mozL10n = document.mozL10n || document.webL10n;