🎨 Consolidate examples files

ggrossetie · ggrossetie · commit e61d3369a701 · 2019-03-20T17:23:51.000+01:00
diff --git a/examples/asciidoctor_example.html b/examples/asciidoctor_example.html
@@ -1,18 +1,20 @@
 <!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
     <title>Asciidoctor in JavaScript powered by Opal</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
     <link rel="stylesheet" href="../css/asciidoctor.css">
   </head>
   <body>
     <div id="content"></div>
-    <script src="../asciidoctor.js"></script>
+    <script src="../asciidoctor-browser.js"></script>
     <script>
-      // Instantiate Asciidoctor.js
-      Asciidoctor();
+      var asciidoctor = Asciidoctor()
+      var timings = asciidoctor.Timings.create()
+      var html = asciidoctor.convert('include::README.adoc[]', {safe: 'safe', attributes: ['showtitle', 'icons!', 'toc!', 'sectanchors', 'imagesdir=images'], 'timings': timings})
+      timings.printReport()
+      document.getElementById('content').innerHTML = html
     </script>
-    <script src="asciidoctor_example.js"></script>
   </body>
 </html>
diff --git a/examples/asciidoctor_example.rb b/examples/asciidoctor_example.rb
diff --git a/examples/basic.html b/examples/basic.html
@@ -1,18 +1,20 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
   <head>
-    <script src="../asciidoctor.js"></script>
+    <meta charset="utf-8">
+    <title>Asciidoctor in JavaScript powered by Opal</title>
+    <script src="../asciidoctor-browser.js"></script>
   </head>
-        
   <body>
     <h2>Raw content</h2>
     <code id="raw">http://asciidoctor.org[*Asciidoctor*] running on http://opalrb.org[_Opal_] brings AsciiDoc to the browser!</code>
     <h2>Rendered content</h2>
     <div id="target"></div>
     <script>
-      var content = document.getElementById('raw').textContent;
-      var asciidoctor = Asciidoctor();
-      var html = asciidoctor.convert(content, {doctype: 'inline'});
-      document.getElementById('target').innerHTML = html;
+      var content = document.getElementById('raw').textContent
+      var asciidoctor = Asciidoctor()
+      var html = asciidoctor.convert(content, { doctype: 'inline' })
+      document.getElementById('target').innerHTML = html
     </script>
   </body>
 </html>
diff --git a/examples/userguide_test.html b/examples/userguide_test.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
     <title>Asciidoctor in JavaScript powered by Opal</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
     <link rel="stylesheet" href="../css/asciidoctor.css">
   </head>
   <body>
     <div id="content"></div>
-    <script src="../asciidoctor.js"></script>
+    <script src="../asciidoctor-browser.js"></script>
     <script>
-      // Instantiate Asciidoctor.js
-      Asciidoctor();
+      Asciidoctor()
     </script>
     <script src="userguide_test.js"></script>
   </body>
diff --git a/examples/userguide_test.rb b/examples/userguide_test.rb
@@ -6,8 +6,6 @@
 $global.addEventListener 'DOMContentLoaded', proc {
   base_dir = File.dirname $global.window.location.href
   ENV['HOME'] = base_dir
-  timings = Asciidoctor::Timings.new
-  html = Asciidoctor.convert data, :safe => :safe, :attributes => %w(showtitle icons! toc! sectanchors imagesdir=images), :timings => timings
-  timings.print_report
+  html = Asciidoctor.convert data, :safe => :safe, :attributes => %w(showtitle icons! toc! sectanchors imagesdir=images)
   $global.document.getElementById('content').innerHTML = html
 }, false
diff --git a/tasks/examples.js b/tasks/examples.js
@@ -18,7 +18,6 @@ const compileExamples = () => {
   opalBuilder.appendPaths('node_modules/opal-compiler/src/stdlib')
   opalBuilder.appendPaths('lib')
 
-  fs.writeFileSync(path.join(builder.examplesBuildDir, 'asciidoctor_example.js'), opalBuilder.build('examples/asciidoctor_example.rb').toString(), 'utf8')
   fs.writeFileSync(path.join(builder.examplesBuildDir, 'userguide_test.js'), opalBuilder.build('examples/userguide_test.rb').toString(), 'utf8')
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ const compileExamples = () => {`
`18`	`18`	`opalBuilder.appendPaths('node_modules/opal-compiler/src/stdlib')`
`19`	`19`	`opalBuilder.appendPaths('lib')`
`20`	`20`
`21`		`- fs.writeFileSync(path.join(builder.examplesBuildDir, 'asciidoctor_example.js'), opalBuilder.build('examples/asciidoctor_example.rb').toString(), 'utf8')`
`22`	`21`	`fs.writeFileSync(path.join(builder.examplesBuildDir, 'userguide_test.js'), opalBuilder.build('examples/userguide_test.rb').toString(), 'utf8')`
`23`	`22`	`}`
`24`	`23`