Commit Graph

128 Commits

Author SHA1 Message Date
8fd28a9185 Better error reporting for external Markdown files
1. Show an alert when loading the file throws an exception
2. Whenever the status isn't success (2xx) - upon exception or e.g.
  "file not found" - replace the section's content with information
  about the failure (instead of being silent about it and showing
  a blank slide).

We need to inform the user something went wrong, not just be silent
about it. An experienced developer, upon seing a blank slide, will
likely check the javascript console - but the rest will profit from
being told about the problem (and solution) explicitely.
2013-03-24 18:06:44 +01:00
ccaadaad45 Error check to prevent exception from Cipher 2013-03-11 09:25:26 +11:00
75ffa604d8 remove unused file (closes #360) 2013-03-10 11:57:08 -04:00
523989a21c Remove unessecary file 2013-03-10 14:00:21 +11:00
13046a0337 merge search plugin, adjust styles 2013-03-08 19:48:30 -05:00
e0e98a2275 Merge branch 'searchplugin' of https://github.com/razor-1/reveal.js 2013-03-08 19:39:21 -05:00
999ac52256 print port when multiplex server starts (#98) 2013-03-08 19:22:17 -05:00
825fe51de9 add Reveal.getConfig(), replace use of window.globals (#98) 2013-03-08 19:05:58 -05:00
2bd5e8b65b merge in multiplex (#98) 2013-03-08 18:49:28 -05:00
580a72c444 Bring multiplex up to date 2013-03-08 12:43:18 +11:00
61c229a4f9 Merge branch 'master' of https://github.com/hakimel/reveal.js
Conflicts:
	README.md
	index.html
	js/reveal.js
	package.json
	plugin/speakernotes/client.js
2013-03-08 10:29:54 +11:00
329ae0fd43 include search button icon
embed a generic search button icon.
2013-03-04 16:42:23 -08:00
03237ac9af Merge branch 'searchplugin' of https://github.com/razor-1/reveal.js into dev 2013-03-04 17:58:07 -05:00
34afc564cd Update markdown.js
Allow HTML tags in external markdown files
2013-03-01 18:47:26 +02:00
d7b92c9c65 update main window when current slide changes in notes (closes #343) 2013-02-27 16:55:42 -05:00
68fa39f083 Merge branch 'patch-1' of https://github.com/asmod3us/reveal.js into dev 2013-02-27 15:40:53 -05:00
f9f17be014 merge external markdown support, move example to plugin (#329) 2013-02-27 15:01:30 -05:00
3321e8b600 Merge branch 'slidifyMarkdown' of https://github.com/webpro/reveal.js into dev 2013-02-27 14:20:26 -05:00
f095af212e Update plugin/markdown/markdown.js
Use textContent instead of innerHTML to prevent encoding of certain characters in Markdown code blocks.
2013-02-26 16:06:18 +01:00
8d61a112ff search plugin 2013-02-11 15:34:31 -08:00
380264afc8 merge in notes improvement 2013-02-06 19:15:30 -05:00
fd7d09f697 find correct path to open html file from the notes.js path 2013-02-06 12:27:49 +01:00
080fb3cd33 disable zoom plugin while in overview mode 2013-02-03 13:21:42 -05:00
7207122c75 Slightly refactored "slidify" flow 2013-01-30 00:09:02 +01:00
25f3884bf4 Support for external markdown files, including configurable (vertical) slide separator 2013-01-29 23:49:17 +01:00
784fa9d2e3 merge in timer in notes window, timer now stays hidden until initial time is set 2013-01-26 13:32:07 -05:00
ab3f4e5ba3 Add clock and elapsed time to notes view 2013-01-26 11:49:19 -05:00
3f140ef50e Merge branch 'feature/highlightjs-clojure' of https://github.com/eightysteele/reveal.js 2013-01-23 15:27:55 -05:00
a7625a71d3 show error when notes run on non-http, fix load order to make sure upcoming slide is correct when notes open (#278) 2013-01-23 11:04:10 -05:00
1aa66aa469 Add Clojure to highlight.js, add code highlight example to README. 2013-01-21 17:53:39 -08:00
0d66c91e8e remove debug code 2013-01-21 13:06:22 -05:00
63a53e9dd1 notes window now displays correct slides when origin is different than index.html (closes #278) 2013-01-21 13:05:09 -05:00
05b5255d60 attribution for print-pdf phantom script (closes #276) 2013-01-10 09:40:03 -05:00
17622052a0 merge in phantomjs script for printing pdf (#276) 2013-01-10 09:38:31 -05:00
b9483f29e1 disable remotes plugin on mobile 2013-01-04 17:12:20 -08:00
332ce86c3a null check for notes in markdown parser (#253) 2012-11-16 09:29:32 -05:00
4009f2601e avoid stripping out notes when parsing markdown (closes #253) 2012-11-16 09:25:26 -05:00
3b073eee65 fix incorrect navigation in notes window (closes #241) 2012-11-16 09:08:32 -05:00
4fbec5e87d add touch based remote controlled plugin 2012-11-11 19:39:05 -05:00
87591d95d1 cosmetical tweaks to postmessage plugin 2012-11-10 17:15:11 -05:00
a7c3543069 added a simple postmessage plugin 2012-10-31 15:36:26 +01:00
e87d689231 content now re-renders after alt+click zoom (closes #195) 2012-10-28 23:55:19 -04:00
6a691a0999 remove console.log 2012-10-28 18:57:27 -04:00
605f7140e3 updated markdown references in notes plugin 2012-10-28 18:49:01 -04:00
e693717f2a update syntax highlight after editing (#210), move markdown and highlight scripts from lib to plugin 2012-10-28 18:09:54 -04:00
6794f543e0 merge in support for stepped fragments in notes server 2012-10-25 09:42:33 -04:00
5d1bac5790 merge in support for stepped fragments in notes window 2012-10-25 09:36:25 -04:00
5af915adaf Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server
Conflicts:
	js/reveal.min.js

Need to generate a new minified version afterwards.
2012-10-24 17:48:50 +02:00
1801bf67ea Delete functionality to control presentation from notes window
Its was impossible (at least for me) to keep the windows in sync without bloating the code too much.
2012-10-24 15:06:32 +02:00
13e7550afe Delete console output. 2012-10-24 14:53:50 +02:00