remove head.min.js in favor of simple built-in script loader
This commit is contained in:
		
							
								
								
									
										1
									
								
								test/assets/external-script-a.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								test/assets/external-script-a.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| window.externalScriptSequence += 'A'; | ||||
							
								
								
									
										1
									
								
								test/assets/external-script-b.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								test/assets/external-script-b.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| window.externalScriptSequence += 'B'; | ||||
							
								
								
									
										1
									
								
								test/assets/external-script-c.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								test/assets/external-script-c.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| window.externalScriptSequence += 'C'; | ||||
							
								
								
									
										1
									
								
								test/assets/external-script-d.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								test/assets/external-script-d.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| window.externalScriptSequence += 'D'; | ||||
| @@ -34,7 +34,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../../lib/js/head.min.js"></script> | ||||
| 		<script src="../../js/reveal.js"></script> | ||||
|  | ||||
| 		<script> | ||||
|   | ||||
| @@ -159,7 +159,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../../lib/js/head.min.js"></script> | ||||
| 		<script src="../../js/reveal.js"></script> | ||||
|  | ||||
| 		<script> | ||||
|   | ||||
| @@ -122,7 +122,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../../lib/js/head.min.js"></script> | ||||
| 		<script src="../../js/reveal.js"></script> | ||||
|  | ||||
| 		<script> | ||||
|   | ||||
| @@ -81,7 +81,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../../lib/js/head.min.js"></script> | ||||
| 		<script src="../../js/reveal.js"></script> | ||||
|  | ||||
| 		<script> | ||||
|   | ||||
							
								
								
									
										74
									
								
								test/test-async-dependencies.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										74
									
								
								test/test-async-dependencies.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,74 @@ | ||||
| <!doctype html> | ||||
| <html lang="en"> | ||||
|  | ||||
| 	<head> | ||||
| 		<meta charset="utf-8"> | ||||
|  | ||||
| 		<title>reveal.js - Test Async Dependencies</title> | ||||
|  | ||||
| 		<link rel="stylesheet" href="../css/reveal.css"> | ||||
| 		<link rel="stylesheet" href="qunit-2.5.0.css"> | ||||
| 	</head> | ||||
|  | ||||
| 	<body style="overflow: auto;"> | ||||
|  | ||||
| 		<div id="qunit"></div> | ||||
| 		<div id="qunit-fixture"></div> | ||||
|  | ||||
| 		<div class="reveal" style="display: none;"> | ||||
|  | ||||
| 			<div class="slides"> | ||||
|  | ||||
| 				<section>Slide content</section> | ||||
|  | ||||
| 			</div> | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="qunit-2.5.0.js"></script> | ||||
|  | ||||
| 		<script> | ||||
| 			window.externalScriptSequence = ''; | ||||
|  | ||||
| 			QUnit.module( 'Async Dependencies' ); | ||||
|  | ||||
| 			var scriptCount = 0; | ||||
|  | ||||
| 			QUnit.test( 'Async scripts are loaded', function( assert ) { | ||||
| 				assert.expect( 5 ); | ||||
| 				var done = assert.async( 5 ); | ||||
|  | ||||
| 				function callback( event ) { | ||||
| 					if( window.externalScriptSequence.length === 1 ) { | ||||
| 						assert.ok( window.externalScriptSequence === 'A', 'first callback was sync script' ); | ||||
| 					} | ||||
| 					else { | ||||
| 						assert.ok( true, 'async script loaded' ); | ||||
| 					} | ||||
|  | ||||
| 					if( window.externalScriptSequence.length === 4 ) { | ||||
| 						assert.ok( 	window.externalScriptSequence.indexOf( 'A' ) !== -1 && | ||||
| 									window.externalScriptSequence.indexOf( 'B' ) !== -1 && | ||||
| 									window.externalScriptSequence.indexOf( 'C' ) !== -1 && | ||||
| 									window.externalScriptSequence.indexOf( 'D' ) !== -1, 'four unique scripts were loaded' ); | ||||
| 					} | ||||
|  | ||||
| 					done(); | ||||
| 					scriptCount ++; | ||||
| 				} | ||||
|  | ||||
| 				Reveal.initialize({ | ||||
| 					dependencies: [ | ||||
| 						{ src: 'assets/external-script-a.js', async: false, callback: callback }, | ||||
| 						{ src: 'assets/external-script-b.js', async: true, callback: callback }, | ||||
| 						{ src: 'assets/external-script-c.js', async: true, callback: callback }, | ||||
| 						{ src: 'assets/external-script-d.js', async: true, callback: callback } | ||||
| 					] | ||||
| 				}); | ||||
| 			}); | ||||
|  | ||||
| 		</script> | ||||
|  | ||||
| 	</body> | ||||
| </html> | ||||
							
								
								
									
										54
									
								
								test/test-dependencies.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								test/test-dependencies.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,54 @@ | ||||
