Update Annotator to e47771a5 (typed-packaging branch). Fixes #1211

h/lib/_annotator_mapsrc/src/plugin/pdf.coffee

@@ -97,6 +97,11 @@ class window.PDFTextMapper extends window.PageTextMapperCore
     # Get a handle on the page
     page = PDFFindController.pdfPageSource.pages[pageIndex]
 
+    unless page?
+#      console.log "Delaying text extraction from page", pageIndex
+      setTimeout (=> @_extractPageText pageIndex), 100
+      return
+
     # Start the collection of page contents
     page.getTextContent().then (data) =>
 
@@ -107,7 +112,9 @@ class window.PDFTextMapper extends window.PageTextMapperCore
       content = @_parseExtractedText rawContent
 
       # Save the extracted content to our page information registery
-      @pageInfo[pageIndex] = content: content
+      @pageInfo[pageIndex] =
+        index: pageIndex
+        content: content
 
       if pageIndex is PDFView.pages.length - 1
         @_finishScan()

h/lib/annotator.auth.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:28:52Z
+** Built at: 2014-05-23 03:08:57Z
 */
 
 

h/lib/annotator.document.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:28:52Z
+** Built at: 2014-05-23 03:08:58Z
 */
 
 

h/lib/annotator.domtextmapper.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:28:58Z
+** Built at: 2014-05-23 03:09:04Z
 */
 
 

h/lib/annotator.fuzzytextanchors.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:29:04Z
+** Built at: 2014-05-23 03:09:10Z
 */
 
 

h/lib/annotator.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:28:48Z
+** Built at: 2014-05-23 03:08:53Z
 */
 
 

h/lib/annotator.pdf.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:29:05Z
+** Built at: 2014-05-23 03:09:10Z
 */
 
 
@@ -128,6 +128,12 @@
       var page,
         _this = this;
       page = PDFFindController.pdfPageSource.pages[pageIndex];
+      if (page == null) {
+        setTimeout((function() {
+          return _this._extractPageText(pageIndex);
+        }), 100);
+        return;
+      }
       return page.getTextContent().then(function(data) {
         var content, rawContent, text;
         rawContent = ((function() {
@@ -142,6 +148,7 @@
         })()).join(" ");
         content = _this._parseExtractedText(rawContent);
         _this.pageInfo[pageIndex] = {
+          index: pageIndex,
           content: content
         };
         if (pageIndex === PDFView.pages.length - 1) {

h/lib/annotator.pdf.map

-{"version":3,"file":"annotator.pdf.js","sources":["_preamble.coffee","_annotator_mapsrc/src/plugin/pdf.coffee"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotator.pdf.js","sources":["_preamble.coffee","_annotator_mapsrc/src/plugin/pdf.coffee"],"names":[],"mappings":"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"}
\ No newline at end of file

h/lib/annotator.permissions.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:28:56Z
+** Built at: 2014-05-23 03:09:01Z
 */
 
 

h/lib/annotator.store.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:28:56Z
+** Built at: 2014-05-23 03:09:02Z
 */
 
 

h/lib/annotator.textanchors.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:29:00Z
+** Built at: 2014-05-23 03:09:05Z
 */
 
 

h/lib/annotator.texthighlights.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:28:59Z
+** Built at: 2014-05-23 03:09:04Z
 */
 
 

h/lib/annotator.textposition.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:29:02Z
+** Built at: 2014-05-23 03:09:08Z
 */
 
 

h/lib/annotator.textquote.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:29:03Z
+** Built at: 2014-05-23 03:09:09Z
 */
 
 

h/lib/annotator.textrange.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-42b8bb1
+** Annotator 1.2.6-dev-e47771a
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2014-05-22 14:29:01Z
+** Built at: 2014-05-23 03:09:07Z
 */