@@ -57,9 +42,7 @@
{ src: 'plugin/markdown/markdown.js' },
{ src: 'plugin/notes/notes.js', async: true },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }
- ],
- controlsTutorial: false,
- defaultTiming: 3
+ ]
});
diff --git a/js/reveal.js b/js/reveal.js
index 4946df55d49..ac3135da702 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -4099,18 +4099,20 @@
}
/**
- * Returns an array of objects where each object represents the attributes on its respective slide.
+ * Returns an array of objects where each object represents the
+ * attributes on its respective slide.
*/
- function getSlidesMetaInfo() {
+ function getSlidesAttributes() {
- var slides = getSlides();
- return slides.map( function (slide) {
- var meta = {};
+ return getSlides().map( function( slide ) {
+
+ var attributes = {};
for( var i = 0; i < slide.attributes.length; i++ ) {
var attribute = slide.attributes[ i ];
- meta[ attribute.name ] = attribute.value;
+ attributes[ attribute.name ] = attribute.value;
}
- return meta;
+ return attributes;
+
} );
}
@@ -5473,7 +5475,7 @@
// Returns an Array of objects representing the attributes on
// the slides
- getSlidesMetaInfo: getSlidesMetaInfo,
+ getSlidesAttributes: getSlidesAttributes,
// Returns the total number of slides
getTotalSlides: getTotalSlides,
diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html
index 56f518770b6..9e0b230a4cf 100644
--- a/plugin/notes/notes.html
+++ b/plugin/notes/notes.html
@@ -408,6 +408,7 @@
Notes
* Asynchronously calls the Reveal.js API of the main frame.
*/
function callRevealApi( methodName, methodArguments, callback ) {
+
var callId = ++lastRevealApiCallId;
pendingCalls[callId] = callback;
window.opener.postMessage( JSON.stringify( {
@@ -417,6 +418,7 @@
function getTimings( callback ) {
- callRevealApi( 'getSlidesMetaInfo', [], function ( slides ) {
+ callRevealApi( 'getSlidesAttributes', [], function ( slideAttributes ) {
callRevealApi( 'getConfig', [], function ( config ) {
var defaultTiming = config.defaultTiming;
if (defaultTiming == null) {
@@ -544,8 +546,8 @@
Notes
}
var timings = [];
- for ( var i in slides ) {
- var slide = slides[ i ];
+ for ( var i in slideAttributes ) {
+ var slide = slideAttributes[ i ];
var timing = defaultTiming;
if( slide.hasOwnProperty( 'data-timing' )) {
var t = slide[ 'data-timing' ];
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js
index 552a6fe60da..fdefd755a8b 100644
--- a/plugin/notes/notes.js
+++ b/plugin/notes/notes.js
@@ -56,17 +56,19 @@ var RevealNotes = (function() {
}
/**
- * Calls the specified Reveal.js method with the provided argument and then pushes the result to the notes
- * frame.
+ * Calls the specified Reveal.js method with the provided argument
+ * and then pushes the result to the notes frame.
*/
function callRevealApi( methodName, methodArguments, callId ) {
- var result = Reveal[methodName].call(Reveal, methodArguments);
+
+ var result = Reveal[methodName].call( Reveal, methodArguments );
notesPopup.postMessage( JSON.stringify( {
namespace: 'reveal-notes',
type: 'return',
result: result,
callId: callId
} ), '*' );
+
}
/**