| <!doctype html> | ||||
| <html lang="en"> | ||||
|  | ||||
| 	<head> | ||||
| 		<meta charset="utf-8"> | ||||
|  | ||||
| 		<title>reveal.js - Test Dependencies</title> | ||||
|  | ||||
| 		<link rel="stylesheet" href="../css/reveal.css"> | ||||
| 		<link rel="stylesheet" href="qunit-2.5.0.css"> | ||||
| 	</head> | ||||
|  | ||||
| 	<body style="overflow: auto;"> | ||||
|  | ||||
| 		<div id="qunit"></div> | ||||
| 		<div id="qunit-fixture"></div> | ||||
|  | ||||
| 		<div class="reveal" style="display: none;"> | ||||
|  | ||||
| 			<div class="slides"> | ||||
|  | ||||
| 				<section>Slide content</section> | ||||
|  | ||||
| 			</div> | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="qunit-2.5.0.js"></script> | ||||
|  | ||||
| 		<script> | ||||
| 			window.externalScriptSequence = ''; | ||||
|  | ||||
| 			Reveal.addEventListener( 'ready', function() { | ||||
|  | ||||
| 				QUnit.module( 'Dependencies' ); | ||||
|  | ||||
| 				QUnit.test( 'Load synchronous scripts', function( assert ) { | ||||
| 					assert.strictEqual( window.externalScriptSequence, 'ABC', 'Loaded and executed in order' ); | ||||
| 				}); | ||||
|  | ||||
| 			} ); | ||||
|  | ||||
| 			Reveal.initialize({ | ||||
| 				dependencies: [ | ||||
| 					{ src: 'assets/external-script-a.js' }, | ||||
| 					{ src: 'assets/external-script-b.js' }, | ||||
| 					{ src: 'assets/external-script-c.js' } | ||||
| 				] | ||||
| 			}); | ||||
| 		</script> | ||||
|  | ||||
| 	</body> | ||||
| </html> | ||||
| @@ -122,7 +122,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../lib/js/head.min.js"></script> | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="../plugin/markdown/marked.js"></script> | ||||
| 		<script src="../plugin/markdown/markdown.js"></script> | ||||
|   | ||||
| @@ -23,7 +23,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../lib/js/head.min.js"></script> | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="../plugin/highlight/highlight.js"></script> | ||||
| 		<script src="../plugin/markdown/marked.js"></script> | ||||
|   | ||||
| @@ -31,7 +31,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../lib/js/head.min.js"></script> | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="qunit-2.5.0.js"></script> | ||||
|  | ||||
|   | ||||
| @@ -116,7 +116,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../lib/js/head.min.js"></script> | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="../plugin/markdown/marked.js"></script> | ||||
| 		<script src="../plugin/markdown/markdown.js"></script> | ||||
|   | ||||
| @@ -40,7 +40,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../lib/js/head.min.js"></script> | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="../plugin/markdown/marked.js"></script> | ||||
| 		<script src="../plugin/markdown/markdown.js"></script> | ||||
|   | ||||
| @@ -73,7 +73,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../lib/js/head.min.js"></script> | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="qunit-2.5.0.js"></script> | ||||
|  | ||||
|   | ||||
| @@ -76,7 +76,6 @@ | ||||
|  | ||||
| 		</div> | ||||
|  | ||||
| 		<script src="../lib/js/head.min.js"></script> | ||||
| 		<script src="../js/reveal.js"></script> | ||||
| 		<script src="qunit-2.5.0.js"></script> | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user