[z3-checkins] r28618 - z3/Sfive/trunk/ui

philikon at codespeak.net philikon at codespeak.net
Sat Jun 10 16:30:24 CEST 2006


Author: philikon
Date: Sat Jun 10 16:30:04 2006
New Revision: 28618

Added:
   z3/Sfive/trunk/ui/outline.css   (contents, props changed)
Modified:
   z3/Sfive/trunk/ui/framing.css
   z3/Sfive/trunk/ui/opera.css
   z3/Sfive/trunk/ui/pretty.css
   z3/Sfive/trunk/ui/print.css
   z3/Sfive/trunk/ui/s5-core.css
   z3/Sfive/trunk/ui/slides.js
Log:
Update to S5 1.1


Modified: z3/Sfive/trunk/ui/framing.css
==============================================================================
--- z3/Sfive/trunk/ui/framing.css	(original)
+++ z3/Sfive/trunk/ui/framing.css	Sat Jun 10 16:30:04 2006
@@ -3,13 +3,13 @@
    The commented lines can be uncommented (and modified, if necessary) 
     to help you with the rearrangement process. */
 
-div#header, div#footer, div.slide {width: 100%; top: 0; left: 0;}
+/* target = 1024x768 */
+
+div#header, div#footer, .slide {width: 100%; top: 0; left: 0;}
 div#header {top: 0; height: 3em; z-index: 1;}
 div#footer {top: auto; bottom: 0; height: 2.5em; z-index: 5;}
-div.slide {top: 0; width: 92%; padding: 3.5em 4% 4%; z-index: 2;}
-div#controls {left: 50%; top: 0; width: 50%; height: 100%; z-index: 1;}
-#footer>div#controls {bottom: 0; top: auto; height: auto;}
-
+.slide {top: 0; width: 92%; padding: 3.5em 4% 4%; z-index: 2;  list-style: none;}
+div#controls {left: 50%; bottom: 0; width: 50%; z-index: 100;}
 div#controls form {position: absolute; bottom: 0; right: 0; width: 100%;
   margin: 0;}
 #currentSlide {position: absolute; width: 10%; left: 45%; bottom: 1em; z-index: 10;}

Modified: z3/Sfive/trunk/ui/opera.css
==============================================================================
--- z3/Sfive/trunk/ui/opera.css	(original)
+++ z3/Sfive/trunk/ui/opera.css	Sat Jun 10 16:30:04 2006
@@ -1,5 +1,5 @@
 /* DO NOT CHANGE THESE unless you really want to break Opera Show */
