Browse Source

disable 3d links in ie, reorder script loading in index for readability (closes #95)

embed
hakimel 12 years ago
parent
commit
2c3a494eaa
  1. 1
      README.md
  2. 61
      index.html
  3. 24
      js/reveal.js

1
README.md

@ -204,6 +204,7 @@ You can change the appearance of the speaker notes by editing the file at `plugi
- Added EOT font for IE support - Added EOT font for IE support
- IE8 support - IE8 support
- Fixed bug where hovering 3D links in Chrome caused them to disappear - Fixed bug where hovering 3D links in Chrome caused them to disappear
- Disable 3D links in IE and more accurate CSS feature detection
#### 1.4 #### 1.4
- Main ```#reveal container``` is now selected via a class instead of ID - Main ```#reveal container``` is now selected via a class instead of ID

61
index.html

@ -278,12 +278,42 @@ function linkify( selector ) {
<script src="lib/js/head.min.js"></script> <script src="lib/js/head.min.js"></script>
<script> <script>
head.ready( function() {
// Fires when a slide with data-state=customevent is activated
Reveal.addEventListener( 'customevent', function() {
console.log( '"customevent" has fired' );
} );
// Fires each time a new slide is activated
Reveal.addEventListener( 'slidechanged', function( event ) {
// event.previousSlide, event.currentSlide, event.indexh, event.indexv
} );
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
theme: Reveal.getQueryHash().theme || 'default', // default/neon/beige
transition: Reveal.getQueryHash().transition || 'default' // default/cube/page/concave/linear(2d)
});
// Load highlight.js for syntax highlighting of code samples
head.js( 'lib/js/highlight.js', function() {
hljs.initHighlightingOnLoad();
} );
} );
// Scripts that should be loaded before initializing // Scripts that should be loaded before initializing
var scripts = []; var scripts = [];
// If the browser doesn't support classList, load a polyfill // If the browser doesn't support classList, load a polyfill
if( !document.body.classList ) { if( !document.body.classList ) {
scripts.push( 'lib/js/classList.js' ); head.js( 'lib/js/classList.js' );
} }
// Load markdown parser if there are slides defined using markdown // Load markdown parser if there are slides defined using markdown
@ -302,35 +332,8 @@ function linkify( selector ) {
scripts.push( 'js/reveal.js' ); scripts.push( 'js/reveal.js' );
// Load the scripts and, when completed, initialize reveal.js // Load the scripts and, when completed, initialize reveal.js
head.js.apply( null, scripts.concat([function() { head.js.apply( null, scripts );
// Fires when a slide with data-state=customevent is activated
Reveal.addEventListener( 'customevent', function() {
console.log( '"customevent" has fired' );
} );
// Fires each time a new slide is activated
Reveal.addEventListener( 'slidechanged', function( event ) {
// event.previousSlide, event.currentSlide, event.indexh, event.indexv
} );
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
theme: Reveal.getQueryHash().theme || 'default', // default/neon/beige
transition: Reveal.getQueryHash().transition || 'default' // default/cube/page/concave/linear(2d)
});
}]));
// Load highlight.js for syntax highlighting of code samples
head.js( 'lib/js/highlight.js', function() {
hljs.initHighlightingOnLoad();
} );
</script> </script>
</body> </body>

24
js/reveal.js

@ -1,5 +1,5 @@
/*! /*!
* reveal.js 1.5 r10 * reveal.js 1.5 r11
* http://lab.hakim.se/reveal-js * http://lab.hakim.se/reveal-js
* MIT licensed * MIT licensed
* *
@ -63,17 +63,17 @@ var Reveal = (function(){
dom = {}, dom = {},
// Detect support for CSS 3D transforms // Detect support for CSS 3D transforms
supports3DTransforms = document.body.style['WebkitPerspective'] !== undefined || supports3DTransforms = 'WebkitPerspective' in document.body.style ||
document.body.style['MozPerspective'] !== undefined || 'MozPerspective' in document.body.style ||
document.body.style['msPerspective'] !== undefined || 'msPerspective' in document.body.style ||
document.body.style['OPerspective'] !== undefined || 'OPerspective' in document.body.style ||
document.body.style['perspective'] !== undefined, 'perspective' in document.body.style,
supports2DTransforms = document.body.style['WebkitTransform'] !== undefined || supports2DTransforms = 'WebkitTransform' in document.body.style ||
document.body.style['MozTransform'] !== undefined || 'MozTransform' in document.body.style ||
document.body.style['msTransform'] !== undefined || 'msTransform' in document.body.style ||
document.body.style['OTransform'] !== undefined || 'OTransform' in document.body.style ||
document.body.style['transform'] !== undefined, 'transform' in document.body.style,
// Detect support for elem.classList // Detect support for elem.classList
supportsClassList = !!document.body.classList; supportsClassList = !!document.body.classList;
@ -444,7 +444,7 @@ var Reveal = (function(){
* Wrap all links in 3D goodness. * Wrap all links in 3D goodness.
*/ */
function linkify() { function linkify() {
if( supports3DTransforms ) { if( supports3DTransforms && !( 'msPerspective' in document.body.style ) ) {
var nodes = document.querySelectorAll( '.reveal .slides section a:not(.image)' ); var nodes = document.querySelectorAll( '.reveal .slides section a:not(.image)' );
for( var i = 0, len = nodes.length; i < len; i++ ) { for( var i = 0, len = nodes.length; i < len; i++ ) {

Loading…
Cancel
Save