showoff 0.1.0 → 0.1.1

data/public/js/onepage.js

@@ -1,10 +1,5 @@
 function setupOnePage() {
   sh_highlightDocument('/js/sh_lang/', '.min.js')
   
-  $(".preso > .slide").each(function(s, elem) {
-    var slide_height = $(elem).height()
-    var mar_top = (0.5 * parseFloat($(elem).parent().height())) - (0.5 * parseFloat(slide_height))
-    $(elem).css('margin-top', mar_top)
-  })
-  
+  centerSlides($("#slides > .slide"))
 }

data/public/js/showoff.js

@@ -4,6 +4,7 @@ var preso_started = false
 var slidenum = 0
 var slideTotal = 0
 var slides
+var currentSlide
 var totalslides = 0
 var slidesLoaded = false
 var incrSteps = 0
@@ -31,20 +32,56 @@ function setupPreso() {
 }
 
 function loadSlides() {
-  $('#slides').hide();
+  //load slides offscreen, wait for images and then initialize
   $("#slides").load("/slides", false, function(){
-    slides = $('#slides > .slide')
-    slideTotal = slides.size()
-    setupMenu()
-    if (slidesLoaded) {
-      showSlide()
-      alert('slides loaded')
-    } else {
-      showFirstSlide()
-      slidesLoaded = true
-    }
-    sh_highlightDocument('/js/sh_lang/', '.min.js')
-   })
+    $("#slides img").batchImageLoad({
+			loadingCompleteCallback: initializePresentation
+		})
+  })
+}
+
+function initializePresentation() {
+  //center slides offscreen
+  centerSlides($('#slides > .slide'))
+
+  //copy into presentation area
+  $("#preso").empty()
+  $('#slides > .slide').appendTo($("#preso"))
+
+  //populate vars
+  slides = $('#preso > .slide')
+  slideTotal = slides.size()
+
+  //setup manual jquery cycle
+  $('#preso').cycle({
+    timeout: 0
+  })
+
+  setupMenu()
+  if (slidesLoaded) {
+    showSlide()
+    alert('slides loaded')
+  } else {
+    showFirstSlide()
+    slidesLoaded = true
+  }
+  sh_highlightDocument('/js/sh_lang/', '.min.js')
+}
+
+function centerSlides(slides) {
+  slides.each(function(s, slide) {
+    centerSlide(slide)
+  })
+}
+
+function centerSlide(slide) {
+  var slide_content = $(slide).children(".content").first()
+  var height = slide_content.height()
+  var mar_top = (0.5 * parseFloat($(slide).height())) - (0.5 * parseFloat(height))
+  if (mar_top < 0) {
+    mar_top = 0
+  }
+  slide_content.css('margin-top', mar_top)
 }
 
 function setupMenu() {
@@ -52,16 +89,17 @@ function setupMenu() {
 
   var currSlide = 0
   var menu = new ListMenu()
-  
+
   slides.each(function(s, elem) {
-    shortTxt = $(elem).text().substr(0, 20)
-    path = $(elem).attr('ref').split('/')
+    content = $(elem).children(".content")
+    shortTxt = $(content).text().substr(0, 20)
+    path = $(content).attr('ref').split('/')
     currSlide += 1
     menu.addItem(path, shortTxt, currSlide)
   })
 
   $('#navigation').html(menu.getList())
-  $('#navmenu').menu({ 
+  $('#navmenu').menu({
     content: $('#navigation').html(),
     flyOut: true
   });
@@ -91,13 +129,12 @@ function showSlide(back_step) {
     return
   }
 
-  // TODO: calculate and set the height margins on slide load, not here
-
-  $("#preso").html(slides.eq(slidenum).clone())
-  curr_slide = $("#preso > .slide")
-  var slide_height = curr_slide.height()
-  var mar_top = (0.5 * parseFloat($("#preso").height())) - (0.5 * parseFloat(slide_height))
-  $("#preso > .slide").css('margin-top', mar_top)
+  currentSlide = slides.eq(slidenum)
+  var transition = currentSlide.attr('data-transition')
+  if (back_step) {
+    transition = 'none'
+  }
+  $('#preso').cycle(slidenum, transition)
 
   percent = getSlidePercent()
   $("#slideInfo").text((slidenum + 1) + '/' + slideTotal + '  - ' + percent + '%')
@@ -123,11 +160,11 @@ function determineIncremental()
 {
   incrCurr = 0
   incrCode = false
-  incrElem = $("#preso > .incremental > ul > li")
+  incrElem = currentSlide.find(".incremental > ul > li")
   incrSteps = incrElem.size()
   if(incrSteps == 0) {
     // also look for commandline
-    incrElem = $("#preso > .incremental > pre > code > code")
+    incrElem = currentSlide.find(".incremental > pre > code > code")
     incrSteps = incrElem.size()
     incrCode = true
   }
@@ -158,7 +195,7 @@ function doDebugStuff()
     $('#debugInfo').show()
     debug('debug mode on')
   } else {
-    $('#debugInfo').hide()    
+    $('#debugInfo').hide()
   }
 }
 
@@ -255,7 +292,7 @@ function ListMenu(s)
       }
       newMenu.append(domItem)
     }
-    return newMenu      
+    return newMenu
   }
 }
 
