From: Kim Nguyễn <kn@lri.fr>
Date: Thu, 1 Oct 2015 09:36:00 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides
X-Git-Url: http://git.nguyen.vg/gitweb/?a=commitdiff_plain;h=134d14dc655e3e1b28fd2e23a4c508555bd7ff1b;hp=-c;p=hacks%2FsimpleWebSlides.git

Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides
---

134d14dc655e3e1b28fd2e23a4c508555bd7ff1b
diff --combined simpleWebSlides.js
index f2591b2,1c39da4..7483d4e
--- a/simpleWebSlides.js
+++ b/simpleWebSlides.js
@@@ -310,6 -310,7 +310,6 @@@ SWS.Presentation = new function () 
          var slides = $(".sws-slide");
          var h1s = $("body").children("h1");
          var slide_num = slides.add(h1s).length - 1;
 -
          SWS.Utils.push2(_slide_callbacks, slide_num,{ 'fn': f, 'frame': i });
  
      };
@@@ -518,7 -519,8 +518,8 @@@
                  progress.remove();
  		window.status = 'Ready';
  		$.fx.off = old_fx_status;
- 		if (SWS.Utils.getParameterByName("dialog") != "off") window.print();
+ 		if (SWS.Utils.getParameterByName("dialog") != "off")
+ 		    $("body").ready( function () { window.print(); });
              }
          };
          loop();