From: notmasteryet <async.processingjs@yahoo.com>
Date: Sat, 31 Dec 2011 01:22:59 +0000 (-0600)
Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=877e0f41597478e58879337667071b3f8a5f6269;p=pdf.js.git

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui

Conflicts:
	web/viewer.js
---

877e0f41597478e58879337667071b3f8a5f6269
diff --cc web/viewer.js
index afaf03e,b596de2..9a7bbb5
--- a/web/viewer.js
+++ b/web/viewer.js
@@@ -595,13 -774,14 +774,14 @@@ var PageView = function pageView(contai
          this.updateStats();
          if (this.onAfterDraw)
            this.onAfterDraw();
+ 
+         cache.push(this);
+         callback();
 -      }).bind(this), textLayer
 +      }).bind(this), new TextLayerBuilder(textLayer)
      );
  
-     setupLinks(this.content, this.scale);
+     setupAnnotations(this.content, this.scale);
      div.setAttribute('data-loaded', true);
- 
-     return true;
    };
  
    this.updateStats = function pageViewUpdateStats() {