]> git.parisson.com Git - pdf.js.git/commitdiff
Merge with master
authorJulian Viereck <julian.viereck@gmail.com>
Tue, 1 Nov 2011 18:56:34 +0000 (19:56 +0100)
committerJulian Viereck <julian.viereck@gmail.com>
Tue, 1 Nov 2011 18:56:34 +0000 (19:56 +0100)
1  2 
src/core.js
src/worker.js
web/viewer.html

diff --cc src/core.js
Simple merge
diff --cc src/worker.js
index d46364f603cc507c31f090843dbbec6a6b415274,d62e0c86b788737f4551728e90a33a365c8b7c00..74a880caefd421f68128147d783b80527a8e5632
@@@ -44,17 -44,10 +44,17 @@@ MessageHandler.prototype = 
  };
  
  var WorkerProcessorHandler = {
-   setup: function(handler) {
+   setup: function wphSetup(handler) {
      var pdfDoc = null;
  
-     handler.on('workerSrc', function(data) {
++    handler.on('workerSrc', function wphSetupWorkerSrc(data) {
 +      // In development, the `workerSrc` message is handled in the
 +      // `worker_loader.js` file. In production the workerProcessHandler is
 +      // called for this. This servers as a dummy to prevent calling an
 +      // undefined action `workerSrc`.
 +    });
 +
-     handler.on('doc', function(data) {
+     handler.on('doc', function wphSetupDoc(data) {
        // Create only the model of the PDFDoc, which is enough for
        // processing the content of the pdf.
        pdfDoc = new PDFDocModel(new Stream(data));
diff --cc web/viewer.html
index 7dd81e0af3c5428e00a14f4b3aa6c712e7200de9,0c6ab385e114d98a72f635cf6a6ace5e5827ba67..60eab8eab69961eb9ebc988a87a594dae87a8210
@@@ -3,8 -3,10 +3,10 @@@
      <head>
          <title>Simple pdf.js page viewer</title>
          <link rel="stylesheet" href="viewer.css"/>
 -        
 +
+         <script type="text/javascript" src="compatibility.js"></script>
++
          <!-- PDFJSSCRIPT_INCLUDE_BUILD -->
 -        
          <script type="text/javascript" src="../src/core.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
          <script type="text/javascript" src="../src/util.js"></script>  <!-- PDFJSSCRIPT_REMOVE -->
          <script type="text/javascript" src="../src/canvas.js"></script>  <!-- PDFJSSCRIPT_REMOVE -->
@@@ -24,9 -26,6 +26,8 @@@
          <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="compatibility.js"></script>
 +        <script type="text/javascript">PDFJS.workerSrc = '../../src/worker_loader.js';</script> <!-- PDFJSSCRIPT_REMOVE -->
 +
          <script type="text/javascript" src="viewer.js"></script>
    </head>