Reveal.js 3.6

Quicksettings 3.0.3 Electron 1.7.12 Fix: Theme and other configurations were ignored when loading.
linux-man · Feb 3, 2018 · ee3b4ef · ee3b4ef
1 parent 6ef5b95
commit ee3b4ef
Show file tree

Hide file tree

Showing 32 changed files with 2,173 additions and 2,286 deletions.
diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control
diff --git a/intro/Intro.reel b/intro/Intro.reel
diff --git a/js/quicksettings/package.json b/js/quicksettings/package.json
diff --git a/js/quicksettings/quicksettings.js b/js/quicksettings/quicksettings.js
diff --git a/js/tinymce/package.json b/js/tinymce/package.json
diff --git a/js/unreel.js b/js/unreel.js
@@ -376,8 +376,10 @@ window.onload = () => {
   (value) => {props.showSlideNumber = value.value})
   .setValue("Show slide number", 0)
   .addBoolean("Show controls", true, (value) => {props.controls = value;})
-  .addBoolean("Show progress", true, (value) => {props.progress = value;})
-  .addBoolean("Show notes", false, (value) => {props.showNotes = value;});
+  .addDropDown("Controls layout", [{label:"Bottom-right", value:"bottom-right"}, {label:"Edges", value:"edges"}],
+  (value) => {props.controlsLayout = value.value})
+  .setValue("Controls layout", 0)
+  .addBoolean("Show progress", true, (value) => {props.progress = value;});
 
   let props2 = QuickSettings.create(0+170, 0, "", propertiesPanel)
   .addDropDown("Theme", [{label:"Black", value:"black"}, {label:"White", value:"white"},
@@ -404,6 +406,7 @@ window.onload = () => {
   .addBoolean("Enable pause (B)", true, (value) => {props.pause = value;})
   .addBoolean("Enable fragments", true, (value) => {props.fragments = value;})
   .addBoolean("Center slides", true, (value) => {props.center = value;})
+  .addBoolean("Show notes", false, (value) => {props.showNotes = value;})
   .addBoolean("Shuffle (on load)", false, (value) => {props.shuffle = value;})
   .addBoolean("Lazy loading", false, (value) => {});
 
@@ -887,10 +890,6 @@ window.onload = () => {
               }
               else {
                 presentation.documentElement.innerHTML = data.substring(data.indexOf("<head>"), data.indexOf("</html>"));
-                let slides = presentation.querySelector("div.slides");
-                presentation.documentElement.innerHTML = newContent;
-                presentation.querySelector("div.slides").innerHTML = slides.innerHTML;
-                updateIndex();
                 lazy = presentation.querySelectorAll("img[data-src], video[data-src], source[data-src], audio[data-src], iframe[data-src]").length > 0;
                 props2.setValue("Lazy loading", lazy);
                 firstTime = true;
@@ -1039,8 +1038,10 @@ window.onload = () => {
     else props4.setValue("Properties", true);
     props1.setValue("Show slide number", ["all", "speaker", "print"].indexOf(p.showSlideNumber));
     props1.setValue("Show controls", p.controls);
+    if(["bottom-right", "edges"].includes(p.controlsLayout))
+    props1.setValue("Controls layout", ["bottom-right", "edges"].indexOf(p.controlsLayout));
+    else props4.setValue("Properties", true);
     props1.setValue("Show progress", p.progress);
-    props1.setValue("Show notes", p.showNotes);
     if(["black", "white", "league", "sky", "beige", "simple", "serif", "blood", "night", "moon", "solarized"].includes(p.theme))
     props2.setValue("Theme", ["black", "white", "league", "sky", "beige", "simple", "serif", "blood", "night", "moon", "solarized"].indexOf(p.theme))
     else props4.setValue("Properties", true);
@@ -1058,6 +1059,7 @@ window.onload = () => {
     props2.setValue("Enable fragments", p.fragments);
     props2.setValue("Shuffle (on load)", p.shuffle);
     props2.setValue("Center slides", p.center);
+    props2.setValue("Show notes", p.showNotes);
     props2.setValue("Lazy loading", lazy);
     props3.setValue("Auto slide (A)", p.autoSlide);
     props3.setValue("Stoppable", p.autoSlideStoppable);
@@ -1196,6 +1198,9 @@ window.onload = () => {
     if(config.minScale == 0.2) delete config.minScale;
     if(config.maxScale == 2) delete config.maxScale;
     if(config.controls == true) delete config.controls;
+    if(config.controlsLayout == "bottom-right") delete config.controlsLayout;
+    if(config.controlsTutorial == true) delete config.controlsTutorial;
+    if(config.controlsBackArrows == "fade") delete config.controlsBackArrows;
     if(config.progress == true) delete config.progress;
     if(config.slideNumber == false || config.slideNumber == "false") delete config.slideNumber;
     if(config.history == false) delete config.history;

diff --git a/js/webview.js b/js/webview.js
@@ -17,7 +17,7 @@
 
     Reveal.addEventListener("overviewhidden", (event) => {ipc.sendToHost("overview", false);});
 
-    //-------------------------------------- Messages from main ----------------------------
+  //-------------------------------------- Messages from main ----------------------------
     ipc.on("startEdit", (event, data) => {Reveal.getCurrentSlide().style.display = "none";});
 
     ipc.on("stopEdit", (event, data) => {
@@ -54,18 +54,19 @@
         Reveal.configure({minScale: data.minScale});
         Reveal.configure({maxScale: data.maxScale});
         Reveal.configure({controls: data.controls});
+        Reveal.configure({controlsLayout: data.controlsLayout});
         let o;
         if(data.slideNumber == "true") o = true;
         else if(data.slideNumber == "false") o = false;
         else o = data.slideNumber;
         Reveal.configure({slideNumber: o});
         Reveal.configure({showSlideNumber: data.showSlideNumber});
         Reveal.configure({progress: data.progress});
-        Reveal.configure({showNotes: data.showNotes});
         Reveal.configure({transition: data.transition});
         Reveal.configure({backgroundTransition: data.backgroundTransition});
         Reveal.configure({transitionSpeed: data.transitionSpeed});
         Reveal.configure({center: data.center});
+        Reveal.configure({showNotes: data.showNotes});
         Reveal.configure({loop: data.loop});
         Reveal.configure({pause: data.pause});
         Reveal.configure({fragments: data.fragments});

diff --git a/main.js b/main.js
@@ -26,7 +26,7 @@ if(!global.settings.haccel) app.disableHardwareAcceleration();
 
 app.on("ready", () => {
   if (process.argv.length > 1 && path.isAbsolute(process.argv[1]) && fs.existsSync(process.argv[1])) global.argv = process.argv[1];
-  mainWindow = new BrowserWindow({width: 900, height: 600, minWidth: 900, minHeight: 600, icon:path.join(__dirname, "icons/icon.png"), show: false});
+  mainWindow = new BrowserWindow({width: 900, height: 640, minWidth: 900, minHeight: 640, icon:path.join(__dirname, "icons/icon.png"), show: false});
   splash = new BrowserWindow({width: 600, height: 450, icon:path.join(__dirname, "icons/icon.png"), center: true, alwaysOnTop: true, frame: false, title: "Loading...", parent: mainWindow, show: false});
   splash.loadURL("file://" + path.join(__dirname, "splash/splash.html"));
   initialize();

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "unreel",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "license": "GPL-3.0",
-  "description": "Reveal your ideas. With Unreel you can create amazing REVEAL.JS presentations",
+  "description": "Reveal your ideas.\nWith Unreel you can create amazing REVEAL.JS presentations",
   "author": "Caldas Lopes <[email protected]>",
   "homepage": "https://github.com/linux-man/unreel#readme",
   "main": "main.js",
@@ -25,8 +25,7 @@
     "linux": {
       "target": [
         "AppImage",
-        "deb",
-        "rpm"
+        "deb"
       ],
       "category": "Office",
       "packageCategory": "Contrib",
@@ -57,9 +56,9 @@
     "url": "https://github.com/linux-man/unreel/issues"
   },
   "devDependencies": {
-    "electron": "^1.6.8",
-    "electron-builder": "^18.0.1",
-    "electron-packager": "^8.7.0"
+    "electron": "^1.7.12",
+    "electron-builder": "^18.8.1",
+    "electron-packager": "^8.7.2"
   },
   "dependencies": {
     "archiver": "^1.3.0",

diff --git a/reveal.js/.gitignore b/reveal.js/.gitignore
diff --git a/reveal.js/.travis.yml b/reveal.js/.travis.yml
diff --git a/reveal.js/README.md b/reveal.js/README.md
@@ -1,6 +1,6 @@
 # reveal.js [![Build Status](https://travis-ci.org/hakimel/reveal.js.svg?branch=master)](https://travis-ci.org/hakimel/reveal.js) <a href="https://slides.com?ref=github"><img src="https://s3.amazonaws.com/static.slid.es/images/slides-github-banner-320x40.png?1" alt="Slides" width="160" height="20"></a>
 
-A framework for easily creating beautiful presentations using HTML. [Check out the live demo](http://lab.hakim.se/reveal-js/).
+A framework for easily creating beautiful presentations using HTML. [Check out the live demo](http://revealjs.com/).
 
 reveal.js comes with a broad range of features including [nested slides](https://github.com/hakimel/reveal.js#markup), [Markdown contents](https://github.com/hakimel/reveal.js#markdown), [PDF export](https://github.com/hakimel/reveal.js#pdf-export), [speaker notes](https://github.com/hakimel/reveal.js#speaker-notes) and a [JavaScript API](https://github.com/hakimel/reveal.js#api). There's also a fully featured visual editor and platform for sharing reveal.js presentations at [slides.com](https://slides.com?ref=github).
 
@@ -105,7 +105,7 @@ The presentation markup hierarchy needs to be `.reveal > .slides > section` wher
 
 ### Markdown
 
-It's possible to write your slides using Markdown. To enable Markdown, add the `data-markdown` attribute to your `<section>` elements and wrap the contents in a `<textarea data-template>` like the example below.
+It's possible to write your slides using Markdown. To enable Markdown, add the `data-markdown` attribute to your `<section>` elements and wrap the contents in a `<textarea data-template>` like the example below. You'll also need to add the `plugin/markdown/marked.js` and `plugin/markdown/markdown.js` scripts (in that order) to your HTML file.
 
 This is based on [data-markdown](https://gist.github.com/1343518) from [Paul Irish](https://github.com/paulirish) modified to use [marked](https://github.com/chjj/marked) to support [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown). Sensitive to indentation (avoid mixing tabs and spaces) and line breaks (avoid consecutive breaks).
 
@@ -181,9 +181,20 @@ At the end of your page you need to initialize reveal by running the following c
 ```javascript
 Reveal.initialize({
 
-	// Display controls in the bottom right corner
+	// Display presentation control arrows
 	controls: true,
 
+	// Help the user learn the controls by providing hints, for example by
+	// bouncing the down arrow when they first encounter a vertical slide
+	controlsTutorial: true,
+
+	// Determines where controls appear, "edges" or "bottom-right"
+	controlsLayout: 'bottom-right',
+
+	// Visibility rule for backwards navigation arrows; "faded", "hidden"
+	// or "visible"
+	controlsBackArrows: 'faded',
+
 	// Display a presentation progress bar
 	progress: true,
 
@@ -231,7 +242,7 @@ Reveal.initialize({
 	// Flags if speaker notes should be visible to all viewers
 	showNotes: false,
 
-	// Global override for autolaying embedded media (video/audio/iframe)
+	// Global override for autoplaying embedded media (video/audio/iframe)
 	// - null: Media will only autoplay if data-autoplay is present
 	// - true: All media will autoplay, regardless of individual setting
 	// - false: No media will autoplay, regardless of individual setting
@@ -635,7 +646,7 @@ Reveal.initialize({
 });
 ```
 
-Make sure that the background size is much bigger than screen size to allow for some scrolling. [View example](http://lab.hakim.se/reveal-js/?parallaxBackgroundImage=https%3A%2F%2Fs3.amazonaws.com%2Fhakim-static%2Freveal-js%2Freveal-parallax-1.jpg&parallaxBackgroundSize=2100px%20900px).
+Make sure that the background size is much bigger than screen size to allow for some scrolling. [View example](http://revealjs.com/?parallaxBackgroundImage=https%3A%2F%2Fs3.amazonaws.com%2Fhakim-static%2Freveal-js%2Freveal-parallax-1.jpg&parallaxBackgroundSize=2100px%20900px).
 
 
 
@@ -695,7 +706,7 @@ You can also add relative navigation links, similar to the built in reveal.js co
 
 
 ### Fragments
-Fragments are used to highlight individual elements on a slide. Every element with the class ```fragment``` will be stepped through before moving on to the next slide. Here's an example: http://lab.hakim.se/reveal-js/#/fragments
+Fragments are used to highlight individual elements on a slide. Every element with the class ```fragment``` will be stepped through before moving on to the next slide. Here's an example: http://revealjs.com/#/fragments
 
 The default fragment style is to start out invisible and fade in. This style can be changed by appending a different class to the fragment:
 
@@ -872,7 +883,7 @@ Reveal.initialize({
 
 ## PDF Export
 
-Presentations can be exported to PDF via a special print stylesheet. This feature requires that you use [Google Chrome](http://google.com/chrome) or [Chromium](https://www.chromium.org/Home) and to be serving the presention from a webserver.
+Presentations can be exported to PDF via a special print stylesheet. This feature requires that you use [Google Chrome](http://google.com/chrome) or [Chromium](https://www.chromium.org/Home) and to be serving the presentation from a webserver.
 Here's an example of an exported presentation that's been uploaded to SlideShare: http://www.slideshare.net/hakimel/revealjs-300.
 
 ### Page size
@@ -892,7 +903,7 @@ To enable the PDF print capability in your presentation, the special print style
 ```
 
 ### Instructions
-1. Open your presentation with `print-pdf` included in the query string i.e. http://localhost:8000/?print-pdf. You can test this with [lab.hakim.se/reveal-js?print-pdf](http://lab.hakim.se/reveal-js?print-pdf).
+1. Open your presentation with `print-pdf` included in the query string i.e. http://localhost:8000/?print-pdf. You can test this with [revealjs.com?print-pdf](http://revealjs.com?print-pdf).
   * If you want to include [speaker notes](#speaker-notes) in your export, you can append `showNotes=true` to the query string: http://localhost:8000/?print-pdf&showNotes=true
 1. Open the in-browser print dialog (CTRL/CMD+P).
 1. Change the **Destination** setting to **Save as PDF**.

diff --git a/reveal.js/css/print/pdf.css b/reveal.js/css/print/pdf.css
@@ -144,9 +144,14 @@ ul, ol, div, p {
 }
 
 /* Display slide speaker notes when 'showNotes' is enabled */
+.reveal.show-notes {
+	max-width: none;
+	max-height: none;
+}
 .reveal .speaker-notes-pdf {
 	display: block;
 	width: 100%;
+	height: auto;
 	max-height: none;
 	top: auto;
 	right: auto;
@@ -162,6 +167,7 @@ ul, ol, div, p {
 	background-color: transparent;
 	padding: 20px;
 	page-break-after: always;
+	border: 0;
 }
 
 /* Display slide numbers when 'slideNumber' is enabled */