Skip to content

Commit

Permalink
adapt to latest deck.js
Browse files Browse the repository at this point in the history
  • Loading branch information
houqp committed Jun 30, 2014
1 parent 54b13f8 commit 259c206
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 21 deletions.
25 changes: 7 additions & 18 deletions deckjs.conf
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,10 @@ ifdef::linkcss[]
<link rel="stylesheet" href="deck.js/extensions/menu/deck.menu.css">
<link rel="stylesheet" href="deck.js/extensions/navigation/deck.navigation.css">
<link rel="stylesheet" href="deck.js/extensions/status/deck.status.css">
<link rel="stylesheet" href="deck.js/extensions/hash/deck.hash.css">
<link rel="stylesheet" href="deck.js/extensions/toc/deck.toc.css">
<!-- Theme CSS files -->
<link rel="stylesheet" href="./deck.js/themes/style/{deckjs_theme}.css">
<link rel="stylesheet" id="transition-theme-link" href="./deck.js/themes/transition/{deckjs_transition}.css">
<link rel="stylesheet" href="./deck.js/themes/transition/{deckjs_transition}.css">
{pygments?<link rel="stylesheet" href="./ad-stylesheet/pygments/{pygments_style}.css">}
<!-- Replace path with correct path to Modernizr file. -->
<script src="deck.js/modernizr.custom.js"></script>
Expand All @@ -183,9 +182,6 @@ include1::{stylesdir=./deck.js/extensions/navigation}/deck.navigation.css[]
include1::{stylesdir=./deck.js/extensions/status}/deck.status.css[]
</style>
<style type="text/css">
include1::{stylesdir=./deck.js/extensions/hash}/deck.hash.css[]
</style>
<style type="text/css">
include1::{stylesdir=./deck.js/extensions/toc}/deck.toc.css[]
</style>
<!-- Theme CSS files -->
Expand All @@ -196,7 +192,7 @@ include1::{stylesdir=./deck.js/themes/style}/{deckjs_theme}.css[]
include1::{stylesdir=./deck.js/themes/transition}/{deckjs_transition}.css[]
</style>
ifdef::pygments[]
<style type="text/css" id="transition-theme-link">
<style type="text/css">
include1::{stylesdir=./ad-stylesheet/pygments}/{pygments_style}.css[]
</style>
endif::pygments[]
Expand All @@ -209,7 +205,7 @@ include1::{scriptsdir=./deck.js}/modernizr.custom.js[]
</script>
<script type="text/javascript">
/*<![CDATA[*/
include1::{scriptsdir=./deck.js}/jquery-1.7.2.min.js[]
include1::{scriptsdir=./deck.js}/jquery.min.js[]
/*]]>*/
</script>
<!-- Deck Core and extensions -->
Expand All @@ -220,11 +216,6 @@ include1::{scriptsdir=./deck.js/core}/deck.core.js[]
</script>
<script type="text/javascript">
/*<![CDATA[*/
include1::{scriptsdir=./deck.js/extensions/hash}/deck.hash.js[]
/*]]>*/
</script>
<script type="text/javascript">
/*<![CDATA[*/
include1::{scriptsdir=./deck.js/extensions/menu}/deck.menu.js[]
/*]]>*/
</script>
Expand Down Expand Up @@ -279,7 +270,7 @@ endif::linkcss[]
</p>
# toc pannel
<div class="deck-toc"></div>
# toc status panel
# toc status panel
#<table class="deck-toc-status">
# <tr>
# <td class="right deck-toc-h2">&nbsp;</td>
Expand All @@ -292,16 +283,14 @@ endif::linkcss[]
<datalist id="goto-datalist"></datalist>
<input type="submit" value="Go">
</form>
<a href="." title="Permalink to this slide" class="deck-permalink">#</a>
<!-- Other extension HTML snippets go here, at the bottom of the deck container. -->
ifdef::linkcss[]
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="deck.js/jquery-1.7.2.min.js"><\/script>')</script>
<script>window.jQuery || document.write('<script src="deck.js/jquery.min.js"><\/script>')</script>
<!-- for JQuery backward compatibility -->
<script>window.jQuery || document.write('<script src="deck.js/jquery-1.7.min.js"><\/script>')</script>
<script>window.jQuery || document.write('<script src="deck.js/jquery.min.js"><\/script>')</script>
<!-- Deck Core and extensions -->
<script src="deck.js/core/deck.core.js"></script>
<script src="deck.js/extensions/hash/deck.hash.js"></script>
<script src="deck.js/extensions/menu/deck.menu.js"></script>
<script src="deck.js/extensions/goto/deck.goto.js"></script>
<script src="deck.js/extensions/status/deck.status.js"></script>
Expand All @@ -326,7 +315,7 @@ ifndef::count_nested[]
endif::count_nested[]

$.deck('.slide');
})(jQuery, 'deck');
})(jQuery, 'deck');
</script>
</body>
</html>
Expand Down
6 changes: 3 additions & 3 deletions tutorial-slide.asciidoc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
deck.js Support for Asciidoc
=============================
:author: Qingping Hou
:author: Qingping Hou
:email: <dave2008713@gmail.com>
:description: a tutorial for writing deck.js presentation with asciidoc
:revdate: 2012-11-24
:revdate: 2014-06-30
:revnumber: 0.9
:deckjs_theme: neon
:deckjs_transition: horizontal-slide
Expand Down Expand Up @@ -161,7 +161,7 @@ syntax:
[source,c,numbered]
-------------------------------------------
int swallow_redpill () {
unsigned char m[2+4], rpill[] = "\x0f\x01\x0d\x00\x00\x00\x00\xc3";
unsigned char m[2+4], rpill[] = "\x0f\x01\x0d\x00\x00\x00\x00\xc3";
*((unsigned*)&rpill[3]) = (unsigned)m;
((void(*)())&rpill)();
return (m[5]>0xd0) ? 1 : 0;
Expand Down

0 comments on commit 259c206

Please sign in to comment.