Skip to content

Commit 190e2b2

Browse files
alexchalexch
committed
update to imakewebthings-deck.js-069f632
1 parent 6f5464f commit 190e2b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+244
-160
lines changed

‎HISTORY.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
* bring deck.js up to date (https://github.com/imakewebthings/deck.js/commit/069f63294abe8c2bfd0e3c9b34d26090802c4f46)
3+
4+
15
# 0.4.2 2012-09-26
26
* require rack >= 1.4.1
37
* require erector >= 0.9.0

‎bin/deck‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require "rack"
88
require "deck"
99
require "deck/rack_app"
1010
require "deck/version"
11+
require "thin" # i hate webrick
1112

1213
options = Trollop.options do
1314
version "deck v#{Deck::VERSION}"

‎deck.gemspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ deck.js (http://imakewebthings.github.com/deck.js) is a JavaScript library for b
2121
s.add_dependency "erector", ">= 0.9.0"
2222
s.add_dependency "redcarpet", "~> 2"
2323
s.add_dependency "rack", ">= 1.4.1"
24+
s.add_dependency "thin" # forget webrick
2425
s.add_dependency "trollop"
2526
s.add_dependency "nokogiri"
2627
s.add_dependency "coderay"

‎imakewebthings-deck.js-069f632.zip‎

121 KB
Binary file not shown.

‎lib/deck/slide_deck.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ def scripts
7373
script :src => public_asset("deck.js/modernizr.custom.js")
7474

7575
# comment 'Grab CDN jQuery, with a protocol relative URL; fall back to local if offline'
76-
# script :src => '//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.7.min.js'
77-
script :src => public_asset('deck.js/jquery-1.7.min.js')
76+
# script :src => '//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.7.2.min.js'
77+
script :src => public_asset('deck.js/jquery-1.7.2.min.js')
7878

7979
jquery <<-JAVASCRIPT
8080
$('.slide_toc .toggle').click(function(){

‎public/deck.js/.gitignore‎

100644100755
File mode changed.

‎public/deck.js/GPL-license.txt‎

100644100755
File mode changed.

‎public/deck.js/MIT-license.txt‎

100644100755
File mode changed.

‎public/deck.js/README.md‎

100644100755
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
A JavaScript library for building modern HTML presentations. deck.js is flexible enough to let advanced CSS and JavaScript authors craft highly customized decks, but also provides templates and themes for the HTML novice to build a standard slideshow.
44

5-
## Dependencies (included in this repository)
5+
## Quick Start
66

7-
- [jQuery](http://jquery.com)
8-
- [Modernizr](http://modernizr.com)
7+
This repository includes a `boilerplate.html` as a starting point, with all the extensions included. Just [download it](https://github.com/imakewebthings/deck.js/zipball/stable), open `boilerplate.html`, and start editing your slides.
98

109
## Documentation
1110

@@ -15,6 +14,11 @@ Check out the [documentation page](http://imakewebthings.github.com/deck.js/docs
1514

1615
Take a look at [the wiki](https://github.com/imakewebthings/deck.js/wiki) for lists of extensions, themes, and other related goodies. If you have a publicly available project of your own, feel free to add to the list.
1716

17+
## Dependencies (included in this repository)
18+
19+
- [jQuery](http://jquery.com)
20+
- [Modernizr](http://modernizr.com)
21+
1822
## Tests & Support
1923

2024
Unit tests are written with [Jasmine](http://pivotal.github.com/jasmine/) and [jasmine-jquery](https://github.com/velesin/jasmine-jquery). You can [run them here](http://imakewebthings.github.com/deck.js/test).
@@ -31,6 +35,8 @@ There is an issue with certain builds of Chrome that result in a solid blue back
3135
- Disable hardware compositing by setting `--disable-accelerated-compositing` in the Chrome loading options
3236
- Replace instances of `translate3d` with `translate` in the CSS of your decks (though this will slow down performance on iOS devices and Safari.)
3337

38+
Firefox contains a bug that allows users to scroll horizontally using the trackpad despite `overflow-x:hidden`. ([Bug 664275](https://bugzilla.mozilla.org/show_bug.cgi?id=664275) and [Bug 325942](https://bugzilla.mozilla.org/show_bug.cgi?id=325942).) If anyone knows of any workarounds to this issue please contact me.
39+
3440
## Printing
3541

3642
Core includes stripped down black and white print styles for the standard slide template that is suitable for handouts.
@@ -53,6 +59,6 @@ If you would like to contribute a patch to deck.js please do as much as you can
5359

5460
## License
5561

56-
Copyright (c) 2011 Caleb Troughton
62+
Copyright (c) 2011-2012 Caleb Troughton
5763

5864
Dual licensed under the [MIT license](https://github.com/imakewebthings/deck.js/blob/master/MIT-license.txt) and [GPL license](https://github.com/imakewebthings/deck.js/blob/master/GPL-license.txt).

‎public/deck.js/boilerplate.html‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<meta name="viewport" content="width=1024, user-scalable=no">
7+
8+
<title>Your deck.js Presentation</title>
9+
10+
<!-- Required stylesheet -->
11+
<link rel="stylesheet" href="core/deck.core.css">
12+
13+
<!-- Extension CSS files go here. Remove or add as needed. -->
14+
<link rel="stylesheet" href="extensions/goto/deck.goto.css">
15+
<link rel="stylesheet" href="extensions/menu/deck.menu.css">
16+
<link rel="stylesheet" href="extensions/navigation/deck.navigation.css">
17+
<link rel="stylesheet" href="extensions/status/deck.status.css">
18+
<link rel="stylesheet" href="extensions/hash/deck.hash.css">
19+
<link rel="stylesheet" href="extensions/scale/deck.scale.css">
20+
21+
<!-- Style theme. More available in /themes/style/ or create your own. -->
22+
<link rel="stylesheet" href="themes/style/web-2.0.css">
23+
24+
<!-- Transition theme. More available in /themes/transition/ or create your own. -->
25+
<link rel="stylesheet" href="themes/transition/horizontal-slide.css">
26+
27+
<!-- Required Modernizr file -->
28+
<script src="modernizr.custom.js"></script>
29+
</head>
30+
<body class="deck-container">
31+
32+
<!-- Begin slides. Just make elements with a class of slide. -->
33+
34+
<section class="slide">
35+
<h1>Slide</h1>
36+
</section>
37+
38+
<section class="slide">
39+
<h1>Content</h1>
40+
</section>
41+
42+
<section class="slide">
43+
<h1>Here</h1>
44+
</section>
45+
46+
<!-- End slides. -->
47+
48+
49+
<!-- Begin extension snippets. Add or remove as needed. -->
50+
51+
<!-- deck.navigation snippet -->
52+
<a href="#" class="deck-prev-link" title="Previous">&#8592;</a>
53+
<a href="#" class="deck-next-link" title="Next">&#8594;</a>
54+
55+
<!-- deck.status snippet -->
56+
<p class="deck-status">
57+
<span class="deck-status-current"></span>
58+
/
59+
<span class="deck-status-total"></span>
60+
</p>
61+
62+
<!-- deck.goto snippet -->
63+
<form action="." method="get" class="goto-form">
64+
<label for="goto-slide">Go to slide:</label>
65+
<input type="text" name="slidenum" id="goto-slide" list="goto-datalist">
66+
<datalist id="goto-datalist"></datalist>
67+
<input type="submit" value="Go">
68+
</form>
69+
70+
<!-- deck.hash snippet -->
71+
<a href="." title="Permalink to this slide" class="deck-permalink">#</a>
72+
73+
<!-- End extension snippets. -->
74+
75+
76+
<!-- Required JS files. -->
77+
<script src="jquery-1.7.2.min.js"></script>
78+
<script src="core/deck.core.js"></script>
79+
80+
<!-- Extension JS files. Add or remove as needed. -->
81+
<script src="../core/deck.core.js"></script>
82+
<script src="../extensions/hash/deck.hash.js"></script>
83+
<script src="../extensions/menu/deck.menu.js"></script>
84+
<script src="../extensions/goto/deck.goto.js"></script>
85+
<script src="../extensions/status/deck.status.js"></script>
86+
<script src="../extensions/navigation/deck.navigation.js"></script>
87+
<script src="../extensions/scale/deck.scale.js"></script>
88+
89+
<!-- Initialize the deck. You can put this in an external file if desired. -->
90+
<script>
91+
$(function() {
92+
$.deck('.slide');
93+
});
94+
</script>
95+
</body>
96+
</html>

0 commit comments

Comments
 (0)