cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 23:53:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/present: use unique key for destSlide in local store

Browse Source 
We use a 'destSlide' entry in the local storage to keep presentation
and notes in sync while using '-notes' flag. This caused a name
collision if we had different presentations open at the same time.

This changes the 'destSlide' key in local storage to
'destSlide:<presentation-url>' to avoid collisions between different
presentations.

Fixes golang/go#24688

Change-Id: I4833fa83856a96b5978c09ed7e4360484ba4f109
Reviewed-on: https://go-review.googlesource.com/c/tools/+/178659
Reviewed-by: Andrew Bonventre <andybons@golang.org>
This commit is contained in:
Daniela Petruzalek 2019-05-24 14:50:18 +01:00 committed by Andrew Bonventre
parent 7f22187876
commit a101b041de
2 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/present/static/notes.js
View File

@ -26,22 +26,24 @@ function toggleNotesWindow() {
initNotes(); initNotes();
}; };
// Create an unique key for the local storage so we don't mix the
// destSlide of different presentations. For golang.org/issue/24688.
function destSlideKey() {
var key = '';
if (notesWindow) {
var slides = notesWindow.document.getElementById('presenter-slides');
key = slides.src.split('#')[0];
} else {
key = window.location.href.split('#')[0];
}
return 'destSlide:' + key;
}
function initNotes() { function initNotes() {
notesWindow = window.open('', '', 'width=1000,height=700'); notesWindow = window.open('', '', 'width=1000,height=700');
var w = notesWindow; var w = notesWindow;
var slidesUrl = window.location.href; var slidesUrl = window.location.href;
var curSlide = parseInt(localStorage.getItem('destSlide'), 10);
var formattedNotes = '';
var section = sections[curSlide - 1];
// curSlide is 0 when initialized from the first page of slides.
// Check if section is valid before retrieving Notes.
if (section) {
formattedNotes = formatNotes(section.Notes);
} else if (curSlide == 0) {
formattedNotes = formatNotes(titleNotes);
}
// Hack to apply css. Requires existing html on notesWindow. // Hack to apply css. Requires existing html on notesWindow.
w.document.write("<div style='display:none;'></div>"); w.document.write("<div style='display:none;'></div>");
@ -51,6 +53,18 @@ function initNotes() {
slides.id = 'presenter-slides'; slides.id = 'presenter-slides';
slides.src = slidesUrl; slides.src = slidesUrl;
w.document.body.appendChild(slides); w.document.body.appendChild(slides);
var curSlide = parseInt(localStorage.getItem(getDestSlideKey()), 10);
var formattedNotes = '';
var section = sections[curSlide - 1];
// curSlide is 0 when initialized from the first page of slides.
// Check if section is valid before retrieving Notes.
if (section) {
formattedNotes = formatNotes(section.Notes);
} else if (curSlide == 0) {
formattedNotes = formatNotes(titleNotes);
}
// setTimeout needed for Firefox // setTimeout needed for Firefox
setTimeout(function() { setTimeout(function() {
slides.focus(); slides.focus();
@ -93,7 +107,7 @@ function updateNotes() {
// When triggered from parent window, notesWindow is null // When triggered from parent window, notesWindow is null
// The storage event listener on notesWindow will update notes // The storage event listener on notesWindow will update notes
if (!notesWindow) return; if (!notesWindow) return;
var destSlide = parseInt(localStorage.getItem('destSlide'), 10); var destSlide = parseInt(localStorage.getItem(getDestSlideKey()), 10);
var section = sections[destSlide - 1]; var section = sections[destSlide - 1];
var el = notesWindow.document.getElementById('presenter-notes'); var el = notesWindow.document.getElementById('presenter-notes');

8
cmd/present/static/slides.js
View File

@ -212,7 +212,7 @@ function prevSlide() {
updateSlides(); updateSlides();
} }
if (notesEnabled) localStorage.setItem('destSlide', curSlide); if (notesEnabled) localStorage.setItem(destSlideKey(), curSlide);
}; };
function nextSlide() { function nextSlide() {
@ -223,7 +223,7 @@ function nextSlide() {
updateSlides(); updateSlides();
} }
if (notesEnabled) localStorage.setItem('destSlide', curSlide); if (notesEnabled) localStorage.setItem(destSlideKey(), curSlide);
}; };
/* Slide events */ /* Slide events */
@ -602,7 +602,7 @@ function setupNotesSync() {
setupPlayCodeSync(); setupPlayCodeSync();
setupPlayResizeSync(); setupPlayResizeSync();
localStorage.setItem('destSlide', curSlide); localStorage.setItem(destSlideKey(), curSlide);
window.addEventListener('storage', updateOtherWindow, false); window.addEventListener('storage', updateOtherWindow, false);
} }
@ -613,7 +613,7 @@ function updateOtherWindow(e) {
var isRemoveStorageEvent = !e.newValue; var isRemoveStorageEvent = !e.newValue;
if (isRemoveStorageEvent) return; if (isRemoveStorageEvent) return;
var destSlide = localStorage.getItem('destSlide'); var destSlide = localStorage.getItem(destSlideKey());
while (destSlide > curSlide) { while (destSlide > curSlide) {
nextSlide(); nextSlide();
} }