-div.slide {
+.slide {
 	visibility: visible !important;
 	position: static !important;
 	page-break-before: always;

Added: z3/Sfive/trunk/ui/outline.css
==============================================================================
--- (empty file)
+++ z3/Sfive/trunk/ui/outline.css	Sat Jun 10 16:30:04 2006
@@ -0,0 +1,15 @@
+/* don't change this unless you want the layout stuff to show up in the outline view! */
+
+.layout div, #footer *, #controlForm * {display: none;}
+#footer, #controls, #controlForm, #navLinks, #toggle {
+  display: block; visibility: visible; margin: 0; padding: 0;}
+#toggle {float: right; padding: 0.5em;}
+html>body #toggle {position: fixed; top: 0; right: 0;}
+
+/* making the outline look pretty-ish */
+
+#slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;}
+#slide0 h1 {padding-top: 1.5em;}
+.slide h1 {margin: 1.5em 0 0; padding-top: 0.25em;
+  border-top: 1px solid #888; border-bottom: 1px solid #AAA;}
+#toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;}

Modified: z3/Sfive/trunk/ui/pretty.css
==============================================================================
--- z3/Sfive/trunk/ui/pretty.css	(original)
+++ z3/Sfive/trunk/ui/pretty.css	Sat Jun 10 16:30:04 2006
@@ -1,9 +1,7 @@
-/* Following are the presentation styles -- edit away!
-   Note that the 'body' font size may have to be changed if the resolution is
-    different than expected. */
+/* Following are the presentation styles -- edit away! */
 
-body {background: #fff url(bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2em;}
-:link, :visited {text-decoration: none;}
+body {background: #FFF url(bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2em;}
+:link, :visited {text-decoration: none; color: #00C;}
 #controls :active {color: #88A !important;}
 #controls :focus {outline: 1px dotted #227;}
 h1, h2, h3, h4 {font-size: 100%; margin: 0; padding: 0; font-weight: inherit;}
@@ -20,16 +18,16 @@
 kbd {font-weight: bold; font-size: 1em;}
 sup {font-size: smaller; line-height: 1px;}
 
-code {padding: 2px 0.25em; font-weight: bold; color: #533;}
-code.bad, code del {color: red;}
-code.old {color: silver;}
-pre {padding: 0; margin: 0.25em 0 0.5em 0.5em; color: #533; font-size: 90%;}
-pre code {display: block;}
-ul {margin-left: 5%; margin-right: 7%; list-style: disc;}
-li {margin-top: 0.75em; margin-right: 0;}
-ul ul {line-height: 1;}
-ul ul li {margin: .2em; font-size: 85%; list-style: square;}
-img.leader {display: block; margin: 0 auto;}
+.slide code {padding: 2px 0.25em; font-weight: bold; color: #533;}
+.slide code.bad, code del {color: red;}
+.slide code.old {color: silver;}
+.slide pre {padding: 0; margin: 0.25em 0 0.5em 0.5em; color: #533; font-size: 90%;}
+.slide pre code {display: block;}
+.slide ul {margin-left: 5%; margin-right: 7%; list-style: disc;}
+.slide li {margin-top: 0.75em; margin-right: 0;}
+.slide ul ul {line-height: 1;}
+.slide ul ul li {margin: .2em; font-size: 85%; list-style: square;}
+.slide img.leader {display: block; margin: 0 auto;}
 
 div#header, div#footer {background: #005; color: #AAB;
   font-family: Verdana, Helvetica, sans-serif;}
@@ -47,28 +45,42 @@
 .slide h3 {font-size: 130%;}
 h1 abbr {font-variant: small-caps;}
 
-div#controls {position: absolute; z-index: 1; left: 50%; top: 0;
-  width: 50%; height: 100%;
-  text-align: right;}
-#footer>div#controls {position: fixed; bottom: 0; padding: 1em 0;
-  top: auto; height: auto;}
+div#controls {position: absolute; left: 50%; bottom: 0;
+  width: 50%;
+  text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;}
+html>body div#controls {position: fixed; padding: 0 0 1em 0;
+  top: auto;}
 div#controls form {position: absolute; bottom: 0; right: 0; width: 100%;
   margin: 0; padding: 0;}
-div#controls a {font-size: 2em; padding: 0; margin: 0 0.5em; 
+#controls #navLinks a {padding: 0; margin: 0 0.5em; 
   background: #005; border: none; color: #779; 
   cursor: pointer;}
-div#controls select {visibility: hidden; background: #DDD; color: #227;}
-div#controls div:hover select {visibility: visible;}
+#controls #navList {height: 1em;}
+#controls #navList #jumplist {position: absolute; bottom: 0; right: 0; background: #DDD; color: #227;}
 
 #currentSlide {text-align: center; font-size: 0.5em; color: #449;}
 
 #slide0 {padding-top: 3.5em; font-size: 90%;}
-#slide0 h1 {position: static; margin: 1em 0 1.33em; padding: 0;
+#slide0 h1 {position: static; margin: 1em 0 0; padding: 0;
    font: bold 2em Helvetica, sans-serif; white-space: normal;
    color: #000; background: transparent;}
-#slide0 h3 {margin-top: 0.5em; font-size: 1.5em;}
+#slide0 h2 {font: bold italic 1em Helvetica, sans-serif; margin: 0.25em;}
+#slide0 h3 {margin-top: 1.5em; font-size: 1.5em;}
 #slide0 h4 {margin-top: 0; font-size: 1em;}
 
 ul.urls {list-style: none; display: inline; margin: 0;}
 .urls li {display: inline; margin: 0;}
 .note {display: none;}
+.external {border-bottom: 1px dotted gray;}
+html>body .external {border-bottom: none;}
+.external:after {content: " \274F"; font-size: smaller; color: #77B;}
+
+.incremental, .incremental *, .incremental *:after {color: #DDE; visibility: visible;}
+img.incremental {visibility: hidden;}
+.slide .current {color: #B02;}
+
+
+/* diagnostics
+
+li:after {content: " [" attr(class) "]"; color: #F88;}
+ */
\ No newline at end of file

Modified: z3/Sfive/trunk/ui/print.css
==============================================================================
--- z3/Sfive/trunk/ui/print.css	(original)
+++ z3/Sfive/trunk/ui/print.css	Sat Jun 10 16:30:04 2006
@@ -1,5 +1,5 @@
-/* The next rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */
-div.slide, ul {page-break-inside: avoid; visibility: visible !important;}
+/* The following rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */
+.slide, ul {page-break-inside: avoid; visibility: visible !important;}
 h1 {page-break-after: avoid;}
 
 body {font-size: 12pt; background: white;}
@@ -20,4 +20,5 @@
 #footer h1 {margin: 0; border-bottom: 1px solid; color: gray; font-style: italic;}
 #footer h2, #controls {display: none;}
 
-#currentSlide {display: none;}
\ No newline at end of file
+/* The following rule keeps the layout stuff out of print.  Remove at your own risk! */
+.layout, .layout * {display: none !important;}

Modified: z3/Sfive/trunk/ui/s5-core.css
==============================================================================
--- z3/Sfive/trunk/ui/s5-core.css	(original)
+++ z3/Sfive/trunk/ui/s5-core.css	Sat Jun 10 16:30:04 2006
@@ -1,9 +1,9 @@
 /* Do not edit or override these styles! The system will likely break if you do. */
 
-div#header, div#footer, div.slide {position: absolute;}
-html>body div#header, html>body div#footer, html>body div.slide {position: fixed;}
-div.slide  { visibility: hidden;}
-#slide0 {visibility: visible;}
-div#controls {position: absolute;}
-#footer>div#controls {position: fixed;}
+div#header, div#footer, div#controls, .slide {position: absolute;}
+html>body div#header, html>body div#footer, 
+  html>body div#controls, html>body .slide {position: fixed;}
 .handout {display: none;}
+.layout {display: block;}
+.slide, .hideme, .incremental {visibility: hidden;}
+#slide0 {visibility: visible;}

Modified: z3/Sfive/trunk/ui/slides.js
==============================================================================
--- z3/Sfive/trunk/ui/slides.js	(original)
+++ z3/Sfive/trunk/ui/slides.js	Sat Jun 10 16:30:04 2006
@@ -1,26 +1,51 @@
-// S5 slides.js -- released under CC by-sa 2.0 license
+// S5 v1.1 slides.js -- released into the Public Domain
 //
 // Please see http://www.meyerweb.com/eric/tools/s5/credits.html for information 
 // about all the wonderful and talented contributors to this code!
 
+var undef;
+var slideCSS = '';
 var snum = 0;
 var smax = 1;
-var undef;
-var slcss = 1;
+var incpos = 0;
+var number = undef;
+var s5mode = true;
+var defaultView = 'slideshow';
+var controlVis = 'visible';
+
 var isIE = navigator.appName == 'Microsoft Internet Explorer' ? 1 : 0;
 var isOp = navigator.userAgent.indexOf('Opera') > -1 ? 1 : 0;
 var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0;
-var slideCSS = document.getElementById('slideProj').href;
 
-function isClass(object, className) {
+function hasClass(object, className) {
+	if (!object.className) return false;
 	return (object.className.search('(^|\\s)' + className + '(\\s|$)') != -1);
 }
 
+function hasValue(object, value) {
+	if (!object) return false;
+	return (object.search('(^|\\s)' + value + '(\\s|$)') != -1);
+}
+
+function removeClass(object,className) {
+	if (!object) return;
+	object.className = object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'), RegExp.$1+RegExp.$2);
+}
+
+function addClass(object,className) {
+	if (!object || hasClass(object, className)) return;
+	if (object.className) {
+		object.className += ' '+className;
+	} else {
+		object.className = className;
+	}
+}
+
 function GetElementsWithClassName(elementName,className) {
 	var allElements = document.getElementsByTagName(elementName);
 	var elemColl = new Array();
-	for (i = 0; i< allElements.length; i++) {
-		if (isClass(allElements[i], className)) {
+	for (var i = 0; i< allElements.length; i++) {
+		if (hasClass(allElements[i], className)) {
 			elemColl[elemColl.length] = allElements[i];
 		}
 	}
@@ -37,7 +62,7 @@
 	var result = "";
 	if (node.nodeType == 1) {
 		var children = node.childNodes;
-		for ( i = 0; i < children.length; ++i ) {
+		for (var i = 0; i < children.length; ++i) {
 			result += nodeValue(children[i]);
 		}		
 	}
@@ -48,18 +73,18 @@
 }
 
 function slideLabel() {
-	var slideColl = GetElementsWithClassName('div','slide');
+	var slideColl = GetElementsWithClassName('*','slide');
 	var list = document.getElementById('jumplist');
 	smax = slideColl.length;
-	for (n = 0; n < smax; n++) {
+	for (var n = 0; n < smax; n++) {
 		var obj = slideColl[n];
 
 		var did = 'slide' + n.toString();
 		obj.setAttribute('id',did);
-		if(isOp) continue;
+		if (isOp) continue;
 
 		var otext = '';
- 		var menu = obj.firstChild;
+		var menu = obj.firstChild;
 		if (!menu) continue; // to cope with empty slides
 		while (menu && menu.nodeType == 3) {
 			menu = menu.nextSibling;
@@ -67,10 +92,10 @@
 	 	if (!menu) continue; // to cope with slides with only text nodes
 
 		var menunodes = menu.childNodes;
-		for (o = 0; o < menunodes.length; o++) {
+		for (var o = 0; o < menunodes.length; o++) {
 			otext += nodeValue(menunodes[o]);
 		}
-		list.options[list.length] = new Option(n+' : ' +otext,n);
+		list.options[list.length] = new Option(n + ' : '  + otext, n);
 	}
 }
 
@@ -91,50 +116,95 @@
 	}
 }
 
-function go(inc) {
-	if (document.getElementById("slideProj").disabled) return;
+function go(step) {
+	if (document.getElementById('slideProj').disabled || step == 0) return;
+	var jl = document.getElementById('jumplist');
 	var cid = 'slide' + snum;
-	if (inc != 'j') {
-		snum += inc;
-		lmax = smax - 1;
-		if (snum > lmax) snum = 0;
-		if (snum < 0) snum = lmax;
-	} else {
-		snum = parseInt(document.getElementById('jumplist').value);
+	var ce = document.getElementById(cid);
+	if (incrementals[snum].length > 0) {
+		for (var i = 0; i < incrementals[snum].length; i++) {
+			removeClass(incrementals[snum][i], 'current');
+			removeClass(incrementals[snum][i], 'incremental');
+		}
 	}
+	if (step != 'j') {
+		snum += step;
+		lmax = smax - 1;
+		if (snum > lmax) snum = lmax;
+		if (snum < 0) snum = 0;
+	} else
+		snum = parseInt(jl.value);
 	var nid = 'slide' + snum;
 	var ne = document.getElementById(nid);
 	if (!ne) {
 		ne = document.getElementById('slide0');
 		snum = 0;
 	}
-	document.getElementById(cid).style.visibility = 'hidden';
+	if (step < 0) {incpos = incrementals[snum].length} else {incpos = 0;}
+	if (incrementals[snum].length > 0 && incpos == 0) {
+		for (var i = 0; i < incrementals[snum].length; i++) {
+			if (hasClass(incrementals[snum][i], 'current'))
+				incpos = i + 1;
+			else
+				addClass(incrementals[snum][i], 'incremental');
+		}
+	}
+	if (incrementals[snum].length > 0 && incpos > 0)
+		addClass(incrementals[snum][incpos - 1], 'current');
+	ce.style.visibility = 'hidden';
 	ne.style.visibility = 'visible';
-	document.getElementById('jumplist').selectedIndex = snum;
+	jl.selectedIndex = snum;
 	currentSlide();
+	number = 0;
+}
+
+function goTo(target) {
+	if (target >= smax || target == snum) return;
+	go(target - snum);
+}
+
+function subgo(step) {
+	if (step > 0) {
+		removeClass(incrementals[snum][incpos - 1],'current');
+		removeClass(incrementals[snum][incpos], 'incremental');
+		addClass(incrementals[snum][incpos],'current');
+		incpos++;
+	} else {
+		incpos--;
+		removeClass(incrementals[snum][incpos],'current');
+		addClass(incrementals[snum][incpos], 'incremental');
+		addClass(incrementals[snum][incpos - 1],'current');
+	}
 }
 
 function toggle() {
-    var slideColl = GetElementsWithClassName('div','slide');
-    var obj = document.getElementById('slideProj');
-    if (!obj.disabled) {
-        obj.disabled = true;
-        for (n = 0; n < smax; n++) {
-            var slide = slideColl[n];
-            slide.style.visibility = 'visible';
-        }
-    } else {
-        obj.disabled = false;
-        for (n = 0; n < smax; n++) {
-            var slide = slideColl[n];
-            slide.style.visibility = 'hidden';
-        }
-        slideColl[snum].style.visibility = 'visible';
-    }
+	var slideColl = GetElementsWithClassName('*','slide');
+	var slides = document.getElementById('slideProj');
+	var outline = document.getElementById('outlineStyle');
+	if (!slides.disabled) {
+		slides.disabled = true;
+		outline.disabled = false;
+		s5mode = false;
+		fontSize('1em');
+		for (var n = 0; n < smax; n++) {
+			var slide = slideColl[n];
+			slide.style.visibility = 'visible';
+		}
+	} else {
+		slides.disabled = false;
+		outline.disabled = true;
+		s5mode = true;
+		fontScale();
+		for (var n = 0; n < smax; n++) {
+			var slide = slideColl[n];
+			slide.style.visibility = 'hidden';
+		}
+		slideColl[snum].style.visibility = 'visible';
+	}
 }
 
 function showHide(action) {
-	var obj = document.getElementById('jumplist');
+	var obj = GetElementsWithClassName('*','hideme')[0];
 	switch (action) {
 	case 's': obj.style.visibility = 'visible'; break;
 	case 'h': obj.style.visibility = 'hidden'; break;
@@ -154,39 +224,99 @@
 		key = event;
 		key.which = key.keyCode;
 	}
- 	switch (key.which) {
-		case 10: // return
-		case 13: // enter
-			if (window.event && isParentOrSelf(window.event.srcElement, "controls")) return;
-			if (key.target && isParentOrSelf(key.target, "controls")) return;
-		case 32: // spacebar
-		case 34: // page down
-		case 39: // rightkey
-		case 40: // downkey
-			go(1);
-			break;
-		case 33: // page up
-		case 37: // leftkey
-		case 38: // upkey
-			go(-1);
-			break;
-		case 84: // t
-			toggle();
-			break;
-		case 67: // c
-			showHide('k');
-			break;
+	if (key.which == 84) {
+		toggle();
+		return;
+	}
+	if (s5mode) {
+		switch (key.which) {
+			case 10: // return
+			case 13: // enter
+				if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return;
+				if (key.target && isParentOrSelf(key.target, 'controls')) return;
+				if(number != undef) {
+					goTo(number);
+					break;
+				}
+			case 32: // spacebar
+			case 34: // page down
+			case 39: // rightkey
+			case 40: // downkey
+				if(number != undef) {
+					go(number);
+				} else if (!incrementals[snum] || incpos >= incrementals[snum].length) {
+					go(1);
+				} else {
+					subgo(1);
+				}
+				break;
+			case 33: // page up
+			case 37: // leftkey
+			case 38: // upkey
+				if(number != undef) {
+					go(-1 * number);
+				} else if (!incrementals[snum] || incpos <= 0) {
+					go(-1);
+				} else {
+					subgo(-1);
+				}
+				break;
+			case 36: // home
+				goTo(0);
+				break;
+			case 35: // end
+				goTo(smax-1);
+				break;
+			case 67: // c
+				showHide('k');
+				break;
+		}
+		if (key.which < 48 || key.which > 57) {
+			number = undef;
+		} else {
+			if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return;
+			if (key.target && isParentOrSelf(key.target, 'controls')) return;
+			number = (((number != undef) ? number : 0) * 10) + (key.which - 48);
+		}
 	}
+	return false;
 }
 
 function clicker(e) {
+	number = undef;
 	var target;
 	if (window.event) {
 		target = window.event.srcElement;
 		e = window.event;
 	} else target = e.target;
- 	if (target.href != null || isParentOrSelf(target, 'controls')) return true;
-	if (!e.which || e.which == 1) go(1);
+	if (target.getAttribute('href') != null || hasValue(target.rel, 'external') || isParentOrSelf(target, 'controls') || isParentOrSelf(target,'embed') || isParentOrSelf(target,'object')) return true;
+	if (!e.which || e.which == 1) {
+		if (!incrementals[snum] || incpos >= incrementals[snum].length) {
+			go(1);
+		} else {
+			subgo(1);
+		}
+	}
+}
+
+function findSlide(hash) {
+	var target = null;
+	var slides = GetElementsWithClassName('*','slide');
+	for (var i = 0; i < slides.length; i++) {
+		var targetSlide = slides[i];
+		if ( (targetSlide.name && targetSlide.name == hash)
+		 || (targetSlide.id && targetSlide.id == hash) ) {
+			target = targetSlide;
+			break;
+		}
+	}
+	while(target != null && target.nodeName != 'BODY') {
+		if (hasClass(target, 'slide')) {
+			return parseInt(target.id.slice(5));
+		}
+		target = target.parentNode;
+	}
+	return null;
 }
 
 function slideJump() {
@@ -197,60 +327,226 @@
 	if (matches != null) {
 		dest = parseInt(matches[1]);
 	} else {
-		var target = window.location.hash.slice(1);
-		var targetElement = null;
-		var aelements = document.getElementsByTagName("a");
-		for (i = 0; i < aelements.length; i++) {
-			var aelement = aelements[i];
-			if ( (aelement.name && aelement.name == target)
-			 || (aelement.id && aelement.id == target) ) {
-				targetElement = aelement;
-				break;
+		dest = findSlide(window.location.hash.slice(1));
+	}
+	if (dest != null)
+		go(dest - snum);
+}
+
+function fixLinks() {
+	var thisUri = window.location.href;
+	thisUri = thisUri.slice(0, thisUri.length - window.location.hash.length);
+	var aelements = document.getElementsByTagName('A');
+	for (var i = 0; i < aelements.length; i++) {
+		var a = aelements[i].href;
+		var slideID = a.match('\#slide[0-9]{1,2}');
+		if ((slideID) && (slideID[0].slice(0,1) == '#')) {
+			var dest = findSlide(slideID[0].slice(1));
+			if (dest != null) {
+				if (aelements[i].addEventListener) {
+					aelements[i].addEventListener("click", new Function("e",
+						"if (document.getElementById('slideProj').disabled) return;" +
+						"go("+dest+" - snum); " +
+						"if (e.preventDefault) e.preventDefault();"), true);
+				} else if (aelements[i].attachEvent) {
+					aelements[i].attachEvent("onclick", new Function("",
+						"if (document.getElementById('slideProj').disabled) return;" +
+						"go("+dest+" - snum); " +
+						"event.returnValue = false;"));
+				}
 			}
 		}
-		while(targetElement != null && targetElement.nodeName != "body") {
-			if (targetElement.className == "slide") break;
-			targetElement = targetElement.parentNode;
-		}
-		if (targetElement != null && targetElement.className == "slide") {
-			dest = parseInt(targetElement.id.slice(1));
+	}
+}
+
+function externalLinks() {
+	if (!document.getElementsByTagName) return;
+	var anchors = document.getElementsByTagName('a');
+	for (var i=0; i<anchors.length; i++) {
+		var anchor = anchors[i];
+		if (anchor.getAttribute('href') && hasValue(anchor.rel, 'external')) {
+			anchor.target = '_blank';
+			addClass(anchor,'external');
 		}
 	}
-	if (dest != null)
-		go(dest - snum);
- }
- 
+}
+
 function createControls() {
-	controlsDiv = document.getElementById("controls");
+	var controlsDiv = document.getElementById("controls");
 	if (!controlsDiv) return;
-	controlsDiv.innerHTML = '<form action="#" id="controlForm">' +
-	'<div>' +
+	var hider = ' onmouseover="showHide(\'s\');" onmouseout="showHide(\'h\');"';
+	var hideDiv, hideList = '';
+	if (controlVis == 'hidden') {
+		hideDiv = hider;
+	} else {
+		hideList = hider;
+	}
+	controlsDiv.innerHTML = '<form action="#" id="controlForm"' + hideDiv + '>' +
+	'<div id="navLinks">' +
 	'<a accesskey="t" id="toggle" href="javascript:toggle();">&#216;<\/a>' +
 	'<a accesskey="z" id="prev" href="javascript:go(-1);">&laquo;<\/a>' +
 	'<a accesskey="x" id="next" href="javascript:go(1);">&raquo;<\/a>' +
-	'<\/div>' +
-	'<div onmouseover="showHide(\'s\');" onmouseout="showHide(\'h\');"><select id="jumplist" onchange="go(\'j\');"><\/select><\/div>' +
-	'<\/form>';
+	'<div id="navList"' + hideList + '><select id="jumplist" onchange="go(\'j\');"><\/select><\/div>' +
+	'<\/div><\/form>';
+	if (controlVis == 'hidden') {
+		var hidden = document.getElementById('navLinks');
+	} else {
+		var hidden = document.getElementById('jumplist');
+	}
+	addClass(hidden,'hideme');
+}
+
+function fontScale() {  // causes layout problems in FireFox that get fixed if browser's Reload is used; same may be true of other Gecko-based browsers
+	if (!s5mode) return false;
+	var vScale = 22;  // both yield 32 (after rounding) at 1024x768
+	var hScale = 32;  // perhaps should auto-calculate based on theme's declared value?
+	if (window.innerHeight) {
+		var vSize = window.innerHeight;
+		var hSize = window.innerWidth;
+	} else if (document.documentElement.clientHeight) {
+		var vSize = document.documentElement.clientHeight;
+		var hSize = document.documentElement.clientWidth;
+	} else if (document.body.clientHeight) {
+		var vSize = document.body.clientHeight;
+		var hSize = document.body.clientWidth;
+	} else {
+		var vSize = 700;  // assuming 1024x768, minus chrome and such
+		var hSize = 1024; // these do not account for kiosk mode or Opera Show
+	}
+	var newSize = Math.min(Math.round(vSize/vScale),Math.round(hSize/hScale));
+	fontSize(newSize + 'px');
+	if (isGe) {  // hack to counter incremental reflow bugs
+		var obj = document.getElementsByTagName('body')[0];
+		obj.style.display = 'none';
+		obj.style.display = 'block';
+	}
+}
+
+function fontSize(value) {
+	if (!(s5ss = document.getElementById('s5ss'))) {
+		if (!isIE) {
+			document.getElementsByTagName('head')[0].appendChild(s5ss = document.createElement('style'));
+			s5ss.setAttribute('media','screen, projection');
+			s5ss.setAttribute('id','s5ss');
+		} else {
+			document.createStyleSheet();
+			document.s5ss = document.styleSheets[document.styleSheets.length - 1];
+		}
+	}
+	if (!isIE) {
+		while (s5ss.lastChild) s5ss.removeChild(s5ss.lastChild);
+		s5ss.appendChild(document.createTextNode('body {font-size: ' + value + ' !important;}'));
+	} else {
+		document.s5ss.addRule('body','font-size: ' + value + ' !important;');
+	}
 }
 
 function notOperaFix() {
-	var obj = document.getElementById('slideProj');
-	obj.setAttribute('media','screen');
+	slideCSS = document.getElementById('slideProj').href;
+	var slides = document.getElementById('slideProj');
+	var outline = document.getElementById('outlineStyle');
+	slides.setAttribute('media','screen');
+	outline.disabled = true;
 	if (isGe) {
-		obj.setAttribute('href','null');   // Gecko fix
-		obj.setAttribute('href',slideCSS); // Gecko fix
+		slides.setAttribute('href','null');   // Gecko fix
+		slides.setAttribute('href',slideCSS); // Gecko fix
+	}
+	if (isIE && document.styleSheets && document.styleSheets[0]) {
+		document.styleSheets[0].addRule('img', 'behavior: url(ui/default/iepngfix.htc)');
+		document.styleSheets[0].addRule('div', 'behavior: url(ui/default/iepngfix.htc)');
+		document.styleSheets[0].addRule('.slide', 'behavior: url(ui/default/iepngfix.htc)');
+	}
+}
+
+function getIncrementals(obj) {
+	var incrementals = new Array();
+	if (!obj) 
+		return incrementals;
+	var children = obj.childNodes;
+	for (var i = 0; i < children.length; i++) {
+		var child = children[i];
+		if (hasClass(child, 'incremental')) {
+			if (child.nodeName == 'OL' || child.nodeName == 'UL') {
+				removeClass(child, 'incremental');
+				for (var j = 0; j < child.childNodes.length; j++) {
+					if (child.childNodes[j].nodeType == 1) {
+						addClass(child.childNodes[j], 'incremental');
+					}
+				}
+			} else {
+				incrementals[incrementals.length] = child;
+				removeClass(child,'incremental');
+			}
+		}
+		if (hasClass(child, 'show-first')) {
+			if (child.nodeName == 'OL' || child.nodeName == 'UL') {
+				removeClass(child, 'show-first');
+				if (child.childNodes[isGe].nodeType == 1) {
+					removeClass(child.childNodes[isGe], 'incremental');
+				}
+			} else {
+				incrementals[incrementals.length] = child;
+			}
+		}
+		incrementals = incrementals.concat(getIncrementals(child));
+	}
+	return incrementals;
+}
+
+function createIncrementals() {
+	var incrementals = new Array();
+	for (var i = 0; i < smax; i++) {
+		incrementals[i] = getIncrementals(document.getElementById('slide'+i));
 	}
+	return incrementals;
+}
+
+function defaultCheck() {
+	var allMetas = document.getElementsByTagName('meta');
+	for (var i = 0; i< allMetas.length; i++) {
+		if (allMetas[i].name == 'defaultView') {
+			defaultView = allMetas[i].content;
+		}
+		if (allMetas[i].name == 'controlVis') {
+			controlVis = allMetas[i].content;
+		}
+	}
+}
+
+// Key trap fix, new function body for trap()
+function trap(e) {
+	if (!e) {
+		e = event;
+		e.which = e.keyCode;
+	}
+	try {
+		modifierKey = e.ctrlKey || e.altKey || e.metaKey;
+	}
+	catch(e) {
+		modifierKey = false;
+	}
+	return modifierKey || e.which == 0;
 }
 
 function startup() {
+	defaultCheck();
 	if (!isOp) createControls();
 	slideLabel();
-	if (!isOp) {		
+	fixLinks();
+	externalLinks();
+	fontScale();
+	if (!isOp) {
 		notOperaFix();
+		incrementals = createIncrementals();
 		slideJump();
+		if (defaultView == 'outline') {
+			toggle();
+		}
 		document.onkeyup = keys;
+		document.onkeypress = trap;
 		document.onclick = clicker;
 	}
 }
 
 window.onload = startup;
+window.onresize = function(){setTimeout('fontScale()', 50);}
\ No newline at end of file


More information about the z3-checkins mailing list