@@ -267,7 +304,7 @@ function ListMenuItem(t, s)
 }
 
 var removeResults = function() {
-  $('.results').remove();	
+  $('.results').remove();
 };
 
 var print = function(text) {

data/views/index.erb

@@ -7,9 +7,12 @@
 
 	<title>Presentation</title>
 
+	<link rel="stylesheet" href="css/reset.css" type="text/css"/>
 	<link rel="stylesheet" href="css/showoff.css" type="text/css"/>
 
 	<script type="text/javascript" src="/js/jquery-1.4.min.js"></script>
+	<script type="text/javascript" src="/js/jquery.cycle.all.js"></script>
+	<script type="text/javascript" src="/js/jquery.batchImageLoad.js"></script>
 	<script type="text/javascript" src="/js/jquery-print.js"></script>	
   <script type="text/javascript" src="/js/fg.menu.js"></script> 
 	<script type="text/javascript" src="/js/showoff.js"></script>
@@ -30,8 +33,8 @@
   <% end %>
 
   <script type="text/javascript">
-  $(function(){
-    setupPreso()
+  $(document).ready(function() {
+    setupPreso();
   });
   </script>
 </head>
@@ -59,7 +62,7 @@
   <span id="debugInfo"></span>
 </div>
 
-<div id="slides"></div>
+<div id="slides" class="offscreen"></div>
 
 </body>
 </html>

data/views/onepage.erb

@@ -12,7 +12,7 @@
   <% else %>
     <%= inline_css(['onepage.css'], 'public/css') %>
   <% end %>
-  <%= inline_css(['showoff.css', 'theme/ui.all.css', 'sh_style.css'], 'public/css') %>
+  <%= inline_css(['reset.css', 'showoff.css', 'theme/ui.all.css', 'sh_style.css'], 'public/css') %>
   <% css_files.each do |css_file| %>
     <%= inline_css(css_file) %>
   <% end %>
@@ -20,7 +20,7 @@
   <% if !@no_js %>
     <%= inline_js(['jquery-1.4.min.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'sh_main.min.js'], 'public/js') %>
     <script type="text/javascript">
-    $(function(){
+    $(document).ready(function() {
       setupOnePage()
     });
     </script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: showoff
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Scott Chacon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -05:00
+date: 2010-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - public/css/fg.menu.css
 - public/css/onepage.css
 - public/css/pdf.css
+- public/css/reset.css
 - public/css/sh_style.css
 - public/css/showoff.css
 - public/css/theme/images/ui-bg_diagonals-small_100_f0efea_40x40.png
@@ -104,6 +105,8 @@ files:
 - public/js/fg.menu.js
 - public/js/jquery-1.4.min.js
 - public/js/jquery-print.js
+- public/js/jquery.batchImageLoad.js
+- public/js/jquery.cycle.all.js
 - public/js/jTypeWriter.js
 - public/js/onepage.js
 - public/js/sh_lang/sh_bison.min.js
@@ -147,7 +150,7 @@ files:
 - public/js/sh_lang/sh_xorg.min.js
 - public/js/sh_main.min.js
 - public/js/showoff.js
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/schacon/showoff
 licenses: []