Do not inherit presenter notes by default (gnab#574)

But allow by setting inheritPresenterNote option
tsitsvero · Jun 9, 2020 · 92ed68d · 92ed68d
1 parent 10b7515
commit 92ed68d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/src/remark/models/slide.js b/src/remark/models/slide.js
@@ -2,7 +2,7 @@ var converter = require('../converter');
 
 module.exports = Slide;
 
-function Slide (slideIndex, slideNumber, slide, template) {
+function Slide (slideIndex, slideNumber, slide, template, options) {
   var self = this;
 
   self.properties = slide.properties || {};
@@ -14,14 +14,14 @@ function Slide (slideIndex, slideNumber, slide, template) {
   self.getSlideNumber = function () { return slideNumber; };
 
   if (template) {
-    inherit(self, template);
+    inherit(self, template, options);
   }
 }
 
-function inherit (slide, template) {
+function inherit (slide, template, options) {
   inheritProperties(slide, template);
   inheritContent(slide, template);
-  inheritNotes(slide, template);
+  inheritNotes(slide, template, options);
 }
 
 function inheritProperties (slide, template) {
@@ -86,8 +86,8 @@ function deepCopyContent(target, content) {
   }
 }
 
-function inheritNotes (slide, template) {
-  if (template.notes) {
+function inheritNotes (slide, template, options) {
+  if (template.notes && options.inheritPresenterNotes) {
     slide.notes = template.notes + '\n\n' + slide.notes;
   }
 }

diff --git a/src/remark/models/slideshow.js b/src/remark/models/slideshow.js
@@ -223,7 +223,7 @@ function createSlides (slideshowSource, options) {
       slide.notes = '';
     }
 
-    slideViewModel = new Slide(slides.length, slideNumber, slide, template);
+    slideViewModel = new Slide(slides.length, slideNumber, slide, template, options);
 
     if (slide.properties.name) {
       byName[slide.properties.name] = slideViewModel;

diff --git a/test/remark/models/slide_test.js b/test/remark/models/slide_test.js
@@ -24,14 +24,29 @@ describe('Slide', function () {
             content: ['More content.'],
             properties: {prop2: 'val2'},
             notes: 'slide notes'
-          }, template);
+          }, template, {inheritPresenterNotes: true});
 
       slide.properties.should.have.property('prop1', 'val1');
       slide.properties.should.have.property('prop2', 'val2');
       slide.content.should.eql(['Some content.', 'More content.']);
       slide.notes.should.equal('template notes\n\nslide notes');
     });
 
+    it('should not inherit notes when inheritTemplateNotes is undefined', () => {
+      var template = new Slide(1, 1, {
+            content: [''],
+            properties: {},
+            notes: 'template notes'
+          })
+        , slide = new Slide(2, 2, {
+            content: [''],
+            properties: {},
+            notes: 'just slide notes'
+          }, template, {});
+
+      slide.notes.should.equal('just slide notes');
+    });
+
     it('should not inherit name property', function () {
       var template = new Slide(1, 1, {
             content: ['Some content.'],