[Pkg-javascript-commits] [pdf.js] 36/161: Merge pull request #4132 from yurydelendik/minified

[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 e5cd75083fabf663ce67be086e4fd7b3b99a44b2
Merge: 566482d 2b298a7
Author: Tim van der Meij <timvandermeij at gmail.com>
Date:   Thu Mar 13 21:38:50 2014 +0100

    Merge pull request #4132 from yurydelendik/minified
    
    Adds make minified command

 make.js                          | 79 ++++++++++++++++++++++++++++++++++++++++
 web/viewer-snippet-minified.html |  3 ++
 web/viewer.html                  |  8 +++-
 3 files changed, 88 insertions(+), 2 deletions(-)

diff --cc web/viewer.html
index d1072cd,ec887e8..9f014f3
--- a/web/viewer.html
+++ b/web/viewer.html
@@@ -80,11 -77,14 +80,15 @@@ http://sourceforge.net/adobe/cmap/wiki/
      <script type="text/javascript" src="presentation_mode.js"></script>
      <script type="text/javascript" src="grab_to_pan.js"></script>
      <script type="text/javascript" src="hand_tool.js"></script>
 +    <script type="text/javascript" src="document_properties.js"></script>
  <!--#endif-->
  
+ <!--#if !MINIFIED -->
      <script type="text/javascript" src="debugger.js"></script>
      <script type="text/javascript" src="viewer.js"></script>
+ <!--#else-->
+ <!--#include viewer-snippet-minified.html-->
+ <!--#endif-->
  
    </head>
  

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