Commit Graph

76 Commits (6bfa48a667fe91bb1de1b680769aeb7260af3a49)

Author SHA1 Message Date
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 c0ea2cd980 same code format 2016-01-08 14:02:16 +01:00
teawithfruit 43f0d08155 fixed loading 2015-11-02 10:37:16 +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
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
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
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
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
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 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 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 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 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
VonC c51ab74d72 Add attributes in markdown for slide generation.
By default, look for <!-- slide-attributes: xxxx -->.
Whatever 'xxx' is will be added to the section attributes.

You can define your own pattern with 'data-attributes'.
For instance 'data-attributes="^\s*?-- (.*?)$"':
that will be added to the options.

The 'attributes' section is removed from the content of the slide,
so the final markdown doesn't reflect them.
That also means you can add those attributes *anywhere* in the slide

But that allows for *any* attribute to be added for a specifc slide,
like:

- id="plan", for allowing internal link (issue #430)
- data-background="#ff0000"
- data-transition="fade"

You list those attributes on a single line, like

- (default):
` <!-- id="plan" data-background="#ff0000" -->`
- or, with an alternative data-attributes pattern:
` -- id="plan" data-background="#ff0000"`

Again, that line is remove from the final content.
2013-11-04 16:31:15 +01:00
Gabriel Pillet 80aadaf74e Removing global flag for replacing whitespaces 2013-10-31 14:02:34 +01:00
Hakim El Hattab d844195be1 format tweaks markdown.js, remove extra image asset 2013-10-28 09:06:43 -04:00
VonC a87ce95794 Add 'data-element-attributes' attr. to 'section'.
By default '{\\\.\s*?([^}]+?)}'.
2013-10-27 22:49:43 +01:00
VonC 7aa93af0ca Cleanup code, remove console log debugs. 2013-10-27 22:49:43 +01:00
VonC 28198b2ff0 Add attributes extracted from an attribute.
Allows to add attributes to element of an attribute which contains
the attribute pattern.
2013-10-27 22:49:42 +01:00
VonC d20760f40d Uses the right method setAttribute.
Works better, and the html elements get their attributes.
2013-10-27 22:49:42 +01:00
VonC 0bc3a836fc First implem for adding classes to enclosing elts.
Extra text representing classes is detected and correctly removed.
Adding attributes isn't working yet.
2013-10-27 22:49:41 +01:00
Hakim El Hattab 942724238f better check for arrays in markdown plugin 2013-10-11 22:05:43 -04:00
Lars Kappert 275efa061a Property 'length' is not a variable. 2013-09-29 11:34:17 +02:00
Hakim El Hattab c453bc4770 markdown plugin can now process slides that are added at runtime 2013-09-06 08:40:43 -04:00
Hakim El Hattab ef9168c7c4 fix issue with notes on last slide of external markdown #589 2013-09-06 08:24:03 -04:00
Hakim El Hattab d9c9474938 markdown refactoring #507 2013-08-27 09:11:43 -04:00
Hakim El Hattab 571fb67864 fix bug where markdown notes in last slide would not parse #574 2013-08-24 16:13:24 -04:00
Hakim El Hattab 7e629936e5 always use 'i' as iterator 2013-08-24 11:06:52 -04:00
Hakim El Hattab 7f85c21386 markdown refactoring; comments, renamed functions, shorter argument lists 2013-08-24 10:39:15 -04:00