[Pkg-javascript-commits] [pdf.js] 30/141: Merge pull request #4455 from aib/master

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository pdf.js.

commit 9c59437ac39b1a3b8edfa24bb88260c83cdc7b23
Merge: 4be65a9 2870a61
Author: Yury Delendik <ydelendik at mozilla.com>
Date:   Thu Apr 3 09:40:06 2014 -0500

    Merge pull request #4455 from aib/master
    
    Fix download button waiting if document has started but not completed downloading

 web/viewer.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --cc web/viewer.js
index 3ec7665,e68dfa9..efdc5ce
--- a/web/viewer.js
+++ b/web/viewer.js
@@@ -603,8 -564,15 +603,10 @@@ var PDFView = 
        }
      }
  
 -    // Terminate worker of the previous document if any.
 -    if (this.pdfDocument) {
 -      this.pdfDocument.destroy();
 -    }
 -    this.pdfDocument = null;
      var self = this;
      self.loading = true;
+     self.downloadComplete = false;
+ 
      var passwordNeeded = function passwordNeeded(updatePassword, reason) {
        PasswordPrompt.updatePassword = updatePassword;
        PasswordPrompt.reason = reason;
@@@ -894,9 -867,11 +901,10 @@@
  
      this.pdfDocument = pdfDocument;
  
 -    var errorWrapper = document.getElementById('errorWrapper');
 -    errorWrapper.setAttribute('hidden', 'true');
 +    DocumentProperties.resolveDataAvailable();
  
      pdfDocument.getDownloadInfo().then(function() {
+       self.downloadComplete = true;
        PDFView.loadingBar.hide();
        var outerContainer = document.getElementById('outerContainer');
        outerContainer.classList.remove('loadingInProgress');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git