Skip to content

Commit

Permalink
showoff js works
Browse files Browse the repository at this point in the history
  • Loading branch information
technoweenie committed Aug 28, 2010
1 parent 7e47a15 commit 24cfa80
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 10 deletions.
24 changes: 24 additions & 0 deletions mocks/index.html
Expand Up @@ -6,6 +6,30 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Presentation</title>
<link rel="stylesheet" href="/stylesheets/reset.css" type="text/css"/>
<link rel="stylesheet" href="/stylesheets/showoff.css" type="text/css"/>

<script type="text/javascript" src="/javascripts/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="/javascripts/jquery.cycle.all.js"></script>
<script type="text/javascript" src="/javascripts/jquery-print.js"></script>
<script type="text/javascript" src="/javascripts/jquery.batchImageLoad.js"></script>
<script type="text/javascript" src="/javascripts/jquery.doubletap-0.1.js"></script>

<script type="text/javascript" src="/javascripts/fg.menu.js"></script>
<script type="text/javascript" src="/javascripts/showoff.js"></script>
<script type="text/javascript" src="/javascripts/jTypeWriter.js"> </script>
<script type="text/javascript" src="/javascripts/sh_main.min.js"></script>
<script type="text/javascript" src="/javascripts/core.js"></script>
<script type="text/javascript" src="/javascripts/showoffcore.js"></script>

<link type="text/css" href="/stylesheets/fg.menu.css" media="screen" rel="stylesheet" />
<link type="text/css" href="/stylesheets/theme/ui.all.css" media="screen" rel="stylesheet" />
<link type="text/css" href="/stylesheets/sh_style.css" rel="stylesheet" >
<script type="text/javascript">
$(function(){
setupPreso(true, "/talks/abc/slides", "");
});
</script>
</head>

<body>
Expand Down
22 changes: 12 additions & 10 deletions public/javascripts/showoff.js
Expand Up @@ -19,8 +19,9 @@ var shiftKeyActive = false

var loadSlidesBool
var loadSlidesPrefix
var loadSlidesJsShPrefix

function setupPreso(load_slides, prefix) {
function setupPreso(load_slides, slides_prefix, sh_js_prefix) {
if (preso_started)
{
alert("already started")
Expand All @@ -29,8 +30,9 @@ function setupPreso(load_slides, prefix) {
preso_started = true

loadSlidesBool = load_slides
loadSlidesPrefix = prefix
loadSlides(loadSlidesBool, loadSlidesPrefix)
loadSlidesPrefix = slides_prefix
loadSlidesJsShPrefix = sh_js_prefix
loadSlides(loadSlidesBool, loadSlidesPrefix, loadSlidesJsShPrefix)

doDebugStuff()

Expand All @@ -42,17 +44,17 @@ function setupPreso(load_slides, prefix) {
/* window.onunload = unloaded; */
}

function loadSlides(load_slides, prefix) {
function loadSlides(load_slides, slides_prefix, sh_js_prefix) {
//load slides offscreen, wait for images and then initialize
if (load_slides) {
$("#slides").load("/slides", false, function(){
$("#slides").load(slides_prefix+"/slides", false, function(){
$("#slides img").batchImageLoad({
loadingCompleteCallback: initializePresentation(prefix)
loadingCompleteCallback: initializePresentation(sh_js_prefix)
})
})
} else {
$("#slides img").batchImageLoad({
loadingCompleteCallback: initializePresentation(prefix)
loadingCompleteCallback: initializePresentation(sh_js_prefix)
})
}
}
Expand Down Expand Up @@ -82,7 +84,7 @@ function initializePresentation(prefix) {
slidesLoaded = true
}
setupSlideParamsCheck();
sh_highlightDocument(prefix+'/js/sh_lang/', '.min.js')
sh_highlightDocument(prefix+'/javascripts/sh_lang/', '.min.js')
}

function centerSlides(slides) {
Expand Down Expand Up @@ -349,7 +351,7 @@ function keyDown(event)
else if (key == 82) // R for reload
{
if (confirm('really reload slides?')) {
loadSlides(loadSlidesBool, loadSlidesPrefix)
loadSlides(loadSlidesBool, loadSlidesPrefix, loadSlidesJsShPrefix)
showSlide()
}
}
Expand Down Expand Up @@ -560,7 +562,7 @@ function stopPreShow() {
$('#preshow_timer').remove()

toggleFooter()
loadSlides(loadSlidesBool, loadSlidesPrefix);
loadSlides(loadSlidesBool, loadSlidesPrefix, loadSlidesJsShPrefix)
}

function nextPreShowImage() {
Expand Down

0 comments on commit 24cfa80

Please sign in to comment.