Commit graph

317 commits

Author SHA1 Message Date
Hakim El Hattab
d78a8046dc Merge branch 'Timothep-master' into dev 2016-06-10 10:13:06 +02:00
Timothep
ad86772f20 Horizontal 2-1 View for the speaker notes instead of a vertical 1-2 2016-06-10 10:12:54 +02:00
Hakim El Hattab
ce7d494ae9 tweak formatting to match rest of slide 2016-04-29 09:25:05 +02:00
Jess Telford
a0e6da6a9c More natural zooming on block level elements
Switching a `display: block` element to `display: inline-block` allows calculating the bounds based on the contents of the div rather than the entire container (which is often `width: 100%`).

This provides a much more natural zoom, especially for paragraphs and code examples.
2016-04-26 07:27:59 +10:00
Hakim El Hattab
07c2355604 support for standalone multiplexing 2016-04-07 10:24:44 +02:00
Hakim El Hattab
ef137fd01f server notes plugin no longer syncs overview mode #1446 2016-03-09 10:02:25 +01:00
Hakim El Hattab
8e3a7f03d1 notes plugin no longer syncs overview mode #1446 2016-03-09 09:57:58 +01:00
Hakim El Hattab
922677ac66 fix notes regex #1522 #1392 2016-03-09 09:37:19 +01:00
Hakim El Hattab
db46896613 Merge pull request #1522 from demoneaux/notes-fix
Fix query parameter issue in notes plugin.
2016-03-07 08:53:27 +01:00
Benjamin Tan
6d0b52026a Fix query parameter issue in notes plugin.
Closes #1392.
2016-03-06 18:28:08 +08:00
Benjamin Tan
9eb56f8146 Remove unused dependencies. 2016-03-06 16:52:02 +08:00
Hakim El Hattab
12acf08ca5 Merge branch 'jetzhliu-patch-1' of https://github.com/jetzhliu/reveal.js into dev 2016-01-11 10:05:42 +01:00
Hakim El Hattab
19a69b2c89 code format 2016-01-08 14:33:34 +01:00
Hakim El Hattab
3df2129bd6 Merge branch 'patch-1' of https://github.com/danieltdt/reveal.js into dev 2016-01-08 14:32:03 +01:00
Hakim El Hattab
c0ea2cd980 same code format 2016-01-08 14:02:16 +01:00
Hakim El Hattab
daa5f031bf Merge branch 'patch-2' of https://github.com/teawithfruit/reveal.js into dev 2016-01-08 14:00:50 +01:00
Hakim El Hattab
06cdd9b7cd include speaker view keyboard shortcut when applicable #1466 2016-01-08 13:49:06 +01:00
Hakim El Hattab
fcb4b05de7 Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-04 09:31:46 +01:00
Ian Smith
5da75aef01 Fix spelling error in print-pdf plugin 2015-12-27 12:35:13 -06:00
Hakim El Hattab
91c6db71ca update to highlight.js 9.0.0 2015-12-14 09:49:05 +01:00
Riceball LEE
16ebf2a783 * [bug] the markdown plugin can not render highlight codes for marked.setOptions(highlight) 2015-11-11 07:37:08 +00:00
Riceball LEE
6952931451 * update marked.js version to 0.3.5 2015-11-10 21:40:46 +00:00
Hakim El Hattab
a5181e4372 Merge pull request #1391 from rohithpr/notes-key-binding
Fixed #1379 - config keyboard now disables 's' key
2015-11-09 16:47:21 +01:00
Hakim El Hattab
50f9896362 update highlight.js 8.6 -> 8.9.1 #1385 2015-11-09 16:46:08 +01:00
Hakim El Hattab
215617740d server notes sync slide changes both ways, fixes #1425 2015-11-09 16:24:09 +01:00
teawithfruit
43f0d08155 fixed loading 2015-11-02 10:37:16 +01:00
Hakim El Hattab
fc792e704c remove remotes.io plugin, service no longer exists #1411 2015-10-26 09:22:46 +01:00
Liu Zhanhong
625831b993 format note content when creating slide
In html content, marked allow `Inline-Level Grammar` but not `Block-Level Grammar`, so when I write following:
```
note:
* a
* b
* c
```
it become:
```html
<p><em> a
</em> b</p>
<ul>
<li>c</li>
</ul>
```
unbelievable!
2015-10-19 19:50:43 +08:00
rohithpr
dd8f95d9a9 Fixed #1379 - config keyboard now disables 's' key 2015-10-09 00:14:02 +05:30
Hakim El Hattab
c1a7e83d75 multiplexing work with socket.io 1.0+ #1281 #1276 2015-09-29 10:38:34 +02:00
Hakim El Hattab
b16bc6fc2e speaker notes work with socket.io 1.0 #1375 2015-09-29 10:07:21 +02:00
Hakim El Hattab
9bcd1484bc notes defined in data-notes attributes retain preformatted whitespace 2015-09-25 09:41:05 +02:00
Hakim El Hattab
d44125d789 tweaks for #1200 2015-07-07 12:15:43 +02:00
Hakim El Hattab
399d4f652d Merge branch 'master' of https://github.com/bfritscher/reveal.js into dev 2015-07-07 12:06:22 +02:00
Hakim El Hattab
852fea4133 Merge pull request #1205 from gothma/mathjax-md
Allow tex parsing in <code> tags
2015-07-07 11:50:08 +02:00
Hakim El Hattab
adf1a24f0a Merge branch 'master' of github.com:hakimel/reveal.js into dev 2015-06-25 10:02:21 +02:00
Hakim El Hattab
6ec6ac2cb4 Merge pull request #1250 from kfuglsang/highlightjs-86
Updated to Highlightjs 8.6 with all languages supported.
2015-06-25 09:57:03 +02:00
RC028552
50e1463a57 Removed leap motion plugin from main project 2015-06-15 19:42:24 -05:00
pierreozoux
5dd2dd9f0b Allows to specify PORT from env on multiplex plugin 2015-06-10 18:23:20 +01:00
Kenneth Fuglsang
0563835fc0 Updated to Highlightjs 8.6 with all languages supported. 2015-06-02 22:18:36 +02:00
Martin Goth
0cb4d10504 Allow tex parsing in <code> tags
Just using $ as delimiter in markdown document fails since the markdown
parser unknown to the dollar syntax will try to interpret underscores.
Putting the $ delimented formula in backticks will cause the markdown
parser to put the tex-code with the $ delimiters into a code block.
The texcode will then be unchanged. This patch allows for mathJax to
interpret and automagically display the tex-formulas.
2015-04-16 13:24:23 +02:00
Hakim El Hattab
a0cc104a0c Merge branch 'query-params' of https://github.com/FND/reveal.js into dev 2015-04-12 17:07:59 +02:00
Boris Fritscher
9645a763c3 handle the </script> end bug inside code markdown
by changing the tag before html is parsed and restoring it before markdown parsing
2015-04-12 15:15:57 +02:00
FND
4052389c58 support query parameters within notes plugin 2015-04-02 07:06:03 +02:00
Hakim El Hattab
0428365041 Merge branch 'patch-1' of https://github.com/drzax/reveal.js into dev 2015-03-25 14:16:12 +01:00
Hakim El Hattab
e38b1d38f8 Merge pull request #1166 from callahad/update-marked
update marked to 0.3.3
2015-03-25 14:02:22 +01:00
Hakim El Hattab
60457d21b4 alt+zoom only works on slide content #1151 2015-03-25 13:57:00 +01:00
Simon Elvery
7a03e238f0 Attribute values should be quoted 2015-03-16 20:44:23 +10:00
Dan Callahan
dfb39b4c96 Bumped Marked to v0.3.3
Compressed with `uglifyjs lib/marked.js --comments="/Copyright/" --mangle --compress`

Used Marked v0.3.3 as of chjj/marked@2b5802f258
2015-03-16 03:13:50 -05:00
Hakim El Hattab
7baa8ec1fe updated md slide separator regex #929
see https://github.com/hakimel/reveal.js/issues/929#issuecomment-80738837
2015-03-16 08:54:58 +01:00
Daniel Teixeira
f79210c6c1 Add support for custom notes.html file
It would be nice if we could define a custom notes.html file.

Actually, I'm used to compile my js files before releasing my app and, using selectors like `script[src$="notes.js"]`, doesn't work :(

So, what do you think about it?
2015-03-05 18:54:34 -03:00
Hakim El Hattab
44548ba357 add global flag back in for whitespace removal, without it most of the content in example.html does not work #682 2015-01-22 08:46:14 +01:00
Hakim El Hattab
f032df8f13 default to https mathjax #1103 2015-01-20 09:11:09 +01:00
Hakim El Hattab
8524af73f6 zoom plugin now works for scaled presentations 2014-12-10 20:09:03 +01:00
Hakim El Hattab
cef19486b8 better handling of overflowing speaker notes #1017 2014-10-16 13:09:54 +02:00
Hakim El Hattab
f28b380fac prevent auto-sliding in notes frames #1004 2014-09-28 17:13:49 +02:00
Hakim El Hattab
0aad39f755 dont open notes when S is pressed inside of notes window #991 2014-09-27 16:19:39 +02:00
Hakim El Hattab
80fc214af1 update highlight.js to 8.2 2014-09-11 11:37:36 +02:00
Hakim El Hattab
062918b5e2 update highlight.js to 8.1 2014-07-22 10:29:00 +02:00
Hakim El Hattab
b558f74299 zoom viewport is centered on target element #900 2014-05-19 09:26:49 +02:00
Hakim El Hattab
3eb7038a15 sync server-side speaker notes after notes window opens 2014-05-04 10:10:21 +02:00
Hakim El Hattab
4c5b15d0b9 update server side notes to match client side plugin 2014-05-04 09:32:00 +02:00
Hakim El Hattab
fa6187072e clicking on notes timer now resets it #779 2014-05-04 08:13:09 +02:00
Hakim El Hattab
ebb9a689a0 updates to phantom pdf print script, arguments for width/height 2014-04-29 10:24:13 +02:00
Hakim El Hattab
1e5ca748a4 enable reveal.js keyboard shortcuts anywhere in notes window 2014-04-26 11:36:03 +02:00
Hakim El Hattab
37ebe0732c skip transitions in notes window for better main window performance 2014-04-22 15:05:06 +02:00
Hakim El Hattab
f396b9b871 limit how often the notes window updates presentation states 2014-04-22 14:50:50 +02:00
Hakim El Hattab
c02d185cfd notes code format tweaks 2014-04-22 14:14:21 +02:00
Hakim El Hattab
ce05138f9a dont toggle paused/overview modes needlessly when setting state 2014-04-22 14:06:58 +02:00
Hakim El Hattab
3795ef1599 update style of notes plugin to match Slides 2014-04-20 10:26:00 +02:00
Hakim El Hattab
5b18c1f308 notes plugin now operates entirely through window.postMessage, adding support for file protocol 2014-04-19 10:54:26 +02:00
Hakim El Hattab
11ea0aa3e1 postmessage plugin is now part of reveal.js core 2014-04-18 13:56:51 +02:00
Hakim El Hattab
c87d7db930 code format tweak 2014-04-06 10:18:38 +02:00
Hakim El Hattab
2eb3d082ce Merge branch 'xhr-local' of https://github.com/malyw/reveal.js into dev 2014-04-06 10:16:46 +02:00
Hakim El Hattab
2901abccde Merge pull request #682 from tentacode/patch-1
Indentation issue when using code in a markdown slide
2014-04-06 09:56:54 +02:00
Sergey Gospodarets
873f2dbc96 Mark xhr.status=0 as successful 2014-04-02 13:02:39 +03:00
Sergey Gospodarets
75247a8860 Mark xhr.status=0 as successful 2014-04-02 12:59:36 +03:00
Hakim El Hattab
b8157a1e91 Merge branch 'master' of https://github.com/jdfitzgerald/reveal.js into dev 2014-03-25 16:42:55 +01:00
Gijs Koot
71f1780b50 fixed two minor bugs, a twohanded gesture may not have a direction, and if autoCenter is of, the tipPosition was in the wrong scope 2014-03-05 15:20:30 +01:00
J.D. Fitz.Gerald
d939c4790e updated highlight.js to v8.0 2014-02-28 16:22:36 +00:00
Hakim El Hattab
015468c3a2 renamed markdown attributes for clarity and consistency: data-vertical -> data-separator-vertical, data-notes -> data-separator-notes 2014-02-17 21:15:02 +01:00
Hakim El Hattab
a22d00ab25 server side notes plugin now supports input via data-notes attribute 2014-02-17 20:16:21 +01:00
Hakim El Hattab
9a9ce672b7 add example of markdown slide and element attributes 2013-12-02 12:20:48 +01:00
VonC
f2097417da Simpler default syntax for markdown attributes.
- on slides: .slide x=y
- on elements: .element x=y

Those are detected in html comment, in order to not be visible
if a markdown is edited in an html editor.
2013-11-30 23:12:40 +01:00
VonC
13da34cc6b Removes console.log calls. 2013-11-30 23:12:40 +01:00
VonC
d52eb599d1 Fix previous element selection. 2013-11-30 23:12:39 +01:00
VonC
8ad633e4f3 Fix element attributes, except for multi-line. 2013-11-30 23:12:39 +01:00
VonC
3330c2a764 Remove section attribute implementation. 2013-11-30 23:12:38 +01:00
VonC
dd9fa3e22b First refactoring 2013-11-30 23:12:38 +01:00
Hakim El Hattab
e947f0f216 add zoomKey option for #700 2013-11-26 09:00:04 -05:00
Hakim El Hattab
e0dccd85be Merge branch 'feature/more-languages' of https://github.com/haf/reveal.js into dev 2013-11-17 17:20:49 -05:00
Hakim El Hattab
e7e941b663 add code slide to markdown example #682 2013-11-07 08:03:22 -05:00
VonC
4b0fe47bb6 Add slide attributes for single slide section case. 2013-11-06 11:06:03 +01:00
VonC
2cdd1afe85 Remove console.log debugs, and fix tabs 2013-11-04 16:31:51 +01:00
VonC
492a094955 Fix default separator pattern for attribute in slide. 2013-11-04 16:31:47 +01:00
VonC
83ee2eb00e Fix markdown.js slideAttributesSeparator selection. 2013-11-04 16:31:33 +01:00
VonC
d6b8e4a246 Rebased on dev, and following contribution guideline. 2013-11-04 16:31:29 +01:00
VonC
ec72e8cbc7 Fix markdown vertical wrapping section element generation. 2013-11-04 16:31:25 +01:00
VonC
e1b11e737e Make sure a pattern doesn't include space. 2013-11-04 16:31:22 +01:00
VonC
f6445a04a0 Fix bug on data attributes for first vertical slide.
The first slide of a vertical stack see some data attributes ignored.

Mainly the data-transition one.

Repeat all data-attributes on the wrapping section element.

Ignore any other attributes (like 'id="xxx"'), in order to not
mess with internal links (by repeating twice an id).
2013-11-04 16:31:18 +01:00