showoff 0.15.3 → 0.15.4

Sign up to get free protection for your applications and to get access to all the features.
data/public/js/showoff.js CHANGED
@@ -187,7 +187,10 @@ function initializePresentation(prefix) {
187
187
  }
188
188
  });
189
189
 
190
- $("#preso").trigger("showoff:loaded");
190
+ // initialize mermaid, but don't render yet since the slide sizes are indeterminate
191
+ mermaid.initialize({startOnLoad:false});
192
+
193
+ $("#preso").trigger("showoff:loaded");
191
194
  }
192
195
 
193
196
  function zoom(presenter) {
@@ -582,6 +585,9 @@ function showSlide(back_step, updatepv) {
582
585
  // make all bigly text tremendous
583
586
  currentSlide.children('.content.bigtext').bigtext();
584
587
 
588
+ // render any diagrams on the slide
589
+ mermaid.init(undefined, currentSlide.find('code.language-render-diagram'));
590
+
585
591
  return ret;
586
592
  }
587
593
 
data/views/header.erb CHANGED
@@ -8,8 +8,9 @@
8
8
  <% end %>
9
9
 
10
10
  <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/highlight/<%= @highlightStyle %>.css" />
11
- <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/showoff.css?v=<%= SHOWOFF_VERSION %>" />
11
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/mermaid-6.0.0.css" />
12
12
  <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/font-awesome-4.4.0/css/font-awesome.min.css">
13
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/showoff.css?v=<%= SHOWOFF_VERSION %>" />
13
14
 
14
15
  <script type="text/javascript" src="<%= @asset_path %>/js/jquery-2.1.4.min.js"></script>
15
16
 
@@ -21,6 +22,7 @@
21
22
  <script type="text/javascript" src="<%= @asset_path %>/js/jTypeWriter-1.1.js"></script>
22
23
  <script type="text/javascript" src="<%= @asset_path %>/js/bigtext-0.1.8.js"></script>
23
24
  <script type="text/javascript" src="<%= @asset_path %>/js/highlight.pack-9.2.0.js"></script>
25
+ <script type="text/javascript" src="<%= @asset_path %>/js/mermaid-6.0.0-min.js"></script>
24
26
 
25
27
  <script type="text/javascript" src="<%= @asset_path %>/js/coffee-script-1.1.3-pre.js"></script>
26
28
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: showoff
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.3
4
+ version: 0.15.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-12-21 00:00:00.000000000 Z
12
+ date: 2016-12-27 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sinatra
@@ -314,6 +314,7 @@ files:
314
314
  - public/css/highlight/xcode.css
315
315
  - public/css/highlight/zenburn.css
316
316
  - public/css/menu.png
317
+ - public/css/mermaid-6.0.0.css
317
318
  - public/css/onepage.css
318
319
  - public/css/pace.png
319
320
  - public/css/paceMarker.png
@@ -338,6 +339,7 @@ files:
338
339
  - public/js/jquery.cycle.all-2.8.0.js
339
340
  - public/js/jquery.doubletap-4ff02c5.js
340
341
  - public/js/jquery.parsequery.min-6a20f83.js
342
+ - public/js/mermaid-6.0.0-min.js
341
343
  - public/js/presenter.js
342
344
  - public/js/showoff.js
343
345
  - public/unsupported.html