Merge pull request #4965 from yurydelendik/annotations

Splits shared/annotation.js into core/ and display/
mozilla · Jun 18, 2014 · 2282c98 · 2282c98
2 parents 011eb84 + bdeca30
commit 2282c98
Show file tree

Hide file tree

Showing 12 changed files with 284 additions and 318 deletions.
diff --git a/examples/acroforms/index.html b/examples/acroforms/index.html
@@ -5,13 +5,13 @@
   <!-- In production, only one script (pdf.js) is necessary -->
   <!-- In production, change the content of PDFJS.workerSrc below -->
   <script src="../../src/shared/util.js"></script>
-  <script src="../../src/shared/annotation.js"></script>
   <script src="../../src/display/api.js"></script>
   <script src="../../src/display/metadata.js"></script>
   <script src="../../src/display/canvas.js"></script>
   <script src="../../src/display/webgl.js"></script>
   <script src="../../src/display/pattern_helper.js"></script>
   <script src="../../src/display/font_loader.js"></script>
+  <script src="../../src/display/annotation_helper.js"></script>
 
   <script>
     // Specify the main script used to create a new PDF.JS web worker.

diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html
@@ -5,13 +5,13 @@
   <!-- In production, only one script (pdf.js) is necessary -->
   <!-- In production, change the content of PDFJS.workerSrc below -->
   <script src="../../src/shared/util.js"></script>
-  <script src="../../src/shared/annotation.js"></script>
   <script src="../../src/display/api.js"></script>
   <script src="../../src/display/metadata.js"></script>
   <script src="../../src/display/canvas.js"></script>
   <script src="../../src/display/webgl.js"></script>
   <script src="../../src/display/pattern_helper.js"></script>
   <script src="../../src/display/font_loader.js"></script>
+  <script src="../../src/display/annotation_helper.js"></script>
 
   <script>
     // Specify the main script used to create a new PDF.JS web worker.

diff --git a/make.js b/make.js
@@ -370,7 +370,6 @@ target.bundle = function(args) {
 
   var SHARED_SRC_FILES = [
     'shared/util.js',
-    'shared/annotation.js',
   ];
 
   var MAIN_SRC_FILES = SHARED_SRC_FILES.concat([
@@ -379,7 +378,8 @@ target.bundle = function(args) {
     'display/canvas.js',
     'display/webgl.js',
     'display/pattern_helper.js',
-    'display/font_loader.js'
+    'display/font_loader.js',
+    'display/annotation_helper.js',
   ]);
 
   var srcFiles = builder.getWorkerSrcFiles('src/worker_loader.js');