iframes support is dropped

This commit is contained in:
Vadim Makeev 2010-11-03 14:50:46 +03:00
parent 02c7d19c81
commit ae5aa03fc4
5 changed files with 50 additions and 39 deletions

25
examples/index.htm Normal file
View File

@ -0,0 +1,25 @@
<!DOCTYPE HTML>
<html lang="en-US">
<head>
<title>Shower</title>
<meta charset="UTF-8">
<style>
BODY {
background:#FFF;
}
H1 {
position:absolute;
top:50%;
left:0;
margin-top:-100px;
width:100%;
color:#000;
text-align:center;
font:bold 150px Georgia, serif;
}
</style>
</head>
<body>
<h1>★ Demo ★</h1>
</body>
</html>

View File

@ -114,21 +114,14 @@
</article> </article>
<img src="pictures/image.jpg" alt=""> <img src="pictures/image.jpg" alt="">
</section> </section>
<section class="slide frame" id="Frame">
<article>
<h2>Shower on GitHub</h2>
<p><a href="http://github.com/pepelsbey/shower">http://github.com/pepelsbey/shower</a></p>
</article>
<iframe src="http://github.com/pepelsbey/shower" frameborder="0" scrolling="no"></iframe>
</section>
<section class="slide shout" id="JustAshout"> <section class="slide shout" id="JustAshout">
<article> <article>
<h2>Shout!</h2> <h2>Shout!</h2>
</article> </article>
</section> </section>
<section class="slide shout" id="ShoutLink"> <section class="slide shout" id="ShoutDemo">
<article> <article>
<h2><a href="#ThankYou">Link!</a></h2> <h2><a href="examples/index.htm" target="_blank">Demo</a></h2>
</article> </article>
</section> </section>
<section class="slide last" id="ThankYou"> <section class="slide last" id="ThankYou">

View File

@ -3,14 +3,21 @@ var url = document.location,
slides = [], backhash = {}, slides = [], backhash = {},
linkScreen = document.querySelector('link[title=screen]'), linkScreen = document.querySelector('link[title=screen]'),
linkProjection = document.querySelector('link[title=projection]'), linkProjection = document.querySelector('link[title=projection]'),
iframes = window.frames,
fullscreen = false; fullscreen = false;
for(var i = 0, len = domSlides.length; i < len; i++) { for(var i = 0, iLength = domSlides.length; i < iLength; i++) {
var id = domSlides[i].id; var id = domSlides[i].id;
slides[i] = '#' + id; slides[i] = '#' + id;
backhash['#' + id] = i; backhash['#' + id] = i;
} }
for( var j = 0, jLength = iframes.length; j < jLength; j++ ) {
iframes[j].onfocus = function() {
window.top.focus();
}
}
function enterFull() { function enterFull() {
fullscreen = true; fullscreen = true;
updateView(); updateView();

View File

@ -125,6 +125,15 @@ A {
.slide ARTICLE EM { .slide ARTICLE EM {
font-style:italic; font-style:italic;
} }
.slide ARTICLE KBD,
.slide ARTICLE CODE {
padding:0.1em 0.3em;
-webkit-border-radius:0.3em;
-moz-border-radius:0.3em;
border-radius:0.3em;
background:#EEE;
font-family:Consolas, 'Droid Sans Mono', monospace;
}
/* Quote */ /* Quote */
.slide ARTICLE BLOCKQUOTE { .slide ARTICLE BLOCKQUOTE {
@ -185,8 +194,9 @@ A {
} }
.slide ARTICLE PRE CODE { .slide ARTICLE PRE CODE {
display:block; display:block;
padding:0;
background:none;
white-space:pre; white-space:pre;
font-family:Consolas, 'Droid Sans Mono', monospace;
} }
.slide ARTICLE PRE CODE:before { .slide ARTICLE PRE CODE:before {
position:absolute; position:absolute;
@ -200,9 +210,9 @@ A {
.slide ARTICLE PRE EM, .slide ARTICLE PRE EM,
.slide ARTICLE PRE STRONG { .slide ARTICLE PRE STRONG {
padding:0.1em 0.3em; padding:0.1em 0.3em;
-webkit-border-radius:.3em; -webkit-border-radius:0.3em;
-moz-border-radius:.3em; -moz-border-radius:0.3em;
border-radius:.3em; border-radius:0.3em;
} }
.slide ARTICLE PRE EM { .slide ARTICLE PRE EM {
background:#FAFAA2; background:#FAFAA2;
@ -284,21 +294,5 @@ A {
display:none; display:none;
} }
.slide.shout:after { .slide.shout:after {
content:'';
}
/* Frame
---------------------------------------- */
.slide.frame {
background:#FFF;
}
.slide.frame IFRAME {
position:absolute;
top:0;
left:0;
width:100%;
height:100%;
}
.slide.frame:after {
content:''; content:'';
} }

View File

@ -236,12 +236,4 @@ A {
padding:30px 0; padding:30px 0;
text-align:center; text-align:center;
font-size:60px; font-size:60px;
} }
/* Frame
---------------------------------------- */
.slide.frame {
}
.slide.frame IFRAME {
display:none